diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-08-24 08:51:39 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-08-24 08:51:39 +0000 |
| commit | 87dd9b603c8730c41aa20102d25b386b6123b1e3 (patch) | |
| tree | 9529085af6547c1f71ed7df1cc583900b030f4f7 /conf | |
| parent | cbea2f4a751b5ee8fb1343a05742f8b8765dec7a (diff) | |
| parent | 7e541bf1f5abaad0105328e57198a05f8c17f242 (diff) | |
propagate from branch 'org.openembedded.dev' (head 63851b92b9273aff39e9034738719537beaaad00)
to branch 'org.openembedded.dev.avr32' (head 73b3fea2362aba583bd68ba2381480ce68660133)
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/machine/at32stk1000.conf | 4 | ||||
| -rw-r--r-- | conf/machine/atngw100.conf | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/conf/machine/at32stk1000.conf b/conf/machine/at32stk1000.conf index 2231f80ed2..21ffdda843 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,5 @@ ROOT_FLASH_SIZE = "8" EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536" KERNEL_IMAGETYPE = "uImage" + +PREFERRED_VERSION_u-boot = "1.1.4"
\ No newline at end of file diff --git a/conf/machine/atngw100.conf b/conf/machine/atngw100.conf index 4df1030570..76453323ff 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,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"
\ No newline at end of file |