conf/machine/include: Rename .conf to .inc files

diff --git a/conf/machine/acern30.conf b/conf/machine/acern30.conf
index de450b1..22718b8 100644 (file)
--- a/conf/machine/acern30.conf
+++ b/conf/machine/acern30.conf
@@ -9,7 +9,7 @@ TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t"
 
 # Samsung S3C2xxx CPU
-require conf/machine/include/tune-arm920t.conf
+require conf/machine/include/tune-arm920t.inc
 
 ROOT_FLASH_SIZE = "32"
 VOLATILE_STORAGE_SIZE = "64"
@@ -35,4 +35,4 @@ module_autoload_g_ether = "g_ether"
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"
 
-require conf/machine/include/LAB-settings.conf
+require conf/machine/include/LAB-settings.inc

diff --git a/conf/machine/amsdelta.conf b/conf/machine/amsdelta.conf
index c17bf7d..349dd8e 100644 (file)
--- a/conf/machine/amsdelta.conf
+++ b/conf/machine/amsdelta.conf
@@ -20,7 +20,7 @@ GUI_MACHINE_CLASS="smallscreen"
 
 PREFERRED_VERSION_u-boot = "1.1.4"
 
-require conf/machine/include/tune-arm920t.conf
+require conf/machine/include/tune-arm920t.inc
 
 IMAGE_ROOTFS_SIZE_ext2 = "8192"
 IMAGE_ROOTFS_SIZE_ext2.gz = "8192"

diff --git a/conf/machine/asus620.conf b/conf/machine/asus620.conf
index 6c159a5..ef7e8a2 100644 (file)
--- a/conf/machine/asus620.conf
+++ b/conf/machine/asus620.conf
@@ -8,7 +8,7 @@
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
 
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
 
 ROOT_FLASH_SIZE = "32"
 VOLATILE_STORAGE_SIZE = "64"
@@ -33,4 +33,4 @@ module_autoload_g_ether = "g_ether"
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"
 
-require conf/machine/include/LAB-settings.conf
+require conf/machine/include/LAB-settings.inc

diff --git a/conf/machine/asus730.conf b/conf/machine/asus730.conf
index 7d8d881..814641d 100644 (file)
--- a/conf/machine/asus730.conf
+++ b/conf/machine/asus730.conf
@@ -9,10 +9,10 @@ TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-require conf/machine/include/tune-xscale.conf
+require conf/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 conf/machine/include/tune-iwmmxt.inc
 
 ROOT_FLASH_SIZE = "64"
 VOLATILE_STORAGE_SIZE = "64"

diff --git a/conf/machine/at91sam9263ek.conf b/conf/machine/at91sam9263ek.conf
index 4f3ae57..bf45d25 100644 (file)
--- a/conf/machine/at91sam9263ek.conf
+++ b/conf/machine/at91sam9263ek.conf
@@ -18,6 +18,6 @@ SERIAL_CONSOLE = "115200 ttyS0"
 
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
 
-require conf/machine/include/tune-arm926ejs.conf
+require conf/machine/include/tune-arm926ejs.inc
 
 KERNEL_IMAGETYPE = "uImage"

diff --git a/conf/machine/aximx50.conf b/conf/machine/aximx50.conf
index 32d7a2c..0dda949 100644 (file)
--- a/conf/machine/aximx50.conf
+++ b/conf/machine/aximx50.conf
@@ -9,10 +9,10 @@ TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt  "
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-require conf/machine/include/tune-xscale.conf
+require conf/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 conf/machine/include/tune-iwmmxt.inc
 
 ROOT_FLASH_SIZE = "256"
 VOLATILE_STORAGE_SIZE = "64"

diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index 429463c..c91bdcf 100644 (file)
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -5,7 +5,7 @@
 TARGET_ARCH = "arm"
 
 MACHINE_KERNEL_VERSION ?= "2.6"
-require conf/machine/include/collie-${MACHINE_KERNEL_VERSION}.conf
+require conf/machine/include/collie-${MACHINE_KERNEL_VERSION}.inc
 
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
@@ -18,7 +18,7 @@ IMAGE_LINGUAS = ""
 
 IMAGE_FSTYPES ?= "jffs2 tar.gz"
 
-require conf/machine/include/tune-strongarm.conf
+require conf/machine/include/tune-strongarm.inc
 
 ROOT_FLASH_SIZE = "14"
 # actually 14680064, see EXTRA_IMAGECMD above

diff --git a/conf/machine/compulab-pxa270.conf b/conf/machine/compulab-pxa270.conf
index c82c250..e6199f7 100644 (file)
--- a/conf/machine/compulab-pxa270.conf
+++ b/conf/machine/compulab-pxa270.conf
@@ -9,7 +9,7 @@ GUI_MACHINE_CLASS ?= "bigscreen"
 PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}"
 PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
 
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
 
 # used by sysvinit_2 package, so rebuild this
 # package if you change the SERIAL_CONSOLE setting

diff --git a/conf/machine/davinci-dvevm.conf b/conf/machine/davinci-dvevm.conf
index 10b4450..02e8e45 100644 (file)
--- a/conf/machine/davinci-dvevm.conf
+++ b/conf/machine/davinci-dvevm.conf
@@ -21,5 +21,5 @@ EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
 
 MACHINE_FEATURES = "kernel26 pcmcia usbhost alsa"
 
-require conf/machine/include/tune-arm926ejs.conf
+require conf/machine/include/tune-arm926ejs.inc
 

diff --git a/conf/machine/devkitidp-pxa255.conf b/conf/machine/devkitidp-pxa255.conf
index c7266fe..db9f268 100644 (file)
--- a/conf/machine/devkitidp-pxa255.conf
+++ b/conf/machine/devkitidp-pxa255.conf
@@ -12,7 +12,7 @@ PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}"
 PREFERRED_VERSION_u-boot = "1.1.6"
 UBOOT_MACHINE = "pxa255_idp_config"
 
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "115200 ttyS0"

diff --git a/conf/machine/dht-walnut.conf b/conf/machine/dht-walnut.conf
index 146ecf9..d490028 100644 (file)
--- a/conf/machine/dht-walnut.conf
+++ b/conf/machine/dht-walnut.conf
@@ -23,5 +23,5 @@ SERIAL_CONSOLE = "115200 ttyS0"
 
 
 #tune for the 405 cpu
-require conf/machine/include/tune-ppc405.conf
+require conf/machine/include/tune-ppc405.inc
 

diff --git a/conf/machine/efika.conf b/conf/machine/efika.conf
index ca1a7be..5a2fb2d 100644 (file)
--- a/conf/machine/efika.conf
+++ b/conf/machine/efika.conf
@@ -16,4 +16,4 @@ USE_VT = "0"
 SERIAL_CONSOLE = "115200 ttyPSC0"
 
 #tune for the MPC5200B cpu
-require conf/machine/include/tune-ppc603e.conf
+require conf/machine/include/tune-ppc603e.inc

diff --git a/conf/machine/ep93xx.conf b/conf/machine/ep93xx.conf
index 32f59aa..16d8c70 100644 (file)
--- a/conf/machine/ep93xx.conf
+++ b/conf/machine/ep93xx.conf
@@ -24,7 +24,7 @@ EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x40000 --pad=0x500000 "
 
 #tune for ep93xx cpus
 #can be used for crunch support later on
-#require conf/machine/include/tune-ep9312.conf
+#require conf/machine/include/tune-ep9312.inc
 
 
-require conf/machine/include/tune-arm920t.conf
+require conf/machine/include/tune-arm920t.inc

diff --git a/conf/machine/epia.conf b/conf/machine/epia.conf
index ea4b568..0750e4d 100644 (file)
--- a/conf/machine/epia.conf
+++ b/conf/machine/epia.conf
@@ -15,6 +15,4 @@ IMAGE_FSTYPES = "ext2.gz"
 MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2"
 MACHINE_TASK_PROVIDER = "task-base"
 
-
-require conf/machine/include/tune-c3.conf
-
+require conf/machine/include/tune-c3.inc

diff --git a/conf/machine/eteng500.conf b/conf/machine/eteng500.conf
index 7734461..91e3dbb 100644 (file)
--- a/conf/machine/eteng500.conf
+++ b/conf/machine/eteng500.conf
@@ -9,7 +9,7 @@ TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t"
 
 # Samsung S3C2xxx CPU
-require conf/machine/include/tune-arm920t.conf
+require conf/machine/include/tune-arm920t.inc
 
 ROOT_FLASH_SIZE = "32"
 VOLATILE_STORAGE_SIZE = "64"
@@ -34,4 +34,4 @@ module_autoload_g_ether = "g_ether"
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"
 
-require conf/machine/include/LAB-settings.conf
+require conf/machine/include/LAB-settings.inc

diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf
index 520f491..385bc91 100644 (file)
--- a/conf/machine/fic-gta01.conf
+++ b/conf/machine/fic-gta01.conf
@@ -40,4 +40,4 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad -n"
 EXTRA_IMAGEDEPENDS += "dfu-util-native"
 
 # tune for S3C24x0
-include conf/machine/include/tune-arm920t.conf
+include conf/machine/include/tune-arm920t.inc

diff --git a/conf/machine/fic-gta02.conf b/conf/machine/fic-gta02.conf
index 3b36ffa..099f16d 100644 (file)
--- a/conf/machine/fic-gta02.conf
+++ b/conf/machine/fic-gta02.conf
@@ -39,4 +39,4 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad -n"
 EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native"
 
 # tune for S3C24x0
-include conf/machine/include/tune-arm920t.conf
+include conf/machine/include/tune-arm920t.inc

diff --git a/conf/machine/fsg3be.conf b/conf/machine/fsg3be.conf
index a909a0f..c685922 100644 (file)
--- a/conf/machine/fsg3be.conf
+++ b/conf/machine/fsg3be.conf
@@ -17,7 +17,7 @@ KERNEL_CCSUFFIX = "-3.4.4+csl-arm-2005q3"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-3.4.4+csl-arm-2005q3 = "gcc-cross-kernel-3.4.4"
 PREFERRED_VERSION_virtual/${TARGET_PREFIX}gcc-3.4.4+csl-arm-2005q3 = "csl-arm-2005q3"
 
-require conf/machine/include/ixp4xx.conf
+require conf/machine/include/ixp4xx.inc
 
 # No room for jffs2 - the rootfs needs to be installed directly to disk
 IMAGE_FSTYPES = "tar.gz"

diff --git a/conf/machine/guinness.conf b/conf/machine/guinness.conf
index c35d3b3..626e755 100644 (file)
--- a/conf/machine/guinness.conf
+++ b/conf/machine/guinness.conf
@@ -19,5 +19,5 @@ GLIBC_EXTRA_OECONF = "--with-tls"
 
 MACHINE_FEATURES = "kernel26 usbhost ext2 pci acpi screen"
 
-#require conf/machine/include/tune-athlonmp.conf
+#require conf/machine/include/tune-athlonmp.inc
 

diff --git a/conf/machine/h1910.conf b/conf/machine/h1910.conf
index 131b651..2dac4b4 100644 (file)
--- a/conf/machine/h1910.conf
+++ b/conf/machine/h1910.conf
@@ -8,7 +8,7 @@
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
 
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
 
 VOLATILE_STORAGE_SIZE = "64"
 ROOT_FLASH_SIZE = "16"

diff --git a/conf/machine/h1940.conf b/conf/machine/h1940.conf
index bc30eb7..409eaca 100644 (file)
--- a/conf/machine/h1940.conf
+++ b/conf/machine/h1940.conf
@@ -23,5 +23,5 @@ SERIAL_CONSOLE = "115200 ttySAC2 vt100"
 USE_VT = "0"
 
 # tune for armv4t
-require conf/machine/include/tune-arm920t.conf
+require conf/machine/include/tune-arm920t.inc
 

diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf
index ecaebb8..60a732f 100644 (file)
--- a/conf/machine/h2200.conf
+++ b/conf/machine/h2200.conf
@@ -9,7 +9,7 @@ TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
 
 #Compile with armv5te optimizations, incompatible with armv4(t) cpus
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
 
 #Set some hints for metadata  
 VOLATILE_STORAGE_SIZE = "64"
@@ -37,4 +37,4 @@ module_autoload_snd-pcm-oss   = "snd-pcm-oss"
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"
 
-require conf/machine/include/LAB-settings.conf
+require conf/machine/include/LAB-settings.inc

diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf
index fe204f0..9cf8272 100644 (file)
--- a/conf/machine/h3600.conf
+++ b/conf/machine/h3600.conf
@@ -8,7 +8,7 @@
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 "
 
