[oe-commits] unknown at32stk1000, atngw100: fix machine features and uboot version

[koen commit]

at32stk1000, atngw100: fix machine features and uboot version

Author: koen at openembedded.org
Branch: unknown
Revision: a81dc4434307b278d94f353e38f4d3b2e8b69031
ViewMTN: http://monotone.openembedded.org/revision/info/a81dc4434307b278d94f353e38f4d3b2e8b69031
Files:
1
conf/machine/at32stk1000.conf
conf/machine/atngw100.conf
Diffs:

#
# mt diff -re754c3f92ae08b2d54ed5596a8465d872c4e5933 -ra81dc4434307b278d94f353e38f4d3b2e8b69031
#
# 
# 
# patch "conf/machine/at32stk1000.conf"
#  from [2ab48481fd9d3e2e4648ce9d96d680c3d78cde4a]
#    to [8fd12076b3bea8e74a23f364c5f5b14d49470af9]
# 
# patch "conf/machine/atngw100.conf"
#  from [b5cb85b6f35f560c53155b1363a067be0a9a9192]
#    to [f37d5634360b58f24537cb47adb576c2271adcca]
# 
============================================================
--- conf/machine/at32stk1000.conf	2ab48481fd9d3e2e4648ce9d96d680c3d78cde4a
+++ conf/machine/at32stk1000.conf	8fd12076b3bea8e74a23f364c5f5b14d49470af9
@@ -11,7 +11,7 @@ USE_VT = "0"
 #don't try to access tty1
 USE_VT = "0"
 
-MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget screen"
+MACHINE_FEATURES = "kernel26 alsa ext2 usbgadget touchscreen screen"
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "115200"
@@ -19,3 +19,5 @@ EXTRA_IMAGECMD_jffs2 = " --big-endian --
 # used by some images
 ROOT_FLASH_SIZE = "8"
 EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536"
+
+PREFERRED_VERSION_u-boot = "1.1.4"
============================================================
--- conf/machine/atngw100.conf	b5cb85b6f35f560c53155b1363a067be0a9a9192
+++ conf/machine/atngw100.conf	f37d5634360b58f24537cb47adb576c2271adcca
@@ -9,7 +9,7 @@ USE_VT = "0"
 #don't try to access tty1
 USE_VT = "0"
 
-MACHINE_FEATURES = "kernel26 ext2 usbhost usbgadget"
+MACHINE_FEATURES = "kernel26 ext2 usbgadget"
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "115200"
@@ -18,3 +18,4 @@ EXTRA_IMAGECMD_jffs2 = " --big-endian --
 ROOT_FLASH_SIZE = "8"
 EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536"
 
+PREFERRED_VERSION_u-boot = "1.1.4"