]> git.openpandora.org Git - openembedded.git/commitdiff
propagate from branch 'org.openembedded.dev' (head 63851b92b9273aff39e9034738719537be...
authorKoen Kooi <koen@openembedded.org>
Fri, 24 Aug 2007 08:51:39 +0000 (08:51 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 24 Aug 2007 08:51:39 +0000 (08:51 +0000)
            to branch 'org.openembedded.dev.avr32' (head 73b3fea2362aba583bd68ba2381480ce68660133)

1  2 
conf/machine/at32stk1000.conf
conf/machine/atngw100.conf

index 2231f80ed201fb0d05b6dc720648c03b1f82b100,5acc5b88fe438926c49a61719a030069e65428f0..21ffdda8430f67ddda7a5083ac8b144af5154569
@@@ -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"
index 4df103057074af0086d9e98c8d51db9ac76be2d6,833282d468e5004e4c2f18f06a2a9ddeda3a16b0..76453323ffefd19bd56c7583db3fc464e572a8a2
@@@ -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"