-require conf/machine/include/tune-strongarm.conf
+require conf/machine/include/tune-strongarm.inc
 
 # h3700, h3800 have 32, but let that be the bonus
 ROOT_FLASH_SIZE = "16"

diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf
index 8612be2..f475e20 100644 (file)
--- a/conf/machine/h3900.conf
+++ b/conf/machine/h3900.conf
@@ -8,7 +8,7 @@
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
 
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
 
 ROOT_FLASH_SIZE = "32"
 VOLATILE_STORAGE_SIZE = "64"
@@ -33,4 +33,4 @@ module_autoload_g_ether = "g_ether"
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"
 
-require conf/machine/include/LAB-settings.conf
+require conf/machine/include/LAB-settings.inc

diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf
index c28e651..f56bee0 100644 (file)
--- a/conf/machine/h4000.conf
+++ b/conf/machine/h4000.conf
@@ -8,7 +8,7 @@
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
 
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
 
 ROOT_FLASH_SIZE = "32"
 VOLATILE_STORAGE_SIZE = "64"
@@ -43,4 +43,4 @@ module_conf_acx = "blacklist acx"
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"
 
-require conf/machine/include/LAB-settings.conf
+require conf/machine/include/LAB-settings.inc

diff --git a/conf/machine/h5000.conf b/conf/machine/h5000.conf
index 87cc4c6..6ed836c 100644 (file)
--- a/conf/machine/h5000.conf
+++ b/conf/machine/h5000.conf
@@ -8,7 +8,7 @@
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te  h5xxx"
 
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
 
 ROOT_FLASH_SIZE = "32"
 VOLATILE_STORAGE_SIZE = "64"

diff --git a/conf/machine/h6300.conf b/conf/machine/h6300.conf
index a44d2d3..711ffd3 100644 (file)
--- a/conf/machine/h6300.conf
+++ b/conf/machine/h6300.conf
@@ -10,7 +10,7 @@ PACKAGE_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "arm armv4 armv4t"
 
 #Use OMAP 1510 cpu specifig arm9tdmi options for gcc
-require conf/machine/include/tune-arm9tdmi.conf
+require conf/machine/include/tune-arm9tdmi.inc
 
 MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "240"

diff --git a/conf/machine/htcalpine.conf b/conf/machine/htcalpine.conf
index 7cd36f1..63ab097 100644 (file)
--- a/conf/machine/htcalpine.conf
+++ b/conf/machine/htcalpine.conf
@@ -8,7 +8,7 @@
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
 
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
 
 ROOT_FLASH_SIZE = "32"
 VOLATILE_STORAGE_SIZE = "64"
@@ -33,4 +33,4 @@ module_autoload_g_ether = "g_ether"
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"
 
-require conf/machine/include/LAB-settings.conf
+require conf/machine/include/LAB-settings.inc

diff --git a/conf/machine/htcapache.conf b/conf/machine/htcapache.conf
index b46ac68..1b44742 100644 (file)
--- a/conf/machine/htcapache.conf
+++ b/conf/machine/htcapache.conf
@@ -8,7 +8,7 @@
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
 
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
 
 ROOT_FLASH_SIZE = "32"
 VOLATILE_STORAGE_SIZE = "64"
@@ -33,4 +33,4 @@ module_autoload_g_ether = "g_ether"
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"
 
-require conf/machine/include/LAB-settings.conf
+require conf/machine/include/LAB-settings.inc

diff --git a/conf/machine/htcblueangel.conf b/conf/machine/htcblueangel.conf
index 5150b86..6aa1885 100644 (file)
--- a/conf/machine/htcblueangel.conf
+++ b/conf/machine/htcblueangel.conf
@@ -8,7 +8,7 @@
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
 
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
 
 ROOT_FLASH_SIZE = "32"
 VOLATILE_STORAGE_SIZE = "128"
@@ -56,4 +56,4 @@ module_conf_acx = "blacklist acx"
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"
 
-require conf/machine/include/LAB-settings.conf
+require conf/machine/include/LAB-settings.inc

diff --git a/conf/machine/htchimalaya.conf b/conf/machine/htchimalaya.conf
index 1edd224..8430cb5 100644 (file)
--- a/conf/machine/htchimalaya.conf
+++ b/conf/machine/htchimalaya.conf
@@ -8,7 +8,7 @@
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
 
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
 
 ROOT_FLASH_SIZE = "32"
 VOLATILE_STORAGE_SIZE = "64"
@@ -33,4 +33,4 @@ module_autoload_snd-pcm-oss = "snd-pcm-oss"
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"
 
-require conf/machine/include/LAB-settings.conf
+require conf/machine/include/LAB-settings.inc

diff --git a/conf/machine/htcsable.conf b/conf/machine/htcsable.conf
index 5fb2bb4..f932647 100644 (file)
--- a/conf/machine/htcsable.conf
+++ b/conf/machine/htcsable.conf
@@ -8,7 +8,7 @@
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
 
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
 
 ROOT_FLASH_SIZE = "32"
 VOLATILE_STORAGE_SIZE = "64"
@@ -33,4 +33,4 @@ module_autoload_snd-pcm-oss = "snd-pcm-oss"
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"
 
-require conf/machine/include/LAB-settings.conf
+require conf/machine/include/LAB-settings.inc

diff --git a/conf/machine/htctornado.conf b/conf/machine/htctornado.conf
index ca77ec9..af91bcb 100644 (file)
--- a/conf/machine/htctornado.conf
+++ b/conf/machine/htctornado.conf
@@ -25,4 +25,4 @@ ROOT_FLASH_SIZE = "30"
 EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 -n"
 
 # cpu tuning
-include conf/machine/include/tune-arm926ejs.conf
+include conf/machine/include/tune-arm926ejs.inc

diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf
index a335102..634b388 100644 (file)
--- a/conf/machine/htcuniversal.conf
+++ b/conf/machine/htcuniversal.conf
@@ -9,10 +9,10 @@ TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = " armv4t armv5te iwmmxt"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-require conf/machine/include/tune-xscale.conf
+require conf/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 conf/machine/include/tune-iwmmxt.inc
 
 MACHINE_GUI_CLASS = "bigscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "480"

diff --git a/conf/machine/htcwallaby.conf b/conf/machine/htcwallaby.conf
index f7b0a89..38b0c01 100644 (file)
--- a/conf/machine/htcwallaby.conf
+++ b/conf/machine/htcwallaby.conf
@@ -8,7 +8,7 @@
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 "
 
-require conf/machine/include/tune-strongarm.conf
+require conf/machine/include/tune-strongarm.inc
 
 ROOT_FLASH_SIZE = "16" 
 VOLATILE_STORAGE_SIZE = "32"

diff --git a/conf/machine/hx2000.conf b/conf/machine/hx2000.conf
index 279b273..8c9d2d0 100644 (file)
--- a/conf/machine/hx2000.conf
+++ b/conf/machine/hx2000.conf
@@ -30,10 +30,10 @@ MACHINE_DISPLAY_WIDTH_PIXELS = "240"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-require conf/machine/include/tune-xscale.conf
+require conf/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 conf/machine/include/tune-iwmmxt.inc
 
 module_autoload_evdev = "evdev"
 module_autoload_pcmcia = "pcmcia"

diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf
index d7f8520..141470b 100644 (file)
--- a/conf/machine/hx4700.conf
+++ b/conf/machine/hx4700.conf
@@ -9,10 +9,10 @@ TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt  "
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-require conf/machine/include/tune-xscale.conf
+require conf/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 conf/machine/include/tune-iwmmxt.inc
 
 ROOT_FLASH_SIZE = "80"
 VOLATILE_STORAGE_SIZE = "64"

diff --git a/conf/machine/include/LAB-settings.conf b/conf/machine/include/LAB-settings.conf
deleted file mode 100644 (file)
index d0100c9..0000000
--- a/conf/machine/include/LAB-settings.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Settings for LAB (Linux As Bootloader) support.
-# Machines which support (or want to support) LAB,
-# include this.
-#
-
-# LAB can only resolve relative symlinks
-#ROOTFS_POSTPROCESS_COMMAND += "make_zimage_symlink_relative; "

diff --git a/conf/machine/include/LAB-settings.inc b/conf/machine/include/LAB-settings.inc
new file mode 100644 (file)
index 0000000..d0100c9
--- /dev/null
+++ b/conf/machine/include/LAB-settings.inc
@@ -0,0 +1,8 @@
+#
+# Settings for LAB (Linux As Bootloader) support.
+# Machines which support (or want to support) LAB,
+# include this.
+#
+
+# LAB can only resolve relative symlinks
+#ROOTFS_POSTPROCESS_COMMAND += "make_zimage_symlink_relative; "

diff --git a/conf/machine/include/collie-2.4.conf b/conf/machine/include/collie-2.4.conf
deleted file mode 100644 (file)
index eed8de9..0000000
--- a/conf/machine/include/collie-2.4.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-PREFERRED_PROVIDER_virtual/kernel = "openzaurus-sa"
-COLLIE_MEMORY_SIZE ?= "64"
-
-# workaround for bug 1877
-PREFERRED_PROVIDER_hostap-modules = "hostap-modules"
-
-SERIAL_CONSOLE = "115200 ttyS0"
-#
-# no keyboard feature because 2.4 kernel keymap works ok and we have limited flash
-# no usbgadget feature because 2.4 kernel handle it in own way on each machine
-#
-MACHINE_FEATURES = "kernel24 apm pcmcia screen irda"
-
-MACHINE_EXTRA_RRECOMMENDS = "kernel-module-net-fd kernel-module-sa1100-bi \
-                             kernel-module-usbdcore kernel-module-usbdmonitor \
-                             sharp-sdmmc-support"
-
-# kernel-module-collie-ssp kernel-module-collie-tc35143af if buzzer.patch applied
-
-# Later versions are broken on kernel 2.4
-PREFERRED_VERSION_orinoco-modules = "0.13e"

diff --git a/conf/machine/include/collie-2.4.inc b/conf/machine/include/collie-2.4.inc
new file mode 100644 (file)
index 0000000..eed8de9
--- /dev/null
+++ b/conf/machine/include/collie-2.4.inc
@@ -0,0 +1,21 @@
+PREFERRED_PROVIDER_virtual/kernel = "openzaurus-sa"
+COLLIE_MEMORY_SIZE ?= "64"
+
+# workaround for bug 1877
+PREFERRED_PROVIDER_hostap-modules = "hostap-modules"
+
+SERIAL_CONSOLE = "115200 ttyS0"
+#
+# no keyboard feature because 2.4 kernel keymap works ok and we have limited flash
+# no usbgadget feature because 2.4 kernel handle it in own way on each machine
+#
+MACHINE_FEATURES = "kernel24 apm pcmcia screen irda"
+
+MACHINE_EXTRA_RRECOMMENDS = "kernel-module-net-fd kernel-module-sa1100-bi \
+                             kernel-module-usbdcore kernel-module-usbdmonitor \
+                             sharp-sdmmc-support"
+
+# kernel-module-collie-ssp kernel-module-collie-tc35143af if buzzer.patch applied
+
+# Later versions are broken on kernel 2.4
+PREFERRED_VERSION_orinoco-modules = "0.13e"

diff --git a/conf/machine/include/collie-2.6.conf b/conf/machine/include/collie-2.6.conf
deleted file mode 100644 (file)
index f22ffce..0000000
--- a/conf/machine/include/collie-2.6.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
-
-SERIAL_CONSOLE = "115200 ttySA0"
-MACHINE_FEATURES = "kernel26 apm pcmcia screen irda usbgadget keyboard touchscreen wifi"
-
-MACHINE_EXTRA_RDEPENDS = "kernel-modules"

diff --git a/conf/machine/include/collie-2.6.inc b/conf/machine/include/collie-2.6.inc
new file mode 100644 (file)
index 0000000..f22ffce
--- /dev/null
+++ b/conf/machine/include/collie-2.6.inc
@@ -0,0 +1,6 @@
+PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
+
+SERIAL_CONSOLE = "115200 ttySA0"
+MACHINE_FEATURES = "kernel26 apm pcmcia screen irda usbgadget keyboard touchscreen wifi"
+
+MACHINE_EXTRA_RDEPENDS = "kernel-modules"

diff --git a/conf/machine/include/gumstix.inc b/conf/machine/include/gumstix.inc
index 67fefd3..afcec66 100644 (file)
--- a/conf/machine/include/gumstix.inc
+++ b/conf/machine/include/gumstix.inc
@@ -37,5 +37,5 @@ SERIAL_CONSOLE = "115200 ttyS0 vt100"
 #don't try to access tty1
 USE_VT = "0"
 
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
 

