summaryrefslogtreecommitdiff
path: root/conf/machine
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2008-01-23 10:55:05 +0000
committerKoen Kooi <koen@openembedded.org>2008-01-23 10:55:05 +0000
commit1f3a0258e6e34ba036e057b5cd93f085c80f7147 (patch)
treec09da08377cea0f132d811e6cc16fb68a379f67c /conf/machine
parent80ed869c73abee32442ead36dec94b4b84020a97 (diff)
parentf0d173cd5077621891f8298dc259476c72719bc0 (diff)
propagate from branch 'org.openembedded.dev' (head 558d7f8556530ca23dc6e4b7d687d6727d3a7397)
to branch 'org.openembedded.dev.avr32' (head d7597829fe950aa86acdfe521d11843d7277261c)
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/at32stk1000.conf6
-rw-r--r--conf/machine/atngw100.conf6
2 files changed, 10 insertions, 2 deletions
diff --git a/conf/machine/at32stk1000.conf b/conf/machine/at32stk1000.conf
index 2231f80ed2..ac63af5e56 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* || true;"
+
diff --git a/conf/machine/atngw100.conf b/conf/machine/atngw100.conf
index 4df1030570..17b4c4187a 100644
--- a/conf/machine/atngw100.conf
+++ b/conf/machine/atngw100.conf
@@ -9,7 +9,8 @@ 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"
+PREFERRED_PROVIDER_virtual/kernel = "linux"
# used by sysvinit_2
SERIAL_CONSOLE = "115200"
@@ -18,4 +19,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* || true ;"