[oe-commits] org.oe.dev conf/machine/*.conf: require everything which needs to be included
hrw commit
openembedded-commits at lists.openembedded.org
Thu Jan 4 11:24:59 UTC 2007
conf/machine/*.conf: require everything which needs to be included
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: e0d9912acaac13bd724188fe1ad13ef35363ee75
ViewMTN: http://monotone.openembedded.org/revision.psp?id=e0d9912acaac13bd724188fe1ad13ef35363ee75
Files:
1
conf/machine/a780.conf
conf/machine/akita.conf
conf/machine/c7x0.conf
conf/machine/collie.conf
conf/machine/compulab-pxa270.conf
conf/machine/devkitidp-pxa255.conf
conf/machine/dht-walnut.conf
conf/machine/efika.conf
conf/machine/ep93xx.conf
conf/machine/epia.conf
conf/machine/gumstix.conf
conf/machine/h1940.conf
conf/machine/ixp4xx.conf
conf/machine/ixp4xxbe.conf
conf/machine/jornada56x.conf
conf/machine/jornada6xx.conf
conf/machine/jornada7xx.conf
conf/machine/lite5200.conf
conf/machine/logicpd-pxa270.conf
conf/machine/mainstone.conf
conf/machine/mx21ads.conf
conf/machine/mx31ads.conf
conf/machine/netbook-pro.conf
conf/machine/nokia770.conf
conf/machine/nslu2.conf
conf/machine/omap1510inn.conf
conf/machine/omap1610h2.conf
conf/machine/omap1710h3.conf
conf/machine/omap2420h4.conf
conf/machine/omap5912osk.conf
conf/machine/palmld.conf
conf/machine/palmtx.conf
conf/machine/rx3000.conf
conf/machine/smdk2440.conf
conf/machine/spitz.conf
conf/machine/storcenter.conf
conf/machine/tosa.conf
conf/machine/triton.conf
conf/machine/x86-uml.conf
Diffs:
#
# mt diff -r500bd26a878eadaf25b21ed1511be74c2847fd3d -re0d9912acaac13bd724188fe1ad13ef35363ee75
#
#
#
# patch "conf/machine/a780.conf"
# from [5e981a3850b87821ab025c35cd495e6aa9294441]
# to [466dbb422e97292696cd22b95c084c199a363597]
#
# patch "conf/machine/akita.conf"
# from [978c1b70ab2a68dc33f31e259f413b457f3a9946]
# to [a569abe245fc480d760d62af1ecca91ca5f54185]
#
# patch "conf/machine/c7x0.conf"
# from [56fdca285fa18f30bc0df6b3bfcdd0e4d3b82630]
# to [8d2be52a9581ba26cf2333e9e215680c57b36336]
#
# patch "conf/machine/collie.conf"
# from [e9d2cc5d1403db67b0d6f420a23e7bdbbeed0632]
# to [ee275dd0e8f6e2f091f5200edbf178189ef82fa3]
#
# patch "conf/machine/compulab-pxa270.conf"
# from [2ed6c6a33f603d21cfec379a5990edee0879cfe2]
# to [a7cd9cbb32faddbd99f289bda4945ddc6a9a441c]
#
# patch "conf/machine/devkitidp-pxa255.conf"
# from [0693954b87d48f8b2562111ce7a60785b0872457]
# to [86f7940b3c363c5d7a846456b95bb746292bf669]
#
# patch "conf/machine/dht-walnut.conf"
# from [2070ac9ffc161331b852242ece353c75166691d6]
# to [8162d3045b7cf82df165b39ce04340d767e60aaf]
#
# patch "conf/machine/efika.conf"
# from [a1ee46a8e8ce3f2ba7561d5086e30c539a4f652e]
# to [fcd16784dba9bbefa0deb83bf3dba65042ef2bad]
#
# patch "conf/machine/ep93xx.conf"
# from [d3d2c8c3ec001ee5ef163700f0f43c2b08042448]
# to [a2b3096800550c160aa6c6da4ce83b262803a29b]
#
# patch "conf/machine/epia.conf"
# from [24c8b38cd534d2f0037e1eb98ed91e98e0373f17]
# to [21f1b7ab3389353adb4b46d113e1911bfe650789]
#
# patch "conf/machine/gumstix.conf"
# from [537d7c05b2d6fb1a03153477925d59862cd3b8b6]
# to [74c50d1c47c5dee55815467bac7f51a4a296f516]
#
# patch "conf/machine/h1940.conf"
# from [fd41adb98091e6fb0da28bc0dddf88ed2695df35]
# to [5392562b54d75272c87cdbbdf40ed1014ce32063]
#
# patch "conf/machine/ixp4xx.conf"
# from [a0abfb05dcab6660d89f3ad2822e732f6eaadb64]
# to [b88575cc90052437d514ac626b7893f1dcc9af08]
#
# patch "conf/machine/ixp4xxbe.conf"
# from [0f0d68478a6ca27eeff6fb574c88aa4e1ff94a6f]
# to [f5c2a049103648ede5320e2a9fcc9f3845d1c952]
#
# patch "conf/machine/jornada56x.conf"
# from [0afb08f02b6e9213a5c1d47d6daf45d5ebf0f3aa]
# to [011e3d847c731bb0b3a7580ca9c86c761c93f699]
#
# patch "conf/machine/jornada6xx.conf"
# from [05d6b7e788b2e1ea3dc92f5eb4748539920b60f6]
# to [309c93e7b5e3bcfa6a8983fa60ea7cbcda90548a]
#
# patch "conf/machine/jornada7xx.conf"
# from [8d448724a2b9ad34643b59ba9e36dcdd24fd6e85]
# to [418f9affb10c10daa3033c6255e2455231ac1468]
#
# patch "conf/machine/lite5200.conf"
# from [b12042ca7189ad68b1c5a4fd8e95eb90bdf2e5da]
# to [bd8e21962e6e8669abaa429b6e8b5fcd89e271df]
#
# patch "conf/machine/logicpd-pxa270.conf"
# from [bde17aa1be61347052f17ab993f333b50597418b]
# to [d66de7eee7676ab02110a2613df696d49ab27557]
#
# patch "conf/machine/mainstone.conf"
# from [a0a6f4fbb97a898712937fa0c6c4f5a621856fe4]
# to [a1ba916b56c3864a6f971e0c7d46f6b023e9fcd3]
#
# patch "conf/machine/mx21ads.conf"
# from [a960a10466aae0710683fd7702c033b94c5dd8ab]
# to [c3ed8d859b485ac2c7454f91345f7c2b5a2962c8]
#
# patch "conf/machine/mx31ads.conf"
# from [7d28c2aa9385c91dddb64068b213588ba4823023]
# to [99dc4eb24722ad3d27caee1376a85aecd2be8a8d]
#
# patch "conf/machine/netbook-pro.conf"
# from [2bbdbc7d3ba497e831441f25bd968d2ae0f9aa3a]
# to [434c110f285c66005d9344dd24751f532e042f8a]
#
# patch "conf/machine/nokia770.conf"
# from [a640f6460473e75556e29f5f0f569d19c92ade36]
# to [3ab086c1ccb5b4a4458e5624a4b6b06ab86ff4c9]
#
# patch "conf/machine/nslu2.conf"
# from [bb9d56552dfea42a1fb0dfbcc6c649c7a904ffea]
# to [c2c171f90f4274c6f816b9cd6e61c1e4e66ad1b0]
#
# patch "conf/machine/omap1510inn.conf"
# from [4bfc6c6092e1fae844fc5c24a48a4393cb0b9772]
# to [229b19e41b93a334e1fbecec0e0e0b4aa51b763d]
#
# patch "conf/machine/omap1610h2.conf"
# from [4bfc6c6092e1fae844fc5c24a48a4393cb0b9772]
# to [229b19e41b93a334e1fbecec0e0e0b4aa51b763d]
#
# patch "conf/machine/omap1710h3.conf"
# from [4bfc6c6092e1fae844fc5c24a48a4393cb0b9772]
# to [229b19e41b93a334e1fbecec0e0e0b4aa51b763d]
#
# patch "conf/machine/omap2420h4.conf"
# from [1720a868f16caf361b9de4c14bf655cc63c9fd47]
# to [fbe6eb349e1c424273dc6ab72046bab8b99f0bd3]
#
# patch "conf/machine/omap5912osk.conf"
# from [c5262e51764f10f762817b5e3a540060df297c76]
# to [6a4e85699abe48de30a1f077b1aeb865e2840fa7]
#
# patch "conf/machine/palmld.conf"
# from [a08df709137e2e3c133924a44284f708b4343069]
# to [02a77c82c88213e378d77a1ca5290686235ef273]
#
# patch "conf/machine/palmtx.conf"
# from [c765907825a5283e216cae465a09f3cf711c74a0]
# to [cf13a35a1fcc02479057c5d84d6759f8f7d71e17]
#
# patch "conf/machine/rx3000.conf"
# from [5178701c0d597f159c3bcb0af291dff0542b013b]
# to [c8024dac3eefa35342a9141edeab21504d5512db]
#
# patch "conf/machine/smdk2440.conf"
# from [c3574580e7e0a5f1f5d635b426fea7106471a91c]
# to [1b2f54cd4075c73b1bf5d1919cf95aaeef051416]
#
# patch "conf/machine/spitz.conf"
# from [d20009e69efa5ba8d55b56b54ffa979e32cb84bb]
# to [e833b012b33dd0a034fa063d908915a7c765f80e]
#
# patch "conf/machine/storcenter.conf"
# from [06f535aabc2fbdaf3bc60976279d80135f6564f0]
# to [a0443e4c03b90e7693838bccd027d84575c0dead]
#
# patch "conf/machine/tosa.conf"
# from [5dec78d44533d9ad2ccc483204b39569653db93c]
# to [a8b9eb6aeea6969bae02e9b1d1aa81b7c0a1ed62]
#
# patch "conf/machine/triton.conf"
# from [5e5eccdaa7892f5baa10a503384c277bef0e3b44]
# to [2355435a8f74bcfdcb3b9ed9e480f2d004a43271]
#
# patch "conf/machine/x86-uml.conf"
# from [299bc139635f7578acab2b79b5817d8ae500822c]
# to [a5ee1a7b280c30bb729806fb8e567c71e1bf3b2d]
#
============================================================
--- conf/machine/a780.conf 5e981a3850b87821ab025c35cd495e6aa9294441
+++ conf/machine/a780.conf 466dbb422e97292696cd22b95c084c199a363597
@@ -28,6 +28,6 @@ EXTRA_IMAGEDEPENDS += "ezx-boot-usb-nati
EXTRA_IMAGEDEPENDS += "ezx-boot-usb-native"
# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-include conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.conf
SERIAL_CONSOLE = "115200 ttyS0"
============================================================
--- conf/machine/akita.conf 978c1b70ab2a68dc33f31e259f413b457f3a9946
+++ conf/machine/akita.conf a569abe245fc480d760d62af1ecca91ca5f54185
@@ -1,9 +1,9 @@
#@TYPE: Machine
#@NAME: Sharp Zaurus SL-C1000
#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C1000 device
-include conf/machine/include/zaurus-2.6.conf
-include conf/machine/include/zaurus-clamshell.conf
+require conf/machine/include/zaurus-2.6.conf
+require conf/machine/include/zaurus-clamshell.conf
PACKAGE_EXTRA_ARCHS += "iwmmxt"
============================================================
--- conf/machine/c7x0.conf 56fdca285fa18f30bc0df6b3bfcdd0e4d3b82630
+++ conf/machine/c7x0.conf 8d2be52a9581ba26cf2333e9e215680c57b36336
@@ -1,9 +1,9 @@
#@TYPE: Machine
#@NAME: Sharp Zaurus SL-C7x0
#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C700, Sharp Zaurus SL-C750, Sharp Zaurus SL-C760, Sharp Zaurus SL-C860 devices
-include conf/machine/include/zaurus-2.6.conf
-include conf/machine/include/zaurus-clamshell.conf
+require conf/machine/include/zaurus-2.6.conf
+require conf/machine/include/zaurus-clamshell.conf
IMAGE_FSTYPES ?= "jffs2"
============================================================
--- conf/machine/collie.conf e9d2cc5d1403db67b0d6f420a23e7bdbbeed0632
+++ conf/machine/collie.conf ee275dd0e8f6e2f091f5200edbf178189ef82fa3
@@ -5,7 +5,7 @@ MACHINE_KERNEL_VERSION ?= "2.4"
TARGET_ARCH = "arm"
MACHINE_KERNEL_VERSION ?= "2.4"
-include conf/machine/include/collie-${MACHINE_KERNEL_VERSION}.conf
+require conf/machine/include/collie-${MACHINE_KERNEL_VERSION}.conf
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
@@ -18,7 +18,7 @@ IMAGE_FSTYPES ?= "jffs2 tar.gz"
IMAGE_FSTYPES ?= "jffs2 tar.gz"
-include conf/machine/include/tune-strongarm.conf
+require conf/machine/include/tune-strongarm.conf
ROOT_FLASH_SIZE = "14"
# actually 14680064, see EXTRA_IMAGECMD above
============================================================
--- conf/machine/compulab-pxa270.conf 2ed6c6a33f603d21cfec379a5990edee0879cfe2
+++ conf/machine/compulab-pxa270.conf a7cd9cbb32faddbd99f289bda4945ddc6a9a441c
@@ -9,7 +9,7 @@ PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}"
PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
-include conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.conf
# used by sysvinit_2
SERIAL_CONSOLE = "115200 ttySA0"
============================================================
--- conf/machine/devkitidp-pxa255.conf 0693954b87d48f8b2562111ce7a60785b0872457
+++ conf/machine/devkitidp-pxa255.conf 86f7940b3c363c5d7a846456b95bb746292bf669
@@ -12,7 +12,7 @@ BOOTSTRAP_EXTRA_RDEPENDS += "uboot-${MAC
BOOTSTRAP_EXTRA_RDEPENDS += "uboot-${MACHINE} ${MACHINE}-kernel"
-include conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.conf
# used by sysvinit_2
SERIAL_CONSOLE = "115200 ttyS0"
============================================================
--- conf/machine/dht-walnut.conf 2070ac9ffc161331b852242ece353c75166691d6
+++ conf/machine/dht-walnut.conf 8162d3045b7cf82df165b39ce04340d767e60aaf
@@ -11,5 +11,5 @@ OLDEST_KERNEL = "2.6.9"
OLDEST_KERNEL = "2.6.9"
#tune for the 405 cpu
-include conf/machine/include/tune-ppc405.conf
+require conf/machine/include/tune-ppc405.conf
============================================================
--- conf/machine/efika.conf a1ee46a8e8ce3f2ba7561d5086e30c539a4f652e
+++ conf/machine/efika.conf fcd16784dba9bbefa0deb83bf3dba65042ef2bad
@@ -14,4 +14,4 @@ USE_VT = "0"
USE_VT = "0"
#tune for the MPC5200B cpu
+require conf/machine/include/tune-ppc603e.conf
-include conf/machine/include/tune-ppc603e.conf
============================================================
--- conf/machine/ep93xx.conf d3d2c8c3ec001ee5ef163700f0f43c2b08042448
+++ conf/machine/ep93xx.conf a2b3096800550c160aa6c6da4ce83b262803a29b
@@ -23,7 +23,7 @@ EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4
#tune for ep93xx cpus
#can be used for crunch support later on
-#include conf/machine/include/tune-ep9312.conf
+#require conf/machine/include/tune-ep9312.conf
+require conf/machine/include/tune-arm920t.conf
-include conf/machine/include/tune-arm920t.conf
============================================================
--- conf/machine/epia.conf 24c8b38cd534d2f0037e1eb98ed91e98e0373f17
+++ conf/machine/epia.conf 21f1b7ab3389353adb4b46d113e1911bfe650789
@@ -9,5 +9,5 @@ PACKAGE_EXTRA_ARCHS = "i386"
GLIBC_EXTRA_OECONF = "--with-tls"
PACKAGE_EXTRA_ARCHS = "i386"
-include conf/machine/include/tune-c3.conf
+require conf/machine/include/tune-c3.conf
============================================================
--- conf/machine/gumstix.conf 537d7c05b2d6fb1a03153477925d59862cd3b8b6
+++ conf/machine/gumstix.conf 74c50d1c47c5dee55815467bac7f51a4a296f516
@@ -1,10 +1,10 @@ MODUTILS = "26"
TARGET_ARCH = "arm"
TARGET_VENDOR = "-oe"
PREFERRED_PROVIDER_virtual/kernel = "linux-gumstix"
OLDEST_KERNEL = "2.6.15"
MODUTILS = "26"
-include conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.conf
TARGET_CC_ARCH = "-Os -pipe -Os -march=armv5te -mtune=xscale -Wa,-mcpu=xscale"
PACKAGE_ARCH = "arm"
============================================================
--- conf/machine/h1940.conf fd41adb98091e6fb0da28bc0dddf88ed2695df35
+++ conf/machine/h1940.conf 5392562b54d75272c87cdbbdf40ed1014ce32063
@@ -21,5 +21,5 @@ USE_VT = "0"
USE_VT = "0"
# tune for armv4t
-include conf/machine/include/tune-arm920t.conf
+require conf/machine/include/tune-arm920t.conf
============================================================
--- conf/machine/ixp4xx.conf a0abfb05dcab6660d89f3ad2822e732f6eaadb64
+++ conf/machine/ixp4xx.conf b88575cc90052437d514ac626b7893f1dcc9af08
@@ -1,10 +1,10 @@ MACHINE_FEATURES = "kernel26 usbhost ext
#@TYPE: Machine
#@NAME: Generic IXP4XX kernel
#@DESCRIPTION: Machine configuration for a generic ixp4xx board
MACHINE_FEATURES = "kernel26 usbhost ext2"
-include conf/machine/include/ixp4xx.conf
+require conf/machine/include/ixp4xx.conf
PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ixp4xx${ARCH_BYTE_SEX}"
============================================================
--- conf/machine/ixp4xxbe.conf 0f0d68478a6ca27eeff6fb574c88aa4e1ff94a6f
+++ conf/machine/ixp4xxbe.conf f5c2a049103648ede5320e2a9fcc9f3845d1c952
@@ -5,7 +5,7 @@ ARCH_BYTE_SEX = "be"
MACHINE_FEATURES = "kernel26 usbhost ext2"
ARCH_BYTE_SEX = "be"
-include conf/machine/include/ixp4xx.conf
+require conf/machine/include/ixp4xx.conf
PACKAGE_EXTRA_ARCHS = "armv4eb armv4teb armv5eb armv5teb ixp4xxeb"
============================================================
--- conf/machine/jornada56x.conf 0afb08f02b6e9213a5c1d47d6daf45d5ebf0f3aa
+++ conf/machine/jornada56x.conf 011e3d847c731bb0b3a7580ca9c86c761c93f699
@@ -12,4 +12,4 @@ SERIAL_CONSOLE = "115200 ttySA0"
SERIAL_CONSOLE = "115200 ttySA0"
+require conf/machine/include/tune-strongarm.conf
-include conf/machine/include/tune-strongarm.conf
============================================================
--- conf/machine/jornada6xx.conf 05d6b7e788b2e1ea3dc92f5eb4748539920b60f6
+++ conf/machine/jornada6xx.conf 309c93e7b5e3bcfa6a8983fa60ea7cbcda90548a
@@ -1,10 +1,10 @@ TARGET_ARCH = "sh3"
#@TYPE: Machine
#@NAME: HP Jornada 680
#@DESCRIPTION: Machine configuration for the HITACHI SH3 based HP Jornada 6xx palmtop computer
TARGET_ARCH = "sh3"
-include conf/machine/include/tune-sh3.conf
+require conf/machine/include/tune-sh3.conf
PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada6xx"
PCMCIA_MANAGER = "pcmciautils"
============================================================
--- conf/machine/jornada7xx.conf 8d448724a2b9ad34643b59ba9e36dcdd24fd6e85
+++ conf/machine/jornada7xx.conf 418f9affb10c10daa3033c6255e2455231ac1468
@@ -1,10 +1,10 @@ TARGET_ARCH = "arm"
#@TYPE: Machine
#@NAME: HP Jornada 7xx
#@DESCRIPTION: Machine configuration for the SA1100 based HP Jornada 7xx palmtop computer
TARGET_ARCH = "arm"
-include conf/machine/include/tune-strongarm.conf
+require conf/machine/include/tune-strongarm.conf
PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada7xx"
PCMCIA_MANAGER = "pcmciautils"
============================================================
--- conf/machine/lite5200.conf b12042ca7189ad68b1c5a4fd8e95eb90bdf2e5da
+++ conf/machine/lite5200.conf bd8e21962e6e8669abaa429b6e8b5fcd89e271df
@@ -8,4 +8,4 @@ IMAGE_FSTYPES = "jffs2 tar.bz2"
IMAGE_FSTYPES = "jffs2 tar.bz2"
+require conf/machine/include/tune-ppc603e.conf
-include conf/machine/include/tune-ppc603e.conf
============================================================
--- conf/machine/logicpd-pxa270.conf bde17aa1be61347052f17ab993f333b50597418b
+++ conf/machine/logicpd-pxa270.conf d66de7eee7676ab02110a2613df696d49ab27557
@@ -9,7 +9,7 @@ PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}"
PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
-include conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.conf
# used by sysvinit_2
SERIAL_CONSOLE = "115200 ttyS0"
============================================================
--- conf/machine/mainstone.conf a0a6f4fbb97a898712937fa0c6c4f5a621856fe4
+++ conf/machine/mainstone.conf a1ba916b56c3864a6f971e0c7d46f6b023e9fcd3
@@ -9,7 +9,7 @@ PREFERRED_PROVIDER_virtual/kernel = "${M
PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
-include conf/machine/include/tune-xscale.conf
+require conf/machine/include/tune-xscale.conf
# used by sysvinit_2
SERIAL_CONSOLE = "115200 ttyS0"
============================================================
--- conf/machine/mx21ads.conf a960a10466aae0710683fd7702c033b94c5dd8ab
+++ conf/machine/mx21ads.conf c3ed8d859b485ac2c7454f91345f7c2b5a2962c8
@@ -11,7 +11,7 @@ PREFERRED_PROVIDER_virtual/kernel = "${M
PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
-include conf/machine/include/tune-arm926ejs.conf
+require conf/machine/include/tune-arm926ejs.conf
# used by sysvinit_2
SERIAL_CONSOLE = "115200 ttymxc0"
============================================================
--- conf/machine/mx31ads.conf 7d28c2aa9385c91dddb64068b213588ba4823023
+++ conf/machine/mx31ads.conf 99dc4eb24722ad3d27caee1376a85aecd2be8a8d
@@ -12,7 +12,%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list