diff --git a/conf/machine/include/ixp4xx.conf b/conf/machine/include/ixp4xx.conf
deleted file mode 100644 (file)
index 6f0d5b2..0000000
--- a/conf/machine/include/ixp4xx.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-#@TYPE: Machine configuration
-#@NAME: ixp4xx
-#@DESCRIPTION: genric machine configuration for ixp4xx platforms
-
-MACHINE_FEATURES = "kernel26 usbhost ext2"
-
-ROOT_FLASH_SIZE ?= "12"
-
-EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x20000 -n"
-
-PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel"
-
-require conf/machine/include/tune-xscale.conf
-require conf/machine/include/tune-thumb.conf
-
-#-------------------------------------------------------------------------------
-# Board defaults
-#-------------------------------------------------------------------------------
-# These values are board specific but they seem to be common to a large number
-# of boards so are reasonable defaults.
-SERIAL_CONSOLE = "115200 ttyS0"
-KERNEL_CONSOLE = "ttyS0,115200n8"
-USE_VT = "0"

diff --git a/conf/machine/include/ixp4xx.inc b/conf/machine/include/ixp4xx.inc
new file mode 100644 (file)
index 0000000..175ec80
--- /dev/null
+++ b/conf/machine/include/ixp4xx.inc
@@ -0,0 +1,23 @@
+#@TYPE: Machine configuration
+#@NAME: ixp4xx
+#@DESCRIPTION: genric machine configuration for ixp4xx platforms
+
+MACHINE_FEATURES = "kernel26 usbhost ext2"
+
+ROOT_FLASH_SIZE ?= "12"
+
+EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x20000 -n"
+
+PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel"
+
+require conf/machine/include/tune-xscale.inc
+require conf/machine/include/tune-thumb.inc
+
+#-------------------------------------------------------------------------------
+# Board defaults
+#-------------------------------------------------------------------------------
+# These values are board specific but they seem to be common to a large number
+# of boards so are reasonable defaults.
+SERIAL_CONSOLE = "115200 ttyS0"
+KERNEL_CONSOLE = "ttyS0,115200n8"
+USE_VT = "0"

diff --git a/conf/machine/include/lsppc.conf b/conf/machine/include/lsppc.conf
deleted file mode 100644 (file)
index 064db79..0000000
--- a/conf/machine/include/lsppc.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-#@TYPE: Machine configuration
-#@Name: Buffalo PPC Linkstations
-#@DESCRIPTION: Generic Machine configuration for ppc based linkstations
-
-
-TARGET_ARCH = "powerpc"
-PACKAGE_EXTRA_ARCHS = "ppc ppc603e"
-MACHINE_FEATURES = "kernel26 usbhost ext2 pci uboot"
-TARGET_FPU = "hard"
-
-USE_DEVFS = "0"
-
-BOOTSTRAP_EXTRA_RDEPENDS = "udev module-init-tools kernel-modules"
-PREFERRED_PROVIDER_virtual/kernel = "linux-linkstationppc"
-
-#don't try to access tty1
-USE_VT = "0"
-
-HOTPLUG = "udev"
-udevdir = "/dev"
-
-IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt"
-IMAGE_FSTYPES = "tar.gz"
-
-#tune for the MPC5200B cpu
-require conf/machine/include/tune-ppc603e.conf

diff --git a/conf/machine/include/lsppc.inc b/conf/machine/include/lsppc.inc
new file mode 100644 (file)
index 0000000..632a9ed
--- /dev/null
+++ b/conf/machine/include/lsppc.inc
@@ -0,0 +1,26 @@
+#@TYPE: Machine configuration
+#@Name: Buffalo PPC Linkstations
+#@DESCRIPTION: Generic Machine configuration for ppc based linkstations
+
+
+TARGET_ARCH = "powerpc"
+PACKAGE_EXTRA_ARCHS = "ppc ppc603e"
+MACHINE_FEATURES = "kernel26 usbhost ext2 pci uboot"
+TARGET_FPU = "hard"
+
+USE_DEVFS = "0"
+
+BOOTSTRAP_EXTRA_RDEPENDS = "udev module-init-tools kernel-modules"
+PREFERRED_PROVIDER_virtual/kernel = "linux-linkstationppc"
+
+#don't try to access tty1
+USE_VT = "0"
+
+HOTPLUG = "udev"
+udevdir = "/dev"
+
+IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt"
+IMAGE_FSTYPES = "tar.gz"
+
+#tune for the MPC5200B cpu
+require conf/machine/include/tune-ppc603e.inc

diff --git a/conf/machine/include/motorola-ezx-base.inc b/conf/machine/include/motorola-ezx-base.inc
index c1eac82..82512c8 100644 (file)
--- a/conf/machine/include/motorola-ezx-base.inc
+++ b/conf/machine/include/motorola-ezx-base.inc
@@ -28,6 +28,6 @@ IMAGE_DEVICE_TABLES = "files/device_table-minimal.txt \
                        files/device_table-ezx.txt"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
 
 SERIAL_CONSOLE = "115200 ttyS0"

diff --git a/conf/machine/include/motorola-ezx.conf b/conf/machine/include/motorola-ezx.conf
deleted file mode 100644 (file)
index e87f6aa..0000000
--- a/conf/machine/include/motorola-ezx.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-# choose the proper kernel for this hardware
-PREFERRED_PROVIDER_virtual/kernel = "ezx-kernels"
-# we don't need support for kernel 2.4
-MODUTILS = "26"
-# build tar.gz for SD/MMC/Transflash and jffs2 for later when we have mtd
-IMAGE_FSTYPES = "tar.gz jffs2"
-
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils apm irda-utils udev-utils ppp ppp-dialin module-init-tools"
-
-#
-# disable all modules until we have something that boots...
-#
-
-# Ethernet modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcnet-cs"
-# NFS Modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc"
-# Crypto Modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-des kernel-module-md5"
-# SMB and CRAMFS
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-smbfs kernel-module-cramfs"
-# Serial Modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-8250 kernel-module-serial-cs"
-# Bluetooth Modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel-module-rfcomm kernel-module-hci-vhci \
-#                              kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \
-#                              kernel-module-bt3c-cs kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs"
-# Infrared Modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pxaficp-ir kernel-module-irda kernel-module-ircomm \
-#                             kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet kernel-module-ir-usb"
-#
-# USB Gadget Modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \
-#                             kernel-module-g-serial kernel-module-g-ether"
-#
-# Sound Modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-snd-mixer-oss kernel-module-snd-pcm-oss"
-#BOOTSTRAP_EXTRA_SOUND     = "kernel-module-soundcore kernel-module-snd kernel-module-snd-page-alloc 
-#                              kernel-module-snd-timer kernel-module-snd-pcm  \
-#                              kernel-module-snd-soc-core kernel-module-snd-soc-pxa2xx kernel-module-snd-soc-pxa2xx-i2s"
-#                             

diff --git a/conf/machine/include/motorola-ezx.inc b/conf/machine/include/motorola-ezx.inc
new file mode 100644 (file)
index 0000000..e87f6aa
--- /dev/null
+++ b/conf/machine/include/motorola-ezx.inc
@@ -0,0 +1,41 @@
+# choose the proper kernel for this hardware
+PREFERRED_PROVIDER_virtual/kernel = "ezx-kernels"
+# we don't need support for kernel 2.4
+MODUTILS = "26"
+# build tar.gz for SD/MMC/Transflash and jffs2 for later when we have mtd
+IMAGE_FSTYPES = "tar.gz jffs2"
+
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils apm irda-utils udev-utils ppp ppp-dialin module-init-tools"
+
+#
+# disable all modules until we have something that boots...
+#
+
+# Ethernet modules
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcnet-cs"
+# NFS Modules
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc"
+# Crypto Modules
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-des kernel-module-md5"
+# SMB and CRAMFS
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-smbfs kernel-module-cramfs"
+# Serial Modules
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-8250 kernel-module-serial-cs"
+# Bluetooth Modules
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel-module-rfcomm kernel-module-hci-vhci \
+#                              kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \
+#                              kernel-module-bt3c-cs kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs"
+# Infrared Modules
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pxaficp-ir kernel-module-irda kernel-module-ircomm \
+#                             kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet kernel-module-ir-usb"
+#
+# USB Gadget Modules
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \
+#                             kernel-module-g-serial kernel-module-g-ether"
+#
+# Sound Modules
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-snd-mixer-oss kernel-module-snd-pcm-oss"
+#BOOTSTRAP_EXTRA_SOUND     = "kernel-module-soundcore kernel-module-snd kernel-module-snd-page-alloc 
+#                              kernel-module-snd-timer kernel-module-snd-pcm  \
+#                              kernel-module-snd-soc-core kernel-module-snd-soc-pxa2xx kernel-module-snd-soc-pxa2xx-i2s"
+#                             

diff --git a/conf/machine/include/palm.conf b/conf/machine/include/palm.conf
deleted file mode 100644 (file)
index 5371016..0000000
--- a/conf/machine/include/palm.conf
+++ /dev/null
@@ -1,86 +0,0 @@
-#
-# Hardware-based properties
-#
-
-TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te"
-
-SERIAL_CONSOLE = "115200 ttyS0"
-
-# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-require conf/machine/include/tune-xscale.conf
-
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth irda usbgadget screen ext2"
-
-#
-# Software/packages selection
-#
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-hackndev-2.6"
-
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
-
-module_autoload_sa1100-rtc = "sa1100-rtc"
-module_autoload_snd-ac97-bus = "snd-ac97-bus"
-module_autoload_apm_power = "apm_power"
-module_autoload_backlight = "backlight"
-module_autoload_battery = "battery"
-module_autoload_bcm2035_uart = "bcm2035_uart"
-module_autoload_gpioed = "gpioed"
-module_autoload_gpioed-ng = "gpioed-ng"
-module_autoload_lcd = "lcd"
-module_autoload_led-class = "led-class"
-module_autoload_leds-palmld = "leds-palmld"
-module_autoload_ledtrig-heartbeat = "ledtrig-heartbeat"
-module_autoload_ledtrig-hwtimer = "ledtrig-hwtimer"
-module_autoload_ledtrig-timer = "ledtrig-timer"
-module_autoload_palmld_battery = "palmld-battery"
-module_autoload_palmld_ide = "palmld-ide"
-module_autoload_palmld_pcmcia = "palmld-pcmcia"
-module_autoload_pcmcia = "pcmcia"
-module_autoload_pcmcia_core = "pcmcia-core"
-module_autoload_pda_power = "pda_power"
-module_autoload_pxa2xx_core = "pxa2xx-core"
-module_autoload_snd = "snd"
-module_autoload_snd-ac97-codec = "snd-ac97-codec"
-module_autoload_snd-mixer-oss = "snd-mixer-oss"
-module_autoload_snd-page-alloc = "snd-page-alloc"
-module_autoload_snd-pcm = "snd-pcm"
-module_autoload_snd-pcm-oss = "snd-pcm-oss"
-module_autoload_snd-pxa2xx-pcm = "snd-pxa2xx-pcm"
-module_autoload_snd-pxa2xx-ac97 = "snd-pxa2xx-ac97"
-module_autoload_snd-seq = "snd-seq"
-module_autoload_snd-seq-device = "snd-seq-device"
-module_autoload_seq-midi-event = "seq-midi-event"
-module_autoload_snd-seq-oss = "snd-seq-oss"
-module_autoload_snd-timer = "snd-timer"
-module_autoload_soundcore = "soundcore"
-module_autoload_wm97xx-ts = "wm97xx-ts"
-module_autoload_pxa27x-keyboard = "pxa27x-keyboard"
-module_autoload_palmtx_battery = "palmtx_battery"
-module_autoload_palmz72_battery = "palmz72_battery"
-module_autoload_i2c-dev = "i2c-dev"
-module_autoload_i2c-pxa = "i2c-pxa"
-
-
-MACHINE_EXTRA_RRECOMMENDS = "\
-       kernel-module-ac97-bus \
-       kernel-module-apm-power \
-       kernel-module-backlight \
-       kernel-module-battery \
-       kernel-module-led-class \
-       kernel-module-lcd \
-       kernel-module-gpioed \
-       kernel-module-gpioed-ng \
-       kernel-module-external-power \
-       kernel-module-snd \
-       kernel-module-snd-ac97-codec \
-       kernel-module-snd-page-alloc \
-       kernel-module-snd-pcm \
-       kernel-module-snd-seq \
-       kernel-module-snd-seq-device \
-       kernel-module-snd-seq-midi-event \
-       kernel-module-snd-seq-oss \
-       kernel-module-snd-timer \
-       kernel-module-soundcore \
-       "

