propagate from branch 'org.openembedded.dev' (head 63851b92b9273aff39e9034738719537be...

            to branch 'org.openembedded.dev.avr32' (head 73b3fea2362aba583bd68ba2381480ce68660133)

diff --cc conf/machine/at32stk1000.conf
index 2231f80,5acc5b8..21ffdda
--- 1/conf/machine/at32stk1000.conf
--- 2/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 4df1030,833282d..7645332
--- 1/conf/machine/atngw100.conf
--- 2/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"