From: Koen Kooi <koen@openembedded.org>
Date: Fri, 24 Aug 2007 08:51:39 +0000 (+0000)
Subject: propagate from branch 'org.openembedded.dev' (head 63851b92b9273aff39e9034738719537be... 
X-Git-Tag: Release-2010-05/1~7838^2~16^2~2^2^2^2~9^2~3^2~1^2~6^2~5^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87dd9b603c8730c41aa20102d25b386b6123b1e3;p=openembedded.git

propagate from branch 'org.openembedded.dev' (head 63851b92b9273aff39e9034738719537beaaad00)
            to branch 'org.openembedded.dev.avr32' (head 73b3fea2362aba583bd68ba2381480ce68660133)
---

87dd9b603c8730c41aa20102d25b386b6123b1e3
diff --cc conf/machine/at32stk1000.conf
index 2231f80ed2,5acc5b88fe..21ffdda843
--- a/conf/machine/at32stk1000.conf
+++ b/conf/machine/at32stk1000.conf
@@@ -20,4 -20,4 +20,6 @@@ SERIAL_CONSOLE = "115200
  ROOT_FLASH_SIZE = "8"
  EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536"
  
 -PREFERRED_VERSION_u-boot = "1.1.4"
 +KERNEL_IMAGETYPE = "uImage"
++
++PREFERRED_VERSION_u-boot = "1.1.4"
diff --cc conf/machine/atngw100.conf
index 4df1030570,833282d468..76453323ff
--- a/conf/machine/atngw100.conf
+++ b/conf/machine/atngw100.conf
@@@ -18,4 -18,4 +18,5 @@@ SERIAL_CONSOLE = "115200
  ROOT_FLASH_SIZE = "8"
  EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536"
  
- KERNEL_IMAGETYPE = "uImage"
+ PREFERRED_VERSION_u-boot = "1.1.4"
++KERNEL_IMAGETYPE = "uImage"