summaryrefslogtreecommitdiff
path: root/conf/machine
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2007-09-19 11:32:35 +0000
committerKoen Kooi <koen@openembedded.org>2007-09-19 11:32:35 +0000
commitb2b667e89381c5bee23b9a6e96ccd7f04a15fd1b (patch)
tree320f60bb9ab4410501ef6bff7a9acc2d7f51e04e /conf/machine
parent7006d4aac3bf1eef960d032965ae18f88c4acdfc (diff)
parent85693efa33378405956ca83c7b24d45f5138d223 (diff)
propagate from branch 'org.openembedded.dev' (head 0ba4bbe5ebdf7f3598dd1890a61d14cd356eab54)
to branch 'org.openembedded.dev.avr32' (head d4fef411c5337e77b35acf5e2a06ffb56d059326)
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/at32stk1000.conf6
-rw-r--r--conf/machine/atngw100.conf5
2 files changed, 9 insertions, 2 deletions
diff --git a/conf/machine/at32stk1000.conf b/conf/machine/at32stk1000.conf
index 2231f80ed2..343c6aa44e 100644
--- a/conf/machine/at32stk1000.conf
+++ b/conf/machine/at32stk1000.conf
@@ -11,7 +11,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
#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"
@@ -21,3 +21,7 @@ ROOT_FLASH_SIZE = "8"
EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536"
KERNEL_IMAGETYPE = "uImage"
+PREFERRED_VERSION_u-boot = "1.1.4"
+
+ROOTFS_POSTPROCESS_COMMAND += " rm ${IMAGE_ROOTFS}/boot/uImage* ;"
+
diff --git a/conf/machine/atngw100.conf b/conf/machine/atngw100.conf
index 4df1030570..6acc3d7907 100644
--- a/conf/machine/atngw100.conf
+++ b/conf/machine/atngw100.conf
@@ -9,7 +9,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
#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,4 +18,7 @@ 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"
+
+ROOTFS_POSTPROCESS_COMMAND += " rm ${IMAGE_ROOTFS}/boot/uImage* ;"