diff options
| author | Koen Kooi <koen@openembedded.org> | 2008-01-03 09:49:10 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2008-01-03 09:49:10 +0000 |
| commit | 908e3da2f1abb6ed3214422f9d21bd0b61b6119d (patch) | |
| tree | 3d9049fae19cef48d1bcfbc7435d449d3a469d00 /conf/machine | |
| parent | ee130e36ad7e36888782e3cae07ee9e053af4bd3 (diff) | |
| parent | c491b0c9b2c06239f268cb309083eb21c53e4286 (diff) | |
propagate from branch 'org.openembedded.dev' (head a9cf4a7fde005b20905192e310ca984ba3cbdab4)
to branch 'org.openembedded.dev.avr32' (head f0c1e66a72c6fa23e526d7c159d2d09a4c676d48)
Diffstat (limited to 'conf/machine')
| -rw-r--r-- | conf/machine/at32stk1000.conf | 6 | ||||
| -rw-r--r-- | conf/machine/atngw100.conf | 6 |
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 ;" |