diff options
| author |   Koen Kooi <koen@openembedded.org> | 2007-09-04 12:07:11 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-09-04 12:07:11 +0000 |
| commit | 1c24210e3f0b3f6a5a5783ed597252d453e6bd64 (patch) | |
| tree | 92a51cdf31cca39b866e3f818a799fa4fd6b570e /conf | |
| parent | adc0e34177df635be3bec485a184e5573f13383e (diff) | |
| parent | b144d7d083863cb10a7d9219ddcede338f6e839a (diff) | |
| download | openembedded-1c24210e3f0b3f6a5a5783ed597252d453e6bd64.tar.gz | |
propagate from branch 'org.openembedded.dev' (head 3fed235384e32b1c9ba26c86ff39b2ffb928fbed)
to branch 'org.openembedded.dev.avr32' (head 50c56d6b5b2d15f6bc9c32b4f9907bc0d1c3564b)
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 |