]> git.openpandora.org Git - openembedded.git/commitdiff
Move machine include files (files that are not machines in their own right) into...
authorRichard Purdie <rpurdie@rpsys.net>
Sat, 7 Jan 2006 23:55:36 +0000 (23:55 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 7 Jan 2006 23:55:36 +0000 (23:55 +0000)
51 files changed:
conf/machine/akita.conf
conf/machine/blueangel.conf
conf/machine/borzoi.conf
conf/machine/c7x0.conf
conf/machine/collie.conf
conf/machine/devkitidp-pxa255.conf
conf/machine/epia.conf
conf/machine/h1910.conf
conf/machine/h2200.conf
conf/machine/h3600.conf
conf/machine/h3900.conf
conf/machine/h6300.conf
conf/machine/include/.mtn2git_empty [new file with mode: 0644]
conf/machine/include/handheld-common.conf [moved from conf/machine/handheld-common.conf with 100% similarity]
conf/machine/include/ipaq-common.conf [moved from conf/machine/ipaq-common.conf with 100% similarity]
conf/machine/include/poodle-2.4.conf [moved from conf/machine/poodle-2.4.conf with 100% similarity]
conf/machine/include/poodle-2.6.conf [moved from conf/machine/poodle-2.6.conf with 100% similarity]
conf/machine/include/thinclient-common.conf [moved from conf/machine/thinclient-common.conf with 100% similarity]
conf/machine/include/tosa-2.4.conf [moved from conf/machine/tosa-2.4.conf with 100% similarity]
conf/machine/include/tosa-2.6.conf [moved from conf/machine/tosa-2.6.conf with 92% similarity]
conf/machine/include/tune-arm920t.conf [moved from conf/machine/tune-arm920t.conf with 100% similarity]
conf/machine/include/tune-arm926ejs.conf [moved from conf/machine/tune-arm926ejs.conf with 100% similarity]
conf/machine/include/tune-arm9tdmi.conf [moved from conf/machine/tune-arm9tdmi.conf with 100% similarity]
conf/machine/include/tune-c3.conf [moved from conf/machine/tune-c3.conf with 100% similarity]
conf/machine/include/tune-ppc603e.conf [moved from conf/machine/tune-ppc603e.conf with 100% similarity]
conf/machine/include/tune-ppce500.conf [moved from conf/machine/tune-ppce500.conf with 100% similarity]
conf/machine/include/tune-sh3.conf [moved from conf/machine/tune-sh3.conf with 100% similarity]
conf/machine/include/tune-sh4.conf [moved from conf/machine/tune-sh4.conf with 100% similarity]
conf/machine/include/tune-strongarm.conf [moved from conf/machine/tune-strongarm.conf with 100% similarity]
conf/machine/include/tune-supersparc.conf [moved from conf/machine/tune-supersparc.conf with 100% similarity]
conf/machine/include/tune-xscale.conf [moved from conf/machine/tune-xscale.conf with 100% similarity]
conf/machine/include/zaurus-clamshell-2.4.conf [moved from conf/machine/zaurus-clamshell-2.4.conf with 100% similarity]
conf/machine/include/zaurus-clamshell-2.6.conf [moved from conf/machine/zaurus-clamshell-2.6.conf with 100% similarity]
conf/machine/include/zaurus-clamshell.conf [moved from conf/machine/zaurus-clamshell.conf with 89% similarity]
conf/machine/ipaq-pxa270.conf
conf/machine/jornada56x.conf
conf/machine/jornada6xx.conf
conf/machine/jornada7xx.conf
conf/machine/lite5200.conf
conf/machine/mainstone.conf
conf/machine/nokia770.conf
conf/machine/omap1510inn.conf
conf/machine/omap1610h2.conf
conf/machine/omap1710h3.conf
conf/machine/omap2420h4.conf
conf/machine/omap5912osk.conf
conf/machine/poodle.conf
conf/machine/simpad.conf
conf/machine/spitz.conf
conf/machine/tosa.conf
conf/machine/triton.conf

index 6cf622ae1c0a8451906b2477683138c9937f36c7..da699e7258d14add34483b42deac95914c2e2374 100644 (file)
@@ -4,7 +4,7 @@
 
 KERNEL_VERSION ?= "2.6"
 
-include conf/machine/zaurus-clamshell.conf
-include conf/machine/zaurus-clamshell-${KERNEL_VERSION}.conf
+include conf/machine/include/zaurus-clamshell.conf
+include conf/machine/include/zaurus-clamshell-${KERNEL_VERSION}.conf
 
 ROOT_FLASH_SIZE = "58"
index ef9bd3419e82e8b1c43f1e7af55eee23adcfc1c7..196cd51ebb6e48ab3447008ec1069f5d52610f8b 100644 (file)
@@ -26,10 +26,10 @@ SERIAL_CONSOLE = "115200 tts/2 vt100"
 
 USE_VT = "0"
 
-include conf/machine/handheld-common.conf
+include conf/machine/include/handheld-common.conf
 
 GUI_MACHINE_CLASS = "smallscreen"
 ROOT_FLASH_SIZE = "32"
 
 # optimize images, but build feeds without using tune-xscale so as to retain backwards compatibility
-include conf/machine/tune-xscale.conf
+include conf/machine/include/tune-xscale.conf
index b7bb5a0afe67198376d70f08de93dbf36597701c..83899514f5fdc09f2adcabe34361a20be4cc5996 100644 (file)
@@ -4,8 +4,8 @@
 
 KERNEL_VERSION ?= "2.6"
 
-include conf/machine/zaurus-clamshell.conf
-include conf/machine/zaurus-clamshell-${KERNEL_VERSION}.conf
+include conf/machine/include/zaurus-clamshell.conf
+include conf/machine/include/zaurus-clamshell-${KERNEL_VERSION}.conf
 
 PIVOTBOOT_EXTRA_DEPENDS  += "pivotinit pcmcia-cs"
 PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit pcmcia-cs"
index 6b8348e117e68fafe769604c8adac2a7aec3d9c1..af1c9dad1c86bcc468882d3adbc9b2e44ef64b27 100644 (file)
@@ -4,8 +4,8 @@
 
 KERNEL_VERSION ?= "2.6"
 
-include conf/machine/zaurus-clamshell.conf
-include conf/machine/zaurus-clamshell-${KERNEL_VERSION}.conf
+include conf/machine/include/zaurus-clamshell.conf
+include conf/machine/include/zaurus-clamshell-${KERNEL_VERSION}.conf
 
 ROOT_FLASH_SIZE = "25"
 # yes, we are aware that the husky (c760,c860) has 54MB rootfs, but we don't make a special image for it.
index 4af42deb245e4038bf8f02f0272b6f61d7ecba12..a8226ea04e8ecb272227070ff67a8d96cd1e2e57 100644 (file)
@@ -22,8 +22,8 @@ EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
 
 IMAGE_LINGUAS = ""
 
-include conf/machine/handheld-common.conf
-include conf/machine/tune-strongarm.conf
+include conf/machine/include/handheld-common.conf
+include conf/machine/include/tune-strongarm.conf
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
index ff4a82f95c58c577c312991dee9e3bc5dc2d8f4b..329ac6816d5c4ab5990bf9c6000ad529fa45489f 100644 (file)
@@ -12,7 +12,7 @@ PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
 
 BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel virtual/bootloader"
 
-include conf/machine/tune-xscale.conf
+include conf/machine/include/tune-xscale.conf
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "115200 ttyS0"
index 429242c9bdfe96846d06b25d9dac67c28411ef96..29631314862b9cdc6011814e1fcd79b86146269c 100644 (file)
@@ -10,5 +10,5 @@ GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
 IPKG_ARCHS = "i386"
 
-include conf/machine/tune-c3.conf
+include conf/machine/include/tune-c3.conf
 
index 468fcf1838767e64f02eacc33064cc44c5f52601..0c602398c78d74201c6bed82d48c379d8685f9b5 100644 (file)
@@ -8,7 +8,7 @@ OVERRIDES =. "${KERNEL}:"
 TARGET_ARCH = "arm"
 IPKG_ARCHS = "all arm armv5te h1910"
 
-include conf/machine/tune-xscale.conf
+include conf/machine/include/tune-xscale.conf
 
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
index 354e3a955239f7bc32662ca766fa4396d846c2c8..4526006cfee9598f55f558e9eace178b0ec98b61 100644 (file)
@@ -42,9 +42,9 @@ SERIAL_CONSOLE = "115200 tts/0 vt100"
 
 USE_VT = "0"
 
-include conf/machine/ipaq-common.conf
-include conf/machine/handheld-common.conf
+include conf/machine/include/ipaq-common.conf
+include conf/machine/include/handheld-common.conf
 
 GUI_MACHINE_CLASS = "smallscreen"
 
-include conf/machine/tune-xscale.conf
+include conf/machine/include/tune-xscale.conf
index 48990d56180d6f82d874f22da9bfc1bdcb727d9c..96651aa6ae940cf3732d1883469890b1d0903473 100644 (file)
@@ -35,8 +35,8 @@ USE_VT = "0"
 
 IMAGE_LINGUAS = ""
 
-include conf/machine/ipaq-common.conf
-include conf/machine/handheld-common.conf
-include conf/machine/tune-strongarm.conf
+include conf/machine/include/ipaq-common.conf
+include conf/machine/include/handheld-common.conf
+include conf/machine/include/tune-strongarm.conf
 
 SERIAL_CONSOLE = "115200 ttySA0"
index cff74131d59140aea1fb4b3539f951b724c9f7a6..a047761598ffe7b20fe9214033e829db2618007f 100644 (file)
@@ -33,10 +33,10 @@ SERIAL_CONSOLE = "115200 tts/0 vt100"
 USE_DEVFS_kernel24 = "1"
 USE_VT = "0"
 
-include conf/machine/ipaq-common.conf
-include conf/machine/handheld-common.conf
+include conf/machine/include/ipaq-common.conf
+include conf/machine/include/handheld-common.conf
 
 GUI_MACHINE_CLASS = "smallscreen"
 
 #use tune xscale for extra performance. Distro feeds be built with tune-strongarm 
-include conf/machine/tune-xscale.conf
+include conf/machine/include/tune-xscale.conf
index 166701a46b8551952589796f2bf07232039a4922..85a6d36950054e7ba325a25d729ce6ad526ba2c9 100644 (file)
@@ -26,4 +26,4 @@ SERIAL_CONSOLE ?= "115200 ttyS0"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 
 #Use OMAP 1510 cpu specifig arm9tdmi options for gcc
-include conf/machine/tune-arm9tdmi.conf
+include conf/machine/include/tune-arm9tdmi.conf
diff --git a/conf/machine/include/.mtn2git_empty b/conf/machine/include/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29
similarity index 92%
rename from conf/machine/tosa-2.6.conf
rename to conf/machine/include/tosa-2.6.conf
index 5455e3f0d5d9cdad4f22413c21e6da44ec6038f0..fdd706d09349ae203a1e753e9373d7821be2dc77 100644 (file)
@@ -1,4 +1,4 @@
-include conf/machine/zaurus-clamshell-2.6.conf
+include conf/machine/include/zaurus-clamshell-2.6.conf
 # SOUND Modules
 BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-snd kernel-module-snd-ac97-bus kernel-module-snd-ac97-codec kernel-module-snd-mixer-oss kernel-module-snd-page-alloc kernel-module-snd-pcm kernel-module-snd-pcm-oss kernel-module-snd-pxa2xx-ac97 kernel-module-snd-pxa2xx-pcm kernel-module-snd-timer kernel-module-soundcore"
 
similarity index 89%
rename from conf/machine/zaurus-clamshell.conf
rename to conf/machine/include/zaurus-clamshell.conf
index f55f2d255487de704a9d039c8ccbf81b216aedf0..e0a26f3dc753a0a231711f901d15d190d131b1d6 100644 (file)
@@ -17,9 +17,9 @@ GUI_MACHINE_CLASS = "bigscreen"
 GPE_EXTRA_DEPENDS += "gaim sylpheed chkhinge"
 GPE_EXTRA_INSTALL += "gaim sylpheed chkhinge"
 
-include conf/machine/handheld-common.conf
+include conf/machine/include/handheld-common.conf
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-include conf/machine/tune-xscale.conf
+include conf/machine/include/tune-xscale.conf
 
 SERIAL_CONSOLE = "115200 ttyS0"
index 626b5cf218251697715b00fa579023941b5ef5e3..33c8ad8aa549901a15478c1b4b044fa076f20b58 100644 (file)
@@ -23,15 +23,15 @@ PXA270_MODULES = "g_ether g_file_storage g_serial gadgetfs pxa27x_udc \
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
-include conf/machine/ipaq-common.conf
-include conf/machine/handheld-common.conf
+include conf/machine/include/ipaq-common.conf
+include conf/machine/include/handheld-common.conf
 
 GUI_MACHINE_CLASS = "bigscreen"
 GPE_EXTRA_DEPENDS += "gaim" 
 GPE_EXTRA_INSTALL += "gaim"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-include conf/machine/tune-xscale.conf
+include conf/machine/include/tune-xscale.conf
 
 BOOTSTRAP_EXTRA_RDEPENDS += "${@linux_module_packages('${HX4700_MODULES}', d)}"
 HX4700_MODULES = "i2c-pxa asic3_mmc hx4700_bt hx4700_leds hx4700_navpt hx4700_pcmcia \
index 4ac63b556d3070e375cdb6f75568f9a2dfbf1712..9de9eaba896b45dc9b4668ab8e7c729ff18da755 100644 (file)
@@ -16,5 +16,5 @@ USE_DEVFS = "1"
 
 SERIAL_CONSOLE = "115200 ttySA0"
 
-include conf/machine/handheld-common.conf
-include conf/machine/tune-strongarm.conf
+include conf/machine/include/handheld-common.conf
+include conf/machine/include/tune-strongarm.conf
index 5e81c35430486dbe70b50139316593a756d0f0c0..6526f50ef42d587bdaa3bfedacbc4221bbdd3c8a 100644 (file)
@@ -7,4 +7,4 @@ IPKG_ARCHS = "all sh3 ${MACHINE}"
 PREFERRED_VERSION_glibc = "2.3.4"
 PREFERRED_VERSION_glibc-initial = "2.3.4"
 
-include conf/machine/tune-sh3.conf
+include conf/machine/include/tune-sh3.conf
index b3e1840469e9eb873761bc30da5513a51505f9bb..82eff0b563ca5b0e279906def52f560889635e02 100644 (file)
@@ -5,4 +5,4 @@
 TARGET_ARCH = "arm"
 IPKG_ARCHS = "all arm ${MACHINE}"
 
-include conf/machine/tune-strongarm.conf
\ No newline at end of file
+include conf/machine/include/tune-strongarm.conf
\ No newline at end of file
index f990d1390ee113746b12e6503a56f6c00b8be9b9..8df7b51d691a4a8e46fbd3aba2b82563f4470bce 100644 (file)
@@ -16,4 +16,4 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
 
 IMAGE_FSTYPES = "jffs2 tar.bz2"
 
-include conf/machine/tune-ppc603e.conf
+include conf/machine/include/tune-ppc603e.conf
index f3981ed4c53a2a778e09c61f79f6a9cc1836d4df..2de75e020dbea67a8ba21d1d94a730332aaac2d6 100644 (file)
@@ -11,7 +11,7 @@ PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
 
 BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel"
 
-include conf/machine/tune-xscale.conf
+include conf/machine/include/tune-xscale.conf
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "115200 ttyS0"
index 9f49f245632c78e837d7a3bb43f8a998cb844d47..d023342ebb1d78c750ea57b4fe9705a6b7bc93df 100644 (file)
@@ -15,7 +15,7 @@ GPE_EXTRA_DEPENDS += "gaim sylpheed gpe-mini-browser tscalib"
 GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser tscalib"
 
 # Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm.
-include conf/machine/tune-arm926ejs.conf
+include conf/machine/include/tune-arm926ejs.conf
 
 
 #size of the root partition (yes, it is 123 MB)
@@ -56,5 +56,5 @@ pcmcia-cs apm  ppp wireless-tools console-tools"
 
 ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; "
 
-include conf/machine/handheld-common.conf
+include conf/machine/include/handheld-common.conf
 
index 40aaa2917ae44767eeb8d1c775af6a58bb0ff34e..13792630a6f871b3b16b5add805d8863272c712b 100644 (file)
@@ -15,4 +15,4 @@ BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral"
 SERIAL_CONSOLE ?= "115200 ttyS0"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 
-include conf/machine/tune-arm926ejs.conf
+include conf/machine/include/tune-arm926ejs.conf
index 40aaa2917ae44767eeb8d1c775af6a58bb0ff34e..13792630a6f871b3b16b5add805d8863272c712b 100644 (file)
@@ -15,4 +15,4 @@ BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral"
 SERIAL_CONSOLE ?= "115200 ttyS0"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 
-include conf/machine/tune-arm926ejs.conf
+include conf/machine/include/tune-arm926ejs.conf
index 40aaa2917ae44767eeb8d1c775af6a58bb0ff34e..13792630a6f871b3b16b5add805d8863272c712b 100644 (file)
@@ -15,4 +15,4 @@ BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral"
 SERIAL_CONSOLE ?= "115200 ttyS0"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 
-include conf/machine/tune-arm926ejs.conf
+include conf/machine/include/tune-arm926ejs.conf
index 2e81beb3067b6a3c06d6a4ebbc5f02f2a36cd13e..19ddc394301a949f11a7a1ad729add762996ce08 100644 (file)
@@ -15,4 +15,4 @@ BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral"
 SERIAL_CONSOLE ?= "115200 ttyS0"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 
-include conf/machine/tune-arm926ejs.conf
+include conf/machine/include/tune-arm926ejs.conf
index de21822b15f87646dbadd3ab6f5e0445a15d9161..a5a0fe88f248e60d14f6f81cb7f31f048dc7d0cd 100644 (file)
@@ -31,4 +31,4 @@ BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-cfbfillrect kernel-module-omapfb kern
 # DSP Interface
 BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-dsp"
 
-include conf/machine/tune-arm926ejs.conf
+include conf/machine/include/tune-arm926ejs.conf
index 8b339128356135bac5132aa3d6f77b3c2a1b6ec5..dc83aa153d2a435f6ebd77d26627c3925c622ef6 100644 (file)
@@ -6,7 +6,7 @@ TARGET_ARCH = "arm"
 IPKG_ARCHS = "all arm armv4 armv5te poodle"
 
 KERNEL_VERSION ?= "2.4"
-include conf/machine/poodle-${KERNEL_VERSION}.conf
+include conf/machine/include/poodle-${KERNEL_VERSION}.conf
 
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad --faketime -n" 
 
@@ -14,12 +14,12 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE
 
 BOOTSTRAP_EXTRA_DEPENDS += "zaurus-updater"
 
-include conf/machine/handheld-common.conf
+include conf/machine/include/handheld-common.conf
 
 ROOT_FLASH_SIZE = "22"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-include conf/machine/tune-xscale.conf
+include conf/machine/include/tune-xscale.conf
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
index 56cc2c0852503c1ac2c52c6cda45b7d7fef499c0..edb18894cb3692980e757b819ba819eae502eaee 100644 (file)
@@ -46,6 +46,6 @@ USE_VT = "0"
 GPE_EXTRA_DEPENDS += "gaim sylpheed suspend-desktop"
 GPE_EXTRA_INSTALL += "gaim sylpheed suspend-desktop"
 
-include conf/machine/handheld-common.conf
-include conf/machine/tune-strongarm.conf
+include conf/machine/include/handheld-common.conf
+include conf/machine/include/tune-strongarm.conf
 
index 2b22680554fb6e4c8f15229de387b2c385f1b083..171d23f8dc9a7905072491b37fdf8b0a2db67d98 100644 (file)
@@ -4,8 +4,8 @@
 
 KERNEL_VERSION ?= "2.6"
 
-include conf/machine/zaurus-clamshell.conf
-include conf/machine/zaurus-clamshell-${KERNEL_VERSION}.conf
+include conf/machine/include/zaurus-clamshell.conf
+include conf/machine/include/zaurus-clamshell-${KERNEL_VERSION}.conf
 
 PIVOTBOOT_EXTRA_DEPENDS  += "pivotinit pcmcia-cs"
 PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit pcmcia-cs"
index 20cf6946ae6c09ea842d07203c0b717fbb1fb375..3f39cb7c19f8770ead4763fe15b7dc021c0c2dce 100644 (file)
@@ -6,7 +6,7 @@ TARGET_ARCH = "arm"
 IPKG_ARCHS = "all arm armv4 armv5te tosa"
 
 KERNEL_VERSION ?= "2.4"
-include conf/machine/tosa-${KERNEL_VERSION}.conf
+include conf/machine/include/tosa-${KERNEL_VERSION}.conf
 
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n --faketime"
 
@@ -18,9 +18,9 @@ GUI_MACHINE_CLASS = "bigscreen"
 GPE_EXTRA_DEPENDS += "gaim"
 ROOT_FLASH_SIZE = "28"
 
-include conf/machine/handheld-common.conf
+include conf/machine/include/handheld-common.conf
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-include conf/machine/tune-xscale.conf
+include conf/machine/include/tune-xscale.conf
 
 SERIAL_CONSOLE = "115200 ttyS0"
index aea420907fe7181fedcf5ef9a0bbb3b79fe71921..9817545a51fccc4870bc2943e2b4745f94850830 100644 (file)
@@ -15,5 +15,5 @@ SERIAL_CONSOLE = "38400 ttyS0"
 KERNEL_CONSOLE = "ttys0,38400"
 USE_VT = "0"
 
-include conf/machine/tune-xscale.conf
+include conf/machine/include/tune-xscale.conf