diff --git a/conf/machine/include/palm.inc b/conf/machine/include/palm.inc
new file mode 100644 (file)
index 0000000..5eb7806
--- /dev/null
+++ b/conf/machine/include/palm.inc
@@ -0,0 +1,86 @@
+#
+# Hardware-based properties
+#
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te"
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
+require conf/machine/include/tune-xscale.inc
+
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth irda usbgadget screen ext2"
+
+#
+# Software/packages selection
+#
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-hackndev-2.6"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+
+module_autoload_sa1100-rtc = "sa1100-rtc"
+module_autoload_snd-ac97-bus = "snd-ac97-bus"
+module_autoload_apm_power = "apm_power"
+module_autoload_backlight = "backlight"
+module_autoload_battery = "battery"
+module_autoload_bcm2035_uart = "bcm2035_uart"
+module_autoload_gpioed = "gpioed"
+module_autoload_gpioed-ng = "gpioed-ng"
+module_autoload_lcd = "lcd"
+module_autoload_led-class = "led-class"
+module_autoload_leds-palmld = "leds-palmld"
+module_autoload_ledtrig-heartbeat = "ledtrig-heartbeat"
+module_autoload_ledtrig-hwtimer = "ledtrig-hwtimer"
+module_autoload_ledtrig-timer = "ledtrig-timer"
+module_autoload_palmld_battery = "palmld-battery"
+module_autoload_palmld_ide = "palmld-ide"
+module_autoload_palmld_pcmcia = "palmld-pcmcia"
+module_autoload_pcmcia = "pcmcia"
+module_autoload_pcmcia_core = "pcmcia-core"
+module_autoload_pda_power = "pda_power"
+module_autoload_pxa2xx_core = "pxa2xx-core"
+module_autoload_snd = "snd"
+module_autoload_snd-ac97-codec = "snd-ac97-codec"
+module_autoload_snd-mixer-oss = "snd-mixer-oss"
+module_autoload_snd-page-alloc = "snd-page-alloc"
+module_autoload_snd-pcm = "snd-pcm"
+module_autoload_snd-pcm-oss = "snd-pcm-oss"
+module_autoload_snd-pxa2xx-pcm = "snd-pxa2xx-pcm"
+module_autoload_snd-pxa2xx-ac97 = "snd-pxa2xx-ac97"
+module_autoload_snd-seq = "snd-seq"
+module_autoload_snd-seq-device = "snd-seq-device"
+module_autoload_seq-midi-event = "seq-midi-event"
+module_autoload_snd-seq-oss = "snd-seq-oss"
+module_autoload_snd-timer = "snd-timer"
+module_autoload_soundcore = "soundcore"
+module_autoload_wm97xx-ts = "wm97xx-ts"
+module_autoload_pxa27x-keyboard = "pxa27x-keyboard"
+module_autoload_palmtx_battery = "palmtx_battery"
+module_autoload_palmz72_battery = "palmz72_battery"
+module_autoload_i2c-dev = "i2c-dev"
+module_autoload_i2c-pxa = "i2c-pxa"
+
+
+MACHINE_EXTRA_RRECOMMENDS = "\
+       kernel-module-ac97-bus \
+       kernel-module-apm-power \
+       kernel-module-backlight \
+       kernel-module-battery \
+       kernel-module-led-class \
+       kernel-module-lcd \
+       kernel-module-gpioed \
+       kernel-module-gpioed-ng \
+       kernel-module-external-power \
+       kernel-module-snd \
+       kernel-module-snd-ac97-codec \
+       kernel-module-snd-page-alloc \
+       kernel-module-snd-pcm \
+       kernel-module-snd-seq \
+       kernel-module-snd-seq-device \
+       kernel-module-snd-seq-midi-event \
+       kernel-module-snd-seq-oss \
+       kernel-module-snd-timer \
+       kernel-module-soundcore \
+       "

diff --git a/conf/machine/include/poodle-2.6.conf b/conf/machine/include/poodle-2.6.conf
deleted file mode 100644 (file)
index fa24a32..0000000
--- a/conf/machine/include/poodle-2.6.conf
+++ /dev/null
@@ -1 +0,0 @@
-require conf/machine/include/zaurus-2.6.inc

diff --git a/conf/machine/include/poodle-2.6.inc b/conf/machine/include/poodle-2.6.inc
new file mode 100644 (file)
index 0000000..fa24a32
--- /dev/null
+++ b/conf/machine/include/poodle-2.6.inc
@@ -0,0 +1 @@
+require conf/machine/include/zaurus-2.6.inc

diff --git a/conf/machine/include/qemu.conf b/conf/machine/include/qemu.conf
deleted file mode 100644 (file)
index 26b78a6..0000000
--- a/conf/machine/include/qemu.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-PCMCIA_MANAGER = "pcmciautils"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-GUI_MACHINE_CLASS = "bigscreen"
-GPE_EXTRA_INSTALL += "gaim sylpheed"
-
-MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget screen"
-
-IMAGE_FSTYPES ?= "tar.bz2 ext2"
-
-ROOT_FLASH_SIZE = "200"
-IMAGE_ROOTFS_SIZE_ext2 = "200000"

diff --git a/conf/machine/include/qemu.inc b/conf/machine/include/qemu.inc
new file mode 100644 (file)
index 0000000..26b78a6
--- /dev/null
+++ b/conf/machine/include/qemu.inc
@@ -0,0 +1,11 @@
+PCMCIA_MANAGER = "pcmciautils"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+GUI_MACHINE_CLASS = "bigscreen"
+GPE_EXTRA_INSTALL += "gaim sylpheed"
+
+MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget screen"
+
+IMAGE_FSTYPES ?= "tar.bz2 ext2"
+
+ROOT_FLASH_SIZE = "200"
+IMAGE_ROOTFS_SIZE_ext2 = "200000"

diff --git a/conf/machine/include/simpad-2.4.conf b/conf/machine/include/simpad-2.4.conf
deleted file mode 100644 (file)
index 06f12f5..0000000
--- a/conf/machine/include/simpad-2.4.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-PREFERRED_PROVIDER_virtual/kernel = "opensimpad-64+0"
-
-MACHINE_FEATURES_append = "kernel24"
-MACHINE_EXTRA_RRECOMMENDS = " kernel-module-sa1100-ir \
-       kernel-module-sa1100usb-core kernel-module-usb-eth \
-       kernel-module-pcnet-cs kernel-module-8390 "
-
-USE_DEVFS = "1"
-
-PREFERRED_PROVIDER_hostap-modules = "hostap-modules"
-
-# Later versions are broken on kernel 2.4
-PREFERRED_VERSION_orinoco-modules = "0.13e"
-

diff --git a/conf/machine/include/simpad-2.4.inc b/conf/machine/include/simpad-2.4.inc
new file mode 100644 (file)
index 0000000..06f12f5
--- /dev/null
+++ b/conf/machine/include/simpad-2.4.inc
@@ -0,0 +1,14 @@
+PREFERRED_PROVIDER_virtual/kernel = "opensimpad-64+0"
+
+MACHINE_FEATURES_append = "kernel24"
+MACHINE_EXTRA_RRECOMMENDS = " kernel-module-sa1100-ir \
+       kernel-module-sa1100usb-core kernel-module-usb-eth \
+       kernel-module-pcnet-cs kernel-module-8390 "
+
+USE_DEVFS = "1"
+
+PREFERRED_PROVIDER_hostap-modules = "hostap-modules"
+
+# Later versions are broken on kernel 2.4
+PREFERRED_VERSION_orinoco-modules = "0.13e"
+

diff --git a/conf/machine/include/simpad-2.6.conf b/conf/machine/include/simpad-2.6.conf
deleted file mode 100644 (file)
index e485c7b..0000000
--- a/conf/machine/include/simpad-2.6.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFERRED_PROVIDER_virtual/kernel = "linux"
-
-PCMCIA_MANAGER ?= "pcmciautils"
-
-MACHINE_FEATURES_append = "kernel26"

diff --git a/conf/machine/include/simpad-2.6.inc b/conf/machine/include/simpad-2.6.inc
new file mode 100644 (file)
index 0000000..e485c7b
--- /dev/null
+++ b/conf/machine/include/simpad-2.6.inc
@@ -0,0 +1,5 @@
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+
+PCMCIA_MANAGER ?= "pcmciautils"
+
+MACHINE_FEATURES_append = "kernel26"

diff --git a/conf/machine/include/tune-arm1136jf-s.conf b/conf/machine/include/tune-arm1136jf-s.conf
deleted file mode 100644 (file)
index a69df82..0000000
--- a/conf/machine/include/tune-arm1136jf-s.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-TARGET_CC_ARCH = "-march=armv6j -mtune=arm1136jf-s -mfpu=vfp -mfloat-abi=softfp"
-FEED_ARCH = "armv6"
-PACKAGE_ARCH = "armv6"

diff --git a/conf/machine/include/tune-arm1136jf-s.inc b/conf/machine/include/tune-arm1136jf-s.inc
new file mode 100644 (file)
index 0000000..a69df82
--- /dev/null
+++ b/conf/machine/include/tune-arm1136jf-s.inc
@@ -0,0 +1,3 @@
+TARGET_CC_ARCH = "-march=armv6j -mtune=arm1136jf-s -mfpu=vfp -mfloat-abi=softfp"
+FEED_ARCH = "armv6"
+PACKAGE_ARCH = "armv6"

diff --git a/conf/machine/include/tune-arm920t.conf b/conf/machine/include/tune-arm920t.conf
deleted file mode 100644 (file)
index b142d33..0000000
--- a/conf/machine/include/tune-arm920t.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-FEED_ARCH = "armv4t"
-PACKAGE_ARCH = "armv4t" 
-TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t"
-

diff --git a/conf/machine/include/tune-arm920t.inc b/conf/machine/include/tune-arm920t.inc
new file mode 100644 (file)
index 0000000..b142d33
--- /dev/null
+++ b/conf/machine/include/tune-arm920t.inc
@@ -0,0 +1,4 @@
+FEED_ARCH = "armv4t"
+PACKAGE_ARCH = "armv4t" 
+TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t"
+

diff --git a/conf/machine/include/tune-arm926ejs.conf b/conf/machine/include/tune-arm926ejs.conf
deleted file mode 100644 (file)
index c3e8d7a..0000000
--- a/conf/machine/include/tune-arm926ejs.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-FEED_ARCH = "armv5te"
-
-# For gcc 3.x you need:
-#TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs"
-# For gcc 4.x you need:
-TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ej-s"
-PACKAGE_ARCH = "armv5te"

diff --git a/conf/machine/include/tune-arm926ejs.inc b/conf/machine/include/tune-arm926ejs.inc
new file mode 100644 (file)
index 0000000..c3e8d7a
--- /dev/null
+++ b/conf/machine/include/tune-arm926ejs.inc
@@ -0,0 +1,7 @@
+FEED_ARCH = "armv5te"
+
+# For gcc 3.x you need:
+#TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs"
+# For gcc 4.x you need:
+TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ej-s"
+PACKAGE_ARCH = "armv5te"

diff --git a/conf/machine/include/tune-arm9tdmi.conf b/conf/machine/include/tune-arm9tdmi.conf
deleted file mode 100644 (file)
index d097b07..0000000
--- a/conf/machine/include/tune-arm9tdmi.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-PACKAGE_ARCH = "armv4t"
-TARGET_CC_ARCH = "-mcpu=arm9tdmi -mtune=arm9tdmi"

diff --git a/conf/machine/include/tune-arm9tdmi.inc b/conf/machine/include/tune-arm9tdmi.inc
new file mode 100644 (file)
index 0000000..d097b07
--- /dev/null
+++ b/conf/machine/include/tune-arm9tdmi.inc
@@ -0,0 +1,2 @@
+PACKAGE_ARCH = "armv4t"
+TARGET_CC_ARCH = "-mcpu=arm9tdmi -mtune=arm9tdmi"

diff --git a/conf/machine/include/tune-athlonmp.conf b/conf/machine/include/tune-athlonmp.conf
deleted file mode 100644 (file)
index b2d0e70..0000000
--- a/conf/machine/include/tune-athlonmp.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-TARGET_CC_ARCH = "-march=i686"
-PACKAGE_ARCH = "i686"
-

diff --git a/conf/machine/include/tune-athlonmp.inc b/conf/machine/include/tune-athlonmp.inc
new file mode 100644 (file)
index 0000000..b2d0e70
--- /dev/null
+++ b/conf/machine/include/tune-athlonmp.inc
@@ -0,0 +1,3 @@
+TARGET_CC_ARCH = "-march=i686"
+PACKAGE_ARCH = "i686"
+

