diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2007-10-10 09:18:39 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2007-10-10 09:18:39 +0000 |
| commit | e45a2c703a0971966bcf2ac4537776aec0125287 (patch) | |
| tree | f89858c35e2fdb2ae286883c76c41249d1ebbff8 | |
| parent | 1185f4afa35f26f7ce9e135d3d96c52e3a024c29 (diff) | |
| parent | 288c0fb960bdb5f6e58cf0f67ab197744fd08aec (diff) | |
merge of '4e669af0ea55b9b9ba44d6dc7d149da48ab9b139'
and 'af0790bf9393bac4ed622dfd962d7bf5512bd7e4'
| -rw-r--r-- | conf/machine/alix.conf | 4 | ||||
| -rw-r--r-- | conf/machine/at91sam9260ek.conf | 6 | ||||
| -rw-r--r-- | conf/machine/at91sam9261ek.conf | 6 | ||||
| -rw-r--r-- | conf/machine/bd-neon.conf | 6 |
4 files changed, 13 insertions, 9 deletions
diff --git a/conf/machine/alix.conf b/conf/machine/alix.conf index 3d83300963..3c50ef561b 100644 --- a/conf/machine/alix.conf +++ b/conf/machine/alix.conf @@ -1,6 +1,6 @@ #@TYPE: Machine #@NAME: Alix -#@DESCRIPTION: Machine configuration for PC Engines Alix1c board +#@DESCRIPTION: Machine.inciguration for PC Engines Alix1c board # # http://pcengines.ch/alix1c.htm @@ -17,7 +17,7 @@ GLIBC_EXTRA_OECONF = "--with-tls" MACHINE_FEATURES = "kernel26 usbhost ext2 pci screen alsa acpi x86" -require conf/machine/include/tune-geodelx.conf +require.inc/machine/include/tune-geodelx.inc IMAGE_FSTYPES += "tar.gz" diff --git a/conf/machine/at91sam9260ek.conf b/conf/machine/at91sam9260ek.conf index e8903a960a..f00938cc4e 100644 --- a/conf/machine/at91sam9260ek.conf +++ b/conf/machine/at91sam9260ek.conf @@ -1,6 +1,6 @@ #@TYPE: Machine #@Name: Atmel AT91SAM9260EK Development Platform -#@DESCRIPTION: Machine configuration for the at91sam9260ek development board with a at91sam9260 processor +#@DESCRIPTION: Machine.inciguration for the at91sam9260ek development board with a at91sam9260 processor TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4t armv5te" @@ -8,6 +8,8 @@ PACKAGE_EXTRA_ARCHS = "armv4t armv5te" PREFERRED_PROVIDER_virtual/kernel = "linux" PREFERRED_PROVIDER_xserver = "xserver-kdrive" +KERNEL_IMAGETYPE = "uImage" + #don't try to access tty1 USE_VT = "0" @@ -17,4 +19,4 @@ MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget" SERIAL_CONSOLE = "115200 ttyS0" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" -require conf/machine/include/tune-arm926ejs.conf +require.inc/machine/include/tune-arm926ejs.inc diff --git a/conf/machine/at91sam9261ek.conf b/conf/machine/at91sam9261ek.conf index 489575cd2b..e59dacbc86 100644 --- a/conf/machine/at91sam9261ek.conf +++ b/conf/machine/at91sam9261ek.conf @@ -1,6 +1,6 @@ #@TYPE: Machine #@Name: Atmel AT91SAM9261EK Development Platform -#@DESCRIPTION: Machine configuration for the at91sam9261ek development board with a at91sam9261 processor +#@DESCRIPTION: Machine.inciguration for the at91sam9261ek development board with a at91sam9261 processor TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4t armv5te" @@ -8,6 +8,8 @@ PACKAGE_EXTRA_ARCHS = "armv4t armv5te" PREFERRED_PROVIDER_virtual/kernel = "linux" PREFERRED_PROVIDER_xserver = "xserver-kdrive" +KERNEL_IMAGETYPE = "uImage" + #don't try to access tty1 USE_VT = "0" @@ -17,4 +19,4 @@ MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget screen touchscreen" SERIAL_CONSOLE = "115200 ttyS0" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" -require conf/machine/include/tune-arm926ejs.conf +require.inc/machine/include/tune-arm926ejs.inc diff --git a/conf/machine/bd-neon.conf b/conf/machine/bd-neon.conf index 63e3ac8269..bd6354a2e4 100644 --- a/conf/machine/bd-neon.conf +++ b/conf/machine/bd-neon.conf @@ -1,6 +1,6 @@ #@TYPE: Machine #@NAME: Boundary Devices NEON -#@DESCRIPTION: Machine configuration for the Boundary Devices NEON board +#@DESCRIPTION: Machine.inciguration for the Boundary Devices NEON board # # Hardware-based properties @@ -9,10 +9,10 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te" # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. -require conf/machine/include/tune-xscale.conf +require.inc/machine/include/tune-xscale.inc # Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first -#require conf/machine/include/tune-iwmmxt.conf +#require.inc/machine/include/tune-iwmmxt.inc ROOT_FLASH_SIZE = "60" VOLATILE_STORAGE_SIZE = "128" |