diff --git a/conf/machine/include/tune-c3.conf b/conf/machine/include/tune-c3.conf
deleted file mode 100644 (file)
index e6a522a..0000000
--- a/conf/machine/include/tune-c3.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-TARGET_CC_ARCH = "-march=c3 -mtune=c3"
-PACKAGE_ARCH = "i586"
-

diff --git a/conf/machine/include/tune-c3.inc b/conf/machine/include/tune-c3.inc
new file mode 100644 (file)
index 0000000..e6a522a
--- /dev/null
+++ b/conf/machine/include/tune-c3.inc
@@ -0,0 +1,3 @@
+TARGET_CC_ARCH = "-march=c3 -mtune=c3"
+PACKAGE_ARCH = "i586"
+

diff --git a/conf/machine/include/tune-ep9312.conf b/conf/machine/include/tune-ep9312.conf
deleted file mode 100644 (file)
index 0982cf2..0000000
--- a/conf/machine/include/tune-ep9312.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-TARGET_CC_ARCH = "-march=ep9312 -mtune=ep9312 -mcpu=ep9312"
-# add "-mfp=maverick" for newer gcc versions > 4.0
-
-#set arch to ep9312 for all generated packages
-PACKAGE_ARCH = "ep9312"
-

diff --git a/conf/machine/include/tune-ep9312.inc b/conf/machine/include/tune-ep9312.inc
new file mode 100644 (file)
index 0000000..0982cf2
--- /dev/null
+++ b/conf/machine/include/tune-ep9312.inc
@@ -0,0 +1,6 @@
+TARGET_CC_ARCH = "-march=ep9312 -mtune=ep9312 -mcpu=ep9312"
+# add "-mfp=maverick" for newer gcc versions > 4.0
+
+#set arch to ep9312 for all generated packages
+PACKAGE_ARCH = "ep9312"
+

diff --git a/conf/machine/include/tune-iwmmxt.conf b/conf/machine/include/tune-iwmmxt.conf
deleted file mode 100644 (file)
index 8376fac..0000000
--- a/conf/machine/include/tune-iwmmxt.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# Configurations for the Intel PXA27x Appications Processor Family. 
-# Please use tune-xscale for PXA255/PXA26x based processors.
-TARGET_CC_ARCH = "-march=iwmmxt -mcpu=iwmmxt -mtune=iwmmxt"
-PACKAGE_ARCH = "iwmmxt"
-PACKAGE_EXTRA_ARCHS += "iwmmxt"
-

diff --git a/conf/machine/include/tune-iwmmxt.inc b/conf/machine/include/tune-iwmmxt.inc
new file mode 100644 (file)
index 0000000..8376fac
--- /dev/null
+++ b/conf/machine/include/tune-iwmmxt.inc
@@ -0,0 +1,6 @@
+# Configurations for the Intel PXA27x Appications Processor Family. 
+# Please use tune-xscale for PXA255/PXA26x based processors.
+TARGET_CC_ARCH = "-march=iwmmxt -mcpu=iwmmxt -mtune=iwmmxt"
+PACKAGE_ARCH = "iwmmxt"
+PACKAGE_EXTRA_ARCHS += "iwmmxt"
+

diff --git a/conf/machine/include/tune-ppc405.conf b/conf/machine/include/tune-ppc405.conf
deleted file mode 100644 (file)
index cf8f58c..0000000
--- a/conf/machine/include/tune-ppc405.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-TARGET_CC_ARCH = "-mcpu=405"
-PACKAGE_ARCH = "ppc405"

diff --git a/conf/machine/include/tune-ppc405.inc b/conf/machine/include/tune-ppc405.inc
new file mode 100644 (file)
index 0000000..cf8f58c
--- /dev/null
+++ b/conf/machine/include/tune-ppc405.inc
@@ -0,0 +1,2 @@
+TARGET_CC_ARCH = "-mcpu=405"
+PACKAGE_ARCH = "ppc405"

diff --git a/conf/machine/include/tune-ppc440.conf b/conf/machine/include/tune-ppc440.conf
deleted file mode 100644 (file)
index dff8dce..0000000
--- a/conf/machine/include/tune-ppc440.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-TARGET_CC_ARCH = "-mcpu=440"
-PACKAGE_ARCH = "ppc440"

diff --git a/conf/machine/include/tune-ppc440.inc b/conf/machine/include/tune-ppc440.inc
new file mode 100644 (file)
index 0000000..dff8dce
--- /dev/null
+++ b/conf/machine/include/tune-ppc440.inc
@@ -0,0 +1,2 @@
+TARGET_CC_ARCH = "-mcpu=440"
+PACKAGE_ARCH = "ppc440"

diff --git a/conf/machine/include/tune-ppc440e.conf b/conf/machine/include/tune-ppc440e.conf
deleted file mode 100644 (file)
index 5c47482..0000000
--- a/conf/machine/include/tune-ppc440e.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-TARGET_CC_ARCH = "-mcpu=440fp -mhard-float"
-PACKAGE_ARCH = "ppc440e"

diff --git a/conf/machine/include/tune-ppc440e.inc b/conf/machine/include/tune-ppc440e.inc
new file mode 100644 (file)
index 0000000..5c47482
--- /dev/null
+++ b/conf/machine/include/tune-ppc440e.inc
@@ -0,0 +1,2 @@
+TARGET_CC_ARCH = "-mcpu=440fp -mhard-float"
+PACKAGE_ARCH = "ppc440e"

diff --git a/conf/machine/include/tune-ppc603e.conf b/conf/machine/include/tune-ppc603e.conf
deleted file mode 100644 (file)
index 1a004d3..0000000
--- a/conf/machine/include/tune-ppc603e.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-TARGET_CC_ARCH = "-mcpu=603e -mhard-float"
-PACKAGE_ARCH = "ppc603e"

diff --git a/conf/machine/include/tune-ppc603e.inc b/conf/machine/include/tune-ppc603e.inc
new file mode 100644 (file)
index 0000000..1a004d3
--- /dev/null
+++ b/conf/machine/include/tune-ppc603e.inc
@@ -0,0 +1,2 @@
+TARGET_CC_ARCH = "-mcpu=603e -mhard-float"
+PACKAGE_ARCH = "ppc603e"

diff --git a/conf/machine/include/tune-ppce500.conf b/conf/machine/include/tune-ppce500.conf
deleted file mode 100644 (file)
index 11717eb..0000000
--- a/conf/machine/include/tune-ppce500.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-TARGET_CC_ARCH = "-mcpu=8540"
-PACKAGE_ARCH = "ppce500"

diff --git a/conf/machine/include/tune-ppce500.inc b/conf/machine/include/tune-ppce500.inc
new file mode 100644 (file)
index 0000000..11717eb
--- /dev/null
+++ b/conf/machine/include/tune-ppce500.inc
@@ -0,0 +1,2 @@
+TARGET_CC_ARCH = "-mcpu=8540"
+PACKAGE_ARCH = "ppce500"

diff --git a/conf/machine/include/tune-sh3.conf b/conf/machine/include/tune-sh3.conf
deleted file mode 100644 (file)
index 192dd8f..0000000
--- a/conf/machine/include/tune-sh3.conf
+++ /dev/null
@@ -1 +0,0 @@
-TARGET_CC_ARCH = "-ml -m3"

diff --git a/conf/machine/include/tune-sh3.inc b/conf/machine/include/tune-sh3.inc
new file mode 100644 (file)
index 0000000..192dd8f
--- /dev/null
+++ b/conf/machine/include/tune-sh3.inc
@@ -0,0 +1 @@
+TARGET_CC_ARCH = "-ml -m3"

diff --git a/conf/machine/include/tune-sh4.conf b/conf/machine/include/tune-sh4.conf
deleted file mode 100644 (file)
index 866f7f8..0000000
--- a/conf/machine/include/tune-sh4.conf
+++ /dev/null
@@ -1 +0,0 @@
-TARGET_CC_ARCH = "-ml -m4"

diff --git a/conf/machine/include/tune-sh4.inc b/conf/machine/include/tune-sh4.inc
new file mode 100644 (file)
index 0000000..866f7f8
--- /dev/null
+++ b/conf/machine/include/tune-sh4.inc
@@ -0,0 +1 @@
+TARGET_CC_ARCH = "-ml -m4"

diff --git a/conf/machine/include/tune-strongarm.conf b/conf/machine/include/tune-strongarm.conf
deleted file mode 100644 (file)
index 8654c99..0000000
--- a/conf/machine/include/tune-strongarm.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-TARGET_CC_ARCH = "-march=armv4 -mtune=xscale"
-

diff --git a/conf/machine/include/tune-strongarm.inc b/conf/machine/include/tune-strongarm.inc
new file mode 100644 (file)
index 0000000..8654c99
--- /dev/null
+++ b/conf/machine/include/tune-strongarm.inc
@@ -0,0 +1,2 @@
+TARGET_CC_ARCH = "-march=armv4 -mtune=xscale"
+

diff --git a/conf/machine/include/tune-supersparc.conf b/conf/machine/include/tune-supersparc.conf
deleted file mode 100644 (file)
index 1b1ec12..0000000
--- a/conf/machine/include/tune-supersparc.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-TARGET_CC_ARCH = "-mcpu=supersparc"
-PACKAGE_ARCH = "supersparc" 

diff --git a/conf/machine/include/tune-supersparc.inc b/conf/machine/include/tune-supersparc.inc
new file mode 100644 (file)
index 0000000..1b1ec12
--- /dev/null
+++ b/conf/machine/include/tune-supersparc.inc
@@ -0,0 +1,2 @@
+TARGET_CC_ARCH = "-mcpu=supersparc"
+PACKAGE_ARCH = "supersparc" 

diff --git a/conf/machine/include/tune-thumb.conf b/conf/machine/include/tune-thumb.conf
deleted file mode 100644 (file)
index a25cb53..0000000
--- a/conf/machine/include/tune-thumb.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-#tune file for thumb instructions
-
-ARM_INSTRUCTION_SET ?= "arm"
-# "arm" "thumb"
-#    The instruction set the compiler should use when generating application
-#    code.  The kernel is always compiled with arm code at present.  arm code
-#    is the original 32 bit ARM instruction set, thumb code is the 16 bit
-#    encoded RISC sub-set.  Thumb code is smaller (maybe 70% of the ARM size)
-#    but requires more instructions (140% for 70% smaller code) so may be
-#    slower.
-
-THUMB_INTERWORK ?= "yes"
-# "yes" "no"
-#    Whether to compile with code to allow interworking between the two
-#    instruction sets.  This allows thumb code to be executed on a primarily
-#    arm system and vice versa.  It is strongly recommended that DISTROs not
-#    turn this off - the actual cost is very small.
-
-OVERRIDE_THUMB = "${@['', ':thumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}"
-OVERRIDE_INTERWORK = "${@['', ':thumb-interwork'][bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes']}"
-OVERRIDES .= "${OVERRIDE_THUMB}${OVERRIDE_INTERWORK}"
-
-#    Compiler and linker options for application code and kernel code.  These
-#    options ensure that the compiler has the correct settings for the selected
-#    instruction set and interworking.
-ARM_INTERWORK_M_OPT = "${@['-mno-thumb-interwork', '-mthumb-interwork'][bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes']}"
-ARM_THUMB_M_OPT = "${@['-mno-thumb', '-mthumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}"
-
-#
-TARGET_CC_ARCH +=  "${ARM_INTERWORK_M_OPT} ${ARM_THUMB_M_OPT}"
-TARGET_CC_KERNEL_ARCH  += "-mno-thumb-interwork -mno-thumb"
-

diff --git a/conf/machine/include/tune-thumb.inc b/conf/machine/include/tune-thumb.inc
new file mode 100644 (file)
index 0000000..a25cb53
--- /dev/null
+++ b/conf/machine/include/tune-thumb.inc
@@ -0,0 +1,32 @@
+#tune file for thumb instructions
+
+ARM_INSTRUCTION_SET ?= "arm"
+# "arm" "thumb"
+#    The instruction set the compiler should use when generating application
+#    code.  The kernel is always compiled with arm code at present.  arm code
+#    is the original 32 bit ARM instruction set, thumb code is the 16 bit
+#    encoded RISC sub-set.  Thumb code is smaller (maybe 70% of the ARM size)
+#    but requires more instructions (140% for 70% smaller code) so may be
+#    slower.
+
+THUMB_INTERWORK ?= "yes"
+# "yes" "no"
+#    Whether to compile with code to allow interworking between the two
+#    instruction sets.  This allows thumb code to be executed on a primarily
+#    arm system and vice versa.  It is strongly recommended that DISTROs not
+#    turn this off - the actual cost is very small.
+
+OVERRIDE_THUMB = "${@['', ':thumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}"
+OVERRIDE_INTERWORK = "${@['', ':thumb-interwork'][bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes']}"
+OVERRIDES .= "${OVERRIDE_THUMB}${OVERRIDE_INTERWORK}"
+
+#    Compiler and linker options for application code and kernel code.  These
+#    options ensure that the compiler has the correct settings for the selected
+#    instruction set and interworking.
+ARM_INTERWORK_M_OPT = "${@['-mno-thumb-interwork', '-mthumb-interwork'][bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes']}"
+ARM_THUMB_M_OPT = "${@['-mno-thumb', '-mthumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}"
+
+#
+TARGET_CC_ARCH +=  "${ARM_INTERWORK_M_OPT} ${ARM_THUMB_M_OPT}"
+TARGET_CC_KERNEL_ARCH  += "-mno-thumb-interwork -mno-thumb"
+

diff --git a/conf/machine/include/tune-x86-nocona.conf b/conf/machine/include/tune-x86-nocona.conf
deleted file mode 100644 (file)
index f1189a1..0000000
--- a/conf/machine/include/tune-x86-nocona.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-TARGET_CC_ARCH = "-march=nocona"
-TARGET_CC_KERNEL_ARCH = "-march=nocona"

diff --git a/conf/machine/include/tune-x86-nocona.inc b/conf/machine/include/tune-x86-nocona.inc
new file mode 100644 (file)
index 0000000..f1189a1
--- /dev/null
+++ b/conf/machine/include/tune-x86-nocona.inc
@@ -0,0 +1,2 @@
+TARGET_CC_ARCH = "-march=nocona"
+TARGET_CC_KERNEL_ARCH = "-march=nocona"

diff --git a/conf/machine/include/tune-x86-prescott.conf b/conf/machine/include/tune-x86-prescott.conf
deleted file mode 100644 (file)
index f3ec4e9..0000000
--- a/conf/machine/include/tune-x86-prescott.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-TARGET_CC_ARCH = "-march=prescott"
-TARGET_CC_KERNEL_ARCH = "-march=prescott"

diff --git a/conf/machine/include/tune-x86-prescott.inc b/conf/machine/include/tune-x86-prescott.inc
new file mode 100644 (file)
index 0000000..f3ec4e9
--- /dev/null
+++ b/conf/machine/include/tune-x86-prescott.inc
@@ -0,0 +1,2 @@
+TARGET_CC_ARCH = "-march=prescott"
+TARGET_CC_KERNEL_ARCH = "-march=prescott"

diff --git a/conf/machine/include/tune-xscale.conf b/conf/machine/include/tune-xscale.conf
deleted file mode 100644 (file)
index f14aee9..0000000
--- a/conf/machine/include/tune-xscale.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-FEED_ARCH = "armv5te"
-
-TARGET_CC_ARCH = "-march=armv5te -mtune=xscale"
-TARGET_CC_KERNEL_ARCH = "-march=armv5te -mtune=xscale"
-PACKAGE_ARCH = "${@['armv5teb', 'armv5te'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}"

diff --git a/conf/machine/include/tune-xscale.inc b/conf/machine/include/tune-xscale.inc
new file mode 100644 (file)
index 0000000..f14aee9
--- /dev/null
+++ b/conf/machine/include/tune-xscale.inc
@@ -0,0 +1,5 @@
+FEED_ARCH = "armv5te"
+
+TARGET_CC_ARCH = "-march=armv5te -mtune=xscale"
+TARGET_CC_KERNEL_ARCH = "-march=armv5te -mtune=xscale"
+PACKAGE_ARCH = "${@['armv5teb', 'armv5te'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}"

diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index 456555e..53f47d6 100644 (file)
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -18,7 +18,7 @@ EXTRA_IMAGEDEPENDS += "zaurus-updater"
 IMAGE_FSTYPES ?= "jffs2 tar.gz"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-include conf/machine/include/tune-xscale.conf
+include conf/machine/include/tune-xscale.inc
 
 SERIAL_CONSOLE = "115200 ttyS0"
 

diff --git a/conf/machine/ixp4xxbe.conf b/conf/machine/ixp4xxbe.conf
index f208852..756024a 100644 (file)
--- a/conf/machine/ixp4xxbe.conf
+++ b/conf/machine/ixp4xxbe.conf
@@ -6,6 +6,6 @@ TARGET_ARCH = "armeb"
 
 PACKAGE_EXTRA_ARCHS = "armv4b armv4tb armv5eb armv5teb"
 
-require conf/machine/include/ixp4xx.conf
+require conf/machine/include/ixp4xx.inc
 
 EXTRA_IMAGECMD_jffs2 += "--big-endian"

diff --git a/conf/machine/ixp4xxle.conf b/conf/machine/ixp4xxle.conf
index d39fa1f..622db3e 100644 (file)
--- a/conf/machine/ixp4xxle.conf
+++ b/conf/machine/ixp4xxle.conf
@@ -6,6 +6,6 @@ TARGET_ARCH = "arm"
 
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
 
-require conf/machine/include/ixp4xx.conf
+require conf/machine/include/ixp4xx.inc
 
 EXTRA_IMAGECMD_jffs2 += " --little-endian"

diff --git a/conf/machine/jornada56x.conf b/conf/machine/jornada56x.conf
index 385af08..72fff1e 100644 (file)
--- a/conf/machine/jornada56x.conf
+++ b/conf/machine/jornada56x.conf
@@ -12,4 +12,4 @@ EXTRA_IMAGECMD_jornada56x_jffs2 = "-e 0x40000 -p"
 
 SERIAL_CONSOLE = "115200 ttySA0"
 
-require conf/machine/include/tune-strongarm.conf
+require conf/machine/include/tune-strongarm.inc

diff --git a/conf/machine/jornada6xx.conf b/conf/machine/jornada6xx.conf
index 40d3848..a322f1a 100644 (file)
--- a/conf/machine/jornada6xx.conf
+++ b/conf/machine/jornada6xx.conf
@@ -4,7 +4,7 @@
 
 TARGET_ARCH = "sh3"
 
-require conf/machine/include/tune-sh3.conf
+require conf/machine/include/tune-sh3.inc
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada6xx"
 PCMCIA_MANAGER = "pcmciautils"

diff --git a/conf/machine/jornada7xx.conf b/conf/machine/jornada7xx.conf
index f08fb6f..461d0c8 100644 (file)
--- a/conf/machine/jornada7xx.conf
+++ b/conf/machine/jornada7xx.conf
@@ -4,7 +4,7 @@
 
 TARGET_ARCH = "arm"
 
-require conf/machine/include/tune-strongarm.conf
+require conf/machine/include/tune-strongarm.inc
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada7xx"
 PCMCIA_MANAGER = "pcmciautils"

diff --git a/conf/machine/kb9202.conf b/conf/machine/kb9202.conf
index 6501896..5b88f45 100644 (file)
--- a/conf/machine/kb9202.conf
+++ b/conf/machine/kb9202.conf
@@ -7,7 +7,7 @@ TARGET_ARCH = "arm"
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t"
 
-require conf/machine/include/tune-arm920t.conf
+require conf/machine/include/tune-arm920t.inc
 
 # used by sysvinit_2
 # Needs at91 serial port

diff --git a/conf/machine/ks8695.conf b/conf/machine/ks8695.conf
index 5d214f7..0b0d317 100644 (file)
--- a/conf/machine/ks8695.conf
+++ b/conf/machine/ks8695.conf
@@ -8,7 +8,7 @@ TARGET_ARCH = "arm"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
 
-require conf/machine/include/tune-arm920t.conf
+require conf/machine/include/tune-arm920t.inc
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "115200 ttyS0"

diff --git a/conf/machine/lite5200.conf b/conf/machine/lite5200.conf
index 26d2d65..b67d3dc 100644 (file)
--- a/conf/machine/lite5200.conf
+++ b/conf/machine/lite5200.conf
@@ -5,4 +5,4 @@ SERIAL_CONSOLE="38400 ttyS0"
 
 IMAGE_FSTYPES = "jffs2 tar.bz2"
 
-require conf/machine/include/tune-ppc603e.conf
+require conf/machine/include/tune-ppc603e.inc

diff --git a/conf/machine/logicpd-pxa270.conf b/conf/machine/logicpd-pxa270.conf
index 2038aa4..a046c5d 100644 (file)
--- a/conf/machine/logicpd-pxa270.conf
+++ b/conf/machine/logicpd-pxa270.conf
@@ -9,7 +9,7 @@ GUI_MACHINE_CLASS = "smallscreen"
 PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te"
 
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "115200 ttyS0"

diff --git a/conf/machine/looxc550.conf b/conf/machine/looxc550.conf
index c191349..f4fd23e 100644 (file)
--- a/conf/machine/looxc550.conf
+++ b/conf/machine/looxc550.conf
@@ -8,7 +8,7 @@
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
 
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
 
 ROOT_FLASH_SIZE = "32"
 VOLATILE_STORAGE_SIZE = "64"
@@ -33,4 +33,4 @@ module_autoload_g_ether = "g_ether"
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"
 
-require conf/machine/include/LAB-settings.conf
+require conf/machine/include/LAB-settings.inc

diff --git a/conf/machine/lsarm.conf b/conf/machine/lsarm.conf
index 15477f5..2df6ce0 100644 (file)
--- a/conf/machine/lsarm.conf
+++ b/conf/machine/lsarm.conf
@@ -14,7 +14,7 @@ PREFERRED_PROVIDER_virtual/bootloader = ""
 
 USE_DEVFS = "0"
 
-require conf/machine/include/tune-arm926ejs.conf
+require conf/machine/include/tune-arm926ejs.inc
 
 IMAGE_FSTYPES = "tar.gz"
 

diff --git a/conf/machine/lsppchd.conf b/conf/machine/lsppchd.conf
index ac22703..9841678 100644 (file)
--- a/conf/machine/lsppchd.conf
+++ b/conf/machine/lsppchd.conf
@@ -3,6 +3,6 @@
 #@DESCRIPTION: Machine configuration for the Buffalo Linkstation HD
 UBOOT_MACHINE = "linkstation_HDLAN"
 IMAGE_FSTYPES = "tar.gz"
-require conf/machine/include/lsppc.conf
+require conf/machine/include/lsppc.inc
 
 INHERIT += "lsppchd-image"

diff --git a/conf/machine/lsppchg.conf b/conf/machine/lsppchg.conf
index 9f03feb..1472155 100644 (file)
--- a/conf/machine/lsppchg.conf
+++ b/conf/machine/lsppchg.conf
@@ -3,6 +3,6 @@
 #@DESCRIPTION: Machine configuration for the Buffalo Linkstation HG
 UBOOT_MACHINE = "linkstation_HGLAN"
 IMAGE_FSTYPES = "tar.gz"
-require conf/machine/include/lsppc.conf
+require conf/machine/include/lsppc.inc
 
 INHERIT += "lsppchg-image"

diff --git a/conf/machine/magicbox.conf b/conf/machine/magicbox.conf
index 756e064..178c242 100644 (file)
--- a/conf/machine/magicbox.conf
+++ b/conf/machine/magicbox.conf
@@ -27,5 +27,5 @@ EXTRA_IMAGECMD_squashfs-lzma = " -be -all-root -nopad -noappend -root-owned"
 
 
 #tune for the 405 cpu
-require conf/machine/include/tune-ppc405.conf
+require conf/machine/include/tune-ppc405.inc
 

diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf
index fab9367..60cc9af 100644 (file)
--- a/conf/machine/magician.conf
+++ b/conf/machine/magician.conf
@@ -9,10 +9,10 @@ TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt  "
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-require conf/machine/include/tune-xscale.conf
+require conf/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 conf/machine/include/tune-iwmmxt.inc
 
 ROOT_FLASH_SIZE = "80"
 VOLATILE_STORAGE_SIZE = "64"

diff --git a/conf/machine/mainstone.conf b/conf/machine/mainstone.conf
index 291c68e..a6681a9 100644 (file)
--- a/conf/machine/mainstone.conf
+++ b/conf/machine/mainstone.conf
@@ -9,7 +9,7 @@ PACKAGE_EXTRA_ARCHS = "armv5te"
 
 PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
 
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "115200 ttyS0"

diff --git a/conf/machine/mtx-3.conf b/conf/machine/mtx-3.conf
index 020c507..ac7a6c1 100644 (file)
--- a/conf/machine/mtx-3.conf
+++ b/conf/machine/mtx-3.conf
@@ -9,7 +9,7 @@
 # For compiling the kernel, ARCH will be derived form it by kernel-arch.bbclass 
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
-require conf/machine/include/tune-arm926ejs.conf
+require conf/machine/include/tune-arm926ejs.inc
 
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-mtx-3"

diff --git a/conf/machine/mx21ads.conf b/conf/machine/mx21ads.conf
index 160b9fd..0a09256 100644 (file)
--- a/conf/machine/mx21ads.conf
+++ b/conf/machine/mx21ads.conf
@@ -11,7 +11,7 @@ PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te"
 
 PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
 
-require conf/machine/include/tune-arm926ejs.conf
+require conf/machine/include/tune-arm926ejs.inc
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "115200 ttymxc0"

diff --git a/conf/machine/mx31ads.conf b/conf/machine/mx31ads.conf
index 55a2918..e600af8 100644 (file)
--- a/conf/machine/mx31ads.conf
+++ b/conf/machine/mx31ads.conf
@@ -12,7 +12,7 @@ PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te armv6"
 
 PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
 
-require conf/machine/include/tune-arm1136jf-s.conf
+require conf/machine/include/tune-arm1136jf-s.inc
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "115200 ttymxc0"

diff --git a/conf/machine/n2100.conf b/conf/machine/n2100.conf
index f275d61..89f79fa 100644 (file)
--- a/conf/machine/n2100.conf
+++ b/conf/machine/n2100.conf
@@ -24,4 +24,4 @@ EXTRA_IMAGECMD = "--little-endian"
 EXTRA_IMAGEDEPENDS = "openssl-native"
 IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt"
 
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc

diff --git a/conf/machine/navman-icn330.conf b/conf/machine/navman-icn330.conf
index 5f035c3..b265503 100644 (file)
--- a/conf/machine/navman-icn330.conf
+++ b/conf/machine/navman-icn330.conf
@@ -11,7 +11,7 @@ TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
 
 #Compile with armv5te optimizations, incompatible with armv4(t) cpus
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
 
 #Set some hints for metadata  
 VOLATILE_STORAGE_SIZE = "32"

diff --git a/conf/machine/netbook-pro.conf b/conf/machine/netbook-pro.conf
index 3baf1c2..1c9fc7a 100755 (executable)
--- a/conf/machine/netbook-pro.conf
+++ b/conf/machine/netbook-pro.conf
@@ -31,4 +31,4 @@ GUI_MACHINE_CLASS = "bigscreen"
 #The initrd needs /initrd present to be able to do pivot_root 
 ROOTFS_POSTPROCESS_COMMAND += " mkdir -p ${IMAGE_ROOTFS}/initrd; "
 
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc

diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf
index 1affae1..2727fd4 100644 (file)
--- a/conf/machine/nokia770.conf
+++ b/conf/machine/nokia770.conf
@@ -14,7 +14,7 @@ XSERVER = "xserver-kdrive-omap"
 GUI_MACHINE_CLASS = "bigscreen"
 
 # Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm.
-require conf/machine/include/tune-arm926ejs.conf
+require conf/machine/include/tune-arm926ejs.inc
 
 #size of the root partition (yes, it is 123 MB)
 ROOT_FLASH_SIZE = "123"

diff --git a/conf/machine/nokia800.conf b/conf/machine/nokia800.conf
index e314388..703fc19 100644 (file)
--- a/conf/machine/nokia800.conf
+++ b/conf/machine/nokia800.conf
@@ -10,7 +10,7 @@ XSERVER = "xserver-kdrive-xomap"
 GUI_MACHINE_CLASS = "bigscreen"
 
 TARGET_FPU = "hard"
-include conf/machine/include/tune-arm1136jf-s.conf
+include conf/machine/include/tune-arm1136jf-s.inc
 
 ROOT_FLASH_SIZE = "174"
 EXTRA_IMAGECMD_jffs2_nokia800 = "--pad --little-endian --eraseblock=0x20000 -n"

diff --git a/conf/machine/nslu2be.conf b/conf/machine/nslu2be.conf
index 104bbdb..3162eb3 100644 (file)
--- a/conf/machine/nslu2be.conf
+++ b/conf/machine/nslu2be.conf
@@ -12,7 +12,7 @@ OVERRIDES = "local:${MACHINE}:nslu2:ixp4xx:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}
 
 ROOT_FLASH_SIZE ?= "6"
 
-require conf/machine/include/ixp4xx.conf
+require conf/machine/include/ixp4xx.inc
 
 EXTRA_IMAGECMD_jffs2 += "--big-endian"
 

diff --git a/conf/machine/nslu2le.conf b/conf/machine/nslu2le.conf
index 86c4ce7..1aced19 100644 (file)
--- a/conf/machine/nslu2le.conf
+++ b/conf/machine/nslu2le.conf
@@ -12,7 +12,7 @@ OVERRIDES = "local:${MACHINE}:nslu2:ixp4xx:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}
 
 ROOT_FLASH_SIZE ?= "6"
 
-require conf/machine/include/ixp4xx.conf
+require conf/machine/include/ixp4xx.inc
 
 EXTRA_IMAGECMD_jffs2 += "--little-endian"
 

diff --git a/conf/machine/omap1510inn.conf b/conf/machine/omap1510inn.conf
index 0b26436..3dc19a4 100644 (file)
--- a/conf/machine/omap1510inn.conf
+++ b/conf/machine/omap1510inn.conf
@@ -14,4 +14,4 @@ BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral"
 SERIAL_CONSOLE ?= "115200 ttyS0"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 
-require conf/machine/include/tune-arm926ejs.conf
+require conf/machine/include/tune-arm926ejs.inc

diff --git a/conf/machine/omap1610h2.conf b/conf/machine/omap1610h2.conf
index 0b26436..3dc19a4 100644 (file)
--- a/conf/machine/omap1610h2.conf
+++ b/conf/machine/omap1610h2.conf
@@ -14,4 +14,4 @@ BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral"
 SERIAL_CONSOLE ?= "115200 ttyS0"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 
-require conf/machine/include/tune-arm926ejs.conf
+require conf/machine/include/tune-arm926ejs.inc

diff --git a/conf/machine/omap1710h3.conf b/conf/machine/omap1710h3.conf
index 73dced3..9a97150 100644 (file)
--- a/conf/machine/omap1710h3.conf
+++ b/conf/machine/omap1710h3.conf
@@ -14,4 +14,4 @@ BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral"
 SERIAL_CONSOLE ?= "115200 ttyS0"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 
-require conf/machine/include/tune-arm926ejs.conf
+require conf/machine/include/tune-arm926ejs.inc

diff --git a/conf/machine/omap2420h4.conf b/conf/machine/omap2420h4.conf
index fb9f466..82be4e3 100644 (file)
--- a/conf/machine/omap2420h4.conf
+++ b/conf/machine/omap2420h4.conf
@@ -13,4 +13,4 @@ EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 
 MACHINE_FEATURES = "kernel26"
 
-require conf/machine/include/tune-arm1136jf-s.conf
+require conf/machine/include/tune-arm1136jf-s.inc

diff --git a/conf/machine/omap2430sdp.conf b/conf/machine/omap2430sdp.conf
index f13fa7d..39e6896 100644 (file)
--- a/conf/machine/omap2430sdp.conf
+++ b/conf/machine/omap2430sdp.conf
@@ -13,4 +13,4 @@ EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 
 MACHINE_FEATURES = "kernel26"
 
-require conf/machine/include/tune-arm1136jf-s.conf
+require conf/machine/include/tune-arm1136jf-s.inc

diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf
index 091d511..7418054 100644 (file)
--- a/conf/machine/omap5912osk.conf
+++ b/conf/machine/omap5912osk.conf
@@ -25,5 +25,5 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-module-ide-cs \
                           kernel-module-nls-base \
                           kernel-module-vfat"
 
-require conf/machine/include/tune-arm926ejs.conf
+require conf/machine/include/tune-arm926ejs.inc
 

diff --git a/conf/machine/palmld.conf b/conf/machine/palmld.conf
index 3d1d90f..2f92eb4 100644 (file)
--- a/conf/machine/palmld.conf
+++ b/conf/machine/palmld.conf
@@ -2,7 +2,7 @@
 #@NAME: Palm LifeDrive
 #@DESCRIPTION: Machine configuration for the Palm LifeDrive
 
-require conf/machine/include/palm.conf
+require conf/machine/include/palm.inc
 
 ROOT_FLASH_SIZE = "100"
 

diff --git a/conf/machine/palmt650.conf b/conf/machine/palmt650.conf
index 4d1032d..272c0dc 100644 (file)
--- a/conf/machine/palmt650.conf
+++ b/conf/machine/palmt650.conf
@@ -2,7 +2,7 @@
 #@NAME: Palm Treo 650
 #@DESCRIPTION: Machine configuration for the Palm Treo 650
 
-require conf/machine/include/palm.conf
+require conf/machine/include/palm.inc
 
 ROOT_FLASH_SIZE = "100"
 

diff --git a/conf/machine/palmt680.conf b/conf/machine/palmt680.conf
index 1852455..b984667 100644 (file)
--- a/conf/machine/palmt680.conf
+++ b/conf/machine/palmt680.conf
@@ -2,7 +2,7 @@
 #@NAME: Palm Treo 680
 #@DESCRIPTION: Machine configuration for the Palm Treo 680
 
-require conf/machine/include/palm.conf
+require conf/machine/include/palm.inc
 
 ROOT_FLASH_SIZE = "100"
 

diff --git a/conf/machine/palmtc.conf b/conf/machine/palmtc.conf
index 24d13c1..28db830 100644 (file)
--- a/conf/machine/palmtc.conf
+++ b/conf/machine/palmtc.conf
@@ -2,7 +2,7 @@
 #@NAME: Palm TC
 #@DESCRIPTION: Machine configuration for the Palm Tungsten C
 
-require conf/machine/include/palm.conf
+require conf/machine/include/palm.inc
 
 MACHINE_FEATURES += "wifi"
 

diff --git a/conf/machine/palmtt.conf b/conf/machine/palmtt.conf
index 1f6d5c3..ab78e88 100644 (file)
--- a/conf/machine/palmtt.conf
+++ b/conf/machine/palmtt.conf
@@ -15,4 +15,4 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-palm-omap1"
 SERIAL_CONSOLE ?= "115200 ttyS0"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 
-require conf/machine/include/tune-arm926ejs.conf
+require conf/machine/include/tune-arm926ejs.inc

diff --git a/conf/machine/palmtt3.conf b/conf/machine/palmtt3.conf
index b4d6528..3834feb 100644 (file)
--- a/conf/machine/palmtt3.conf
+++ b/conf/machine/palmtt3.conf
@@ -2,7 +2,7 @@
 #@NAME: Palm Tungsten|T3
 #@DESCRIPTION: Machine configuration for the Palm Tungsten|T3
 
-require conf/machine/include/palm.conf
+require conf/machine/include/palm.inc
 
 ROOT_FLASH_SIZE = "100"
 

diff --git a/conf/machine/palmtt5.conf b/conf/machine/palmtt5.conf
index d2de3fa..997c157 100644 (file)
--- a/conf/machine/palmtt5.conf
+++ b/conf/machine/palmtt5.conf
@@ -2,7 +2,7 @@
 #@NAME: Palm Tungsten T5
 #@DESCRIPTION: Machine configuration for the Palm Tungsten T5
 
-require conf/machine/include/palm.conf
+require conf/machine/include/palm.inc
 
 ROOT_FLASH_SIZE = "100"
 

diff --git a/conf/machine/palmtx.conf b/conf/machine/palmtx.conf
index e0db5f2..e1991c8 100644 (file)
--- a/conf/machine/palmtx.conf
+++ b/conf/machine/palmtx.conf
@@ -2,7 +2,7 @@
 #@NAME: Palm TX
 #@DESCRIPTION: Machine configuration for the Palm TX
 
-require conf/machine/include/palm.conf
+require conf/machine/include/palm.inc
 
 MACHINE_GUI_CLASS = "bigscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "320"

diff --git a/conf/machine/palmz31.conf b/conf/machine/palmz31.conf
index da074a8..0332952 100644 (file)
--- a/conf/machine/palmz31.conf
+++ b/conf/machine/palmz31.conf
@@ -2,7 +2,7 @@
 #@NAME: Palm Zire 31
 #@DESCRIPTION: Machine configuration for the Palm Zire 31
 
-require conf/machine/include/palm.conf
+require conf/machine/include/palm.inc
 
 ROOT_FLASH_SIZE = "16"
 MACHINE_GUI_CLASS = "smallscreen"
@@ -12,7 +12,7 @@ MACHINE_DISPLAY_HEIGHT_PIXELS = "160"
 SERIAL_CONSOLE = "115200 ttyS0"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-require conf/machine/include/tune-thumb.conf
+require conf/machine/include/tune-thumb.inc
 
 MACHINE_EXTRA_RRECOMMENDS += "kernel-module-i2c-pxa \
                             kernel-module-i2c-algo-pxa \

diff --git a/conf/machine/palmz71.conf b/conf/machine/palmz71.conf
index 4be181e..7837c5d 100644 (file)
--- a/conf/machine/palmz71.conf
+++ b/conf/machine/palmz71.conf
@@ -12,4 +12,4 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
 SERIAL_CONSOLE ?= "115200 ttyS0"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 
-require conf/machine/include/tune-arm926ejs.conf
+require conf/machine/include/tune-arm926ejs.inc

diff --git a/conf/machine/palmz72.conf b/conf/machine/palmz72.conf
index a654877..502c11a 100644 (file)
--- a/conf/machine/palmz72.conf
+++ b/conf/machine/palmz72.conf
@@ -2,7 +2,7 @@
 #@NAME: Palm Zire 72
 #@DESCRIPTION: Machine configuration for the Palm Zire 72
 
-require conf/machine/include/palm.conf
+require conf/machine/include/palm.inc
 
 ROOT_FLASH_SIZE = "100"
 MACHINE_GUI_CLASS = "bigscreen"
@@ -12,7 +12,7 @@ MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
 SERIAL_CONSOLE = "115200 ttyS0"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-require conf/machine/include/tune-thumb.conf
+require conf/machine/include/tune-thumb.inc
 
 MACHINE_EXTRA_RRECOMMENDS += "kernel-module-i2c-pxa \
                             kernel-module-i2c-algo-pxa \

diff --git a/conf/machine/qemuarm.conf b/conf/machine/qemuarm.conf
index 0e8a081..9ef4f8e 100644 (file)
--- a/conf/machine/qemuarm.conf
+++ b/conf/machine/qemuarm.conf
@@ -5,8 +5,8 @@
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te"
 
-require conf/machine/include/qemu.conf
-require conf/machine/include/tune-arm926ejs.conf
+require conf/machine/include/qemu.inc
+require conf/machine/include/tune-arm926ejs.inc
 
 SERIAL_CONSOLE = "115200 ttyAMA0"
 

diff --git a/conf/machine/qemux86.conf b/conf/machine/qemux86.conf
index 60aa12a..db0eb1a 100644 (file)
--- a/conf/machine/qemux86.conf
+++ b/conf/machine/qemux86.conf
@@ -5,7 +5,7 @@
 TARGET_ARCH = "i586"
 PACKAGE_EXTRA_ARCHS = "x86"
 
-require conf/machine/include/qemu.conf
+require conf/machine/include/qemu.inc
 
 SERIAL_CONSOLE = "115200 ttyS0"
 

diff --git a/conf/machine/rx1950.conf b/conf/machine/rx1950.conf
index d49679e..ba2c956 100644 (file)
--- a/conf/machine/rx1950.conf
+++ b/conf/machine/rx1950.conf
@@ -9,7 +9,7 @@ TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t"
 
 # Samsung S3C2xxx CPU
-require conf/machine/include/tune-arm920t.conf
+require conf/machine/include/tune-arm920t.inc
 
 ROOT_FLASH_SIZE = "32"
 VOLATILE_STORAGE_SIZE = "64"
@@ -34,4 +34,4 @@ module_autoload_g_ether = "g_ether"
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"
 
-require conf/machine/include/LAB-settings.conf
+require conf/machine/include/LAB-settings.inc

diff --git a/conf/machine/rx3000.conf b/conf/machine/rx3000.conf
index f0bd1fe..4b3acc0 100644 (file)
--- a/conf/machine/rx3000.conf
+++ b/conf/machine/rx3000.conf
@@ -9,7 +9,7 @@ TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t"
 
 # Samsung S3C2xxx CPU
-require conf/machine/include/tune-arm920t.conf
+require conf/machine/include/tune-arm920t.inc
 
 ROOT_FLASH_SIZE = "32"
 VOLATILE_STORAGE_SIZE = "64"
@@ -38,4 +38,4 @@ module_autoload_g_ether = "g_ether"
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"
 
-require conf/machine/include/LAB-settings.conf
+require conf/machine/include/LAB-settings.inc

diff --git a/conf/machine/sarge-at91.conf b/conf/machine/sarge-at91.conf
index f1a8b7f..60026a3 100644 (file)
--- a/conf/machine/sarge-at91.conf
+++ b/conf/machine/sarge-at91.conf
@@ -14,7 +14,7 @@ IMAGE_FSTYPES = "tar.gz"
 
 MACHINE_FEATURES = "kernel26"
 
-require conf/machine/include/tune-arm920t.conf
+require conf/machine/include/tune-arm920t.inc
 
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 

diff --git a/conf/machine/sequoia.conf b/conf/machine/sequoia.conf
index a6f31ab..72f0a8f 100644 (file)
--- a/conf/machine/sequoia.conf
+++ b/conf/machine/sequoia.conf
@@ -25,4 +25,4 @@ ERASEBLOCK_SIZE = "0x10000"
 IMAGE_FSTYPES = "jffs2"
 
 #tune for the AMCC440 cpu
-require conf/machine/include/tune-ppc440e.conf
+require conf/machine/include/tune-ppc440e.inc

diff --git a/conf/machine/shark.conf b/conf/machine/shark.conf
index 61bec7f..d7d35cf 100644 (file)
--- a/conf/machine/shark.conf
+++ b/conf/machine/shark.conf
@@ -15,7 +15,7 @@ SERIAL_CONSOLE = "ttySA0 115200 vt100"
 ROOT_FLASH_SIZE = "16"
 USE_VT = "0"
 
-require conf/machine/include/tune-strongarm.conf
+require conf/machine/include/tune-strongarm.inc
 
 MACHINE_FEATURES = "kernel26 apm alsa pcmcia keyboard ext2"
 MACHINE_EXTRA_RDEPENDS_append = " mpg321 mpd madplay "

diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf
index 8e2cc27..3b52729 100644 (file)
--- a/conf/machine/simpad.conf
+++ b/conf/machine/simpad.conf
@@ -8,8 +8,8 @@ TARGET_ARCH = "arm"
 
 MACHINE_FEATURES = " apm pcmcia irda screen touchscreen "
 
-include conf/machine/include/simpad-${MACHINE_KERNEL_VERSION}.conf
-require conf/machine/include/tune-strongarm.conf
+include conf/machine/include/simpad-${MACHINE_KERNEL_VERSION}.inc
+require conf/machine/include/tune-strongarm.inc
 
 
 ROOT_FLASH_SIZE = "16"

diff --git a/conf/machine/smdk2440.conf b/conf/machine/smdk2440.conf
index 903685e..b11ca6e 100644 (file)
--- a/conf/machine/smdk2440.conf
+++ b/conf/machine/smdk2440.conf
@@ -15,4 +15,4 @@ IMAGE_FSTYPES = "tar.gz"
 
 MACHINE_FEATURES = "kernel26 apm screen"
 
-require conf/machine/include/tune-arm920t.conf
+require conf/machine/include/tune-arm920t.inc

diff --git a/conf/machine/smdk2443.conf b/conf/machine/smdk2443.conf
index 199adb5..d3fccf1 100644 (file)
--- a/conf/machine/smdk2443.conf
+++ b/conf/machine/smdk2443.conf
@@ -16,4 +16,4 @@ IMAGE_FSTYPES = "tar.gz"
 
 MACHINE_FEATURES = "kernel26 apm screen"
 
-require conf/machine/include/tune-arm920t.conf
+require conf/machine/include/tune-arm920t.inc

diff --git a/conf/machine/storcenter.conf b/conf/machine/storcenter.conf
index 0898da1..519c565 100644 (file)
--- a/conf/machine/storcenter.conf
+++ b/conf/machine/storcenter.conf
@@ -20,4 +20,4 @@ EXTRA_IMAGECMD = "--big-endian"
 ERASEBLOCK_SIZE = "0x10000"
 IMAGE_FSTYPES = "jffs2"
 
-require conf/machine/include/tune-ppc603e.conf
+require conf/machine/include/tune-ppc603e.inc

diff --git a/conf/machine/titan.conf b/conf/machine/titan.conf
index bbf1e23..9fba78a 100644 (file)
--- a/conf/machine/titan.conf
+++ b/conf/machine/titan.conf
@@ -8,7 +8,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-titan-sh4"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
 
 # SH4 specific settings
-require conf/machine/include/tune-sh4.conf
+require conf/machine/include/tune-sh4.inc
 
 # Serial console settings for sysvinit
 SERIAL_CONSOLE = "38400 ttySC1"

diff --git a/conf/machine/triton.conf b/conf/machine/triton.conf
index ab98a07..2dbe3ea 100644 (file)
--- a/conf/machine/triton.conf
+++ b/conf/machine/triton.conf
@@ -14,5 +14,5 @@ SERIAL_CONSOLE = "38400 ttyS0"
 KERNEL_CONSOLE = "ttys0,38400"
 USE_VT = "0"
 
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.inc
 

diff --git a/conf/machine/turbostation.conf b/conf/machine/turbostation.conf
index 33e0427..5c86a5f 100644 (file)
--- a/conf/machine/turbostation.conf
+++ b/conf/machine/turbostation.conf
@@ -25,4 +25,4 @@ IMAGE_FSTYPES = "jffs2"
 EXTRA_IMAGECMD_jffs2 = "--big-endian --eraseblock=0x20000"
 IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt"
 
-require conf/machine/include/tune-ppc603e.conf
+require conf/machine/include/tune-ppc603e.inc

diff --git a/conf/machine/x86-32-nocona.conf b/conf/machine/x86-32-nocona.conf
index ebb7a14..ad5badf 100644 (file)
--- a/conf/machine/x86-32-nocona.conf
+++ b/conf/machine/x86-32-nocona.conf
@@ -7,7 +7,7 @@ TARGET_ARCH = "i686"
 MACHINE_ARCH = "x86-32-nocona"
 PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586 i686"
 
-require conf/machine/include/tune-x86-nocona.conf
+require conf/machine/include/tune-x86-nocona.inc
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-x86"
 OLDEST_KERNEL = "2.6.20"

diff --git a/conf/machine/x86-prescott.conf b/conf/machine/x86-prescott.conf
index 2b0ef0e..b4021a6 100644 (file)
--- a/conf/machine/x86-prescott.conf
+++ b/conf/machine/x86-prescott.conf
@@ -6,7 +6,7 @@ TARGET_ARCH = "i686"
 MACHINE_ARCH = "x86-prescott"
 PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586 i686"
 
-require conf/machine/include/tune-x86-prescott.conf
+require conf/machine/include/tune-x86-prescott.inc
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-x86"
 OLDEST_KERNEL = "2.6.20"

diff --git a/conf/machine/x86.conf b/conf/machine/x86.conf
index af0cf89..51757e9 100644 (file)
--- a/conf/machine/x86.conf
+++ b/conf/machine/x86.conf
@@ -20,4 +20,4 @@ OLDEST_KERNEL = "2.6.17"
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
 
-#require conf/machine/include/tune-x86.conf
+#require conf/machine/include/tune-x86.inc

diff --git a/conf/machine/xilinx-ml403.conf b/conf/machine/xilinx-ml403.conf
index 1ab8721..9b51b87 100644 (file)
--- a/conf/machine/xilinx-ml403.conf
+++ b/conf/machine/xilinx-ml403.conf
@@ -17,5 +17,5 @@ TARGET_CPU = "405"
 SERIAL_CONSOLE = "115200 ttyS0"
 
 #tune for the 405 cpu
-require conf/machine/include/tune-ppc405.conf
+require conf/machine/include/tune-ppc405.inc
 

diff --git a/conf/machine/xilinx-ml410.conf b/conf/machine/xilinx-ml410.conf
index 9adb26e..ea61b7a 100644 (file)
--- a/conf/machine/xilinx-ml410.conf
+++ b/conf/machine/xilinx-ml410.conf
@@ -18,5 +18,5 @@ OLDEST_KERNEL = "2.6.12"
 SERIAL_CONSOLE = "115200 ttyS0"
 
 #tune for the 405 cpu
-require conf/machine/include/tune-ppc405.conf
+require conf/machine/include/tune-ppc405.inc