[oe-commits] org.oe.oz354x machine configs: move common parts to conf/machine/include

hrw commit openembedded-commits at lists.openembedded.org
Fri Sep 1 06:56:36 UTC 2006 

machine configs: move common parts to conf/machine/include

Author: hrw at openembedded.org
Branch: org.openembedded.oz354x
Revision: d123727f17d27c68ca9ef9ac4eb4ab90209d664b
ViewMTN: http://monotone.openembedded.org/revision.psp?id=d123727f17d27c68ca9ef9ac4eb4ab90209d664b
Files:
1
conf/machine/collie-2.4.conf
conf/machine/include/collie-2.4.conf
conf/machine/collie-2.6.conf
conf/machine/include/collie-2.6.conf
conf/machine/handheld-common.conf
conf/machine/include/handheld-common.conf
conf/machine/poodle-2.4.conf
conf/machine/include/poodle-2.4.conf
conf/machine/poodle-2.6.conf
conf/machine/include/poodle-2.6.conf
conf/machine/tosa-2.4.conf
conf/machine/include/tosa-2.4.conf
conf/machine/tosa-2.6.conf
conf/machine/include/tosa-2.6.conf
conf/machine/tune-strongarm.conf
conf/machine/include/tune-strongarm.conf
conf/machine/tune-xscale.conf
conf/machine/include/tune-xscale.conf
conf/machine/zaurus-clamshell-2.6.conf
conf/machine/include/zaurus-clamshell-2.6.conf
conf/machine/zaurus-clamshell.conf
conf/machine/include/zaurus-clamshell.conf
conf/machine/include
conf/machine/akita.conf
conf/machine/c7x0.conf
conf/machine/collie.conf
conf/machine/poodle.conf
conf/machine/spitz.conf
conf/machine/tosa.conf
Diffs:

#
# mt diff -r33d804e082e0702e05818192cfab8a8610605d88 -rd123727f17d27c68ca9ef9ac4eb4ab90209d664b
#
# 
# 
# rename "conf/machine/collie-2.4.conf"
#     to "conf/machine/include/collie-2.4.conf"
# 
# rename "conf/machine/collie-2.6.conf"
#     to "conf/machine/include/collie-2.6.conf"
# 
# rename "conf/machine/handheld-common.conf"
#     to "conf/machine/include/handheld-common.conf"
# 
# rename "conf/machine/poodle-2.4.conf"
#     to "conf/machine/include/poodle-2.4.conf"
# 
# rename "conf/machine/poodle-2.6.conf"
#     to "conf/machine/include/poodle-2.6.conf"
# 
# rename "conf/machine/tosa-2.4.conf"
#     to "conf/machine/include/tosa-2.4.conf"
# 
# rename "conf/machine/tosa-2.6.conf"
#     to "conf/machine/include/tosa-2.6.conf"
# 
# rename "conf/machine/tune-strongarm.conf"
#     to "conf/machine/include/tune-strongarm.conf"
# 
# rename "conf/machine/tune-xscale.conf"
#     to "conf/machine/include/tune-xscale.conf"
# 
# rename "conf/machine/zaurus-clamshell-2.6.conf"
#     to "conf/machine/include/zaurus-clamshell-2.6.conf"
# 
# rename "conf/machine/zaurus-clamshell.conf"
#     to "conf/machine/include/zaurus-clamshell.conf"
# 
# add_dir "conf/machine/include"
# 
# patch "conf/machine/akita.conf"
#  from [36bb727f4eeba1954e0ddb2b1a98200486e31670]
#    to [af78f30178da602e2a69ad68fe1b44ef922fe68b]
# 
# patch "conf/machine/c7x0.conf"
#  from [036c89c3f27724438f7e120fc451d1223e71185a]
#    to [7e4bfe5d75a97d3438bd44a2eda9a4e6f09af371]
# 
# patch "conf/machine/collie.conf"
#  from [7136b76c5fdc71d533fb4bc2283280a647ada864]
#    to [460af4993ef9b02f32cd7c2c5950346840c80553]
# 
# patch "conf/machine/poodle.conf"
#  from [88ab902fadee56956e5bf4bd36092e14696735e2]
#    to [6ae63dc302bf8f62895dd697b0e12057b09f957b]
# 
# patch "conf/machine/spitz.conf"
#  from [f218577c8dca1c217f00a014cf1de6cdb0be2215]
#    to [6ab729e015d2faffda8da94279aeb88584212e71]
# 
# patch "conf/machine/tosa.conf"
#  from [1d75a3ac976f61a0b3c6a9b4ff845eb70564829c]
#    to [b3676b1eed3f7a186baa86ea39cf5afbbbae90d7]
# 
============================================================
--- conf/machine/akita.conf	36bb727f4eeba1954e0ddb2b1a98200486e31670
+++ conf/machine/akita.conf	af78f30178da602e2a69ad68fe1b44ef922fe68b
@@ -1,11 +1,11 @@ ZKERNEL_VERSION ?= "2.6"
 #@TYPE: Machine
 #@NAME: Sharp Zaurus SL-C1000
 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C1000 device
 
 ZKERNEL_VERSION ?= "2.6"
 
-include conf/machine/zaurus-clamshell.conf
-include conf/machine/zaurus-clamshell-${ZKERNEL_VERSION}.conf
+include conf/machine/include/zaurus-clamshell.conf
+include conf/machine/include/zaurus-clamshell-${ZKERNEL_VERSION}.conf
 
 ROOT_FLASH_SIZE = "64"
 
@@ -21,9 +21,9 @@ MACHINE_ROOTFS_SIZE = "40"
 MACHINE_ROOTFS_SIZE = "40"
 
 # *clamshell*.conf will be removed eventually
-include conf/machine/kernel-modules-${MACHINE_KERNEL_VERSION}.conf
-include conf/machine/zaurus-clamshell.conf
-include conf/machine/zaurus-clamshell-${MACHINE_KERNEL_VERSION}.conf
+include conf/machine/include/kernel-modules-${MACHINE_KERNEL_VERSION}.conf
+include conf/machine/include/zaurus-clamshell.conf
+include conf/machine/include/zaurus-clamshell-${MACHINE_KERNEL_VERSION}.conf
 
 INHERIT += "linux_modules"
 
============================================================
--- conf/machine/c7x0.conf	036c89c3f27724438f7e120fc451d1223e71185a
+++ conf/machine/c7x0.conf	7e4bfe5d75a97d3438bd44a2eda9a4e6f09af371
@@ -1,11 +1,11 @@ ZKERNEL_VERSION ?= "2.6"
 #@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
 
 ZKERNEL_VERSION ?= "2.6"
 
-include conf/machine/zaurus-clamshell.conf
-include conf/machine/zaurus-clamshell-${ZKERNEL_VERSION}.conf
+include conf/machine/include/zaurus-clamshell.conf
+include conf/machine/include/zaurus-clamshell-${ZKERNEL_VERSION}.conf
 
 ROOT_FLASH_SIZE = "32"
 # yes, the husky has 64MB, I know... Be happy, that way you can install more software :)
============================================================
--- conf/machine/collie.conf	7136b76c5fdc71d533fb4bc2283280a647ada864
+++ conf/machine/collie.conf	460af4993ef9b02f32cd7c2c5950346840c80553
@@ -6,7 +6,7 @@ ZKERNEL_VERSION ?= "2.6"
 IPKG_ARCHS = "all arm ${MACHINE}"
 
 ZKERNEL_VERSION ?= "2.6"
-include conf/machine/collie-${ZKERNEL_VERSION}.conf
+include conf/machine/include/collie-${ZKERNEL_VERSION}.conf
 
 PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
 BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel altboot"
@@ -20,8 +20,8 @@ IMAGE_LINGUAS = ""
 
 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"
 
============================================================
--- conf/machine/poodle.conf	88ab902fadee56956e5bf4bd36092e14696735e2
+++ conf/machine/poodle.conf	6ae63dc302bf8f62895dd697b0e12057b09f957b
@@ -6,7 +6,7 @@ ZKERNEL_VERSION ?= "2.6"
 IPKG_ARCHS = "all arm armv4 armv5te poodle"
 
 ZKERNEL_VERSION ?= "2.6"
-include conf/machine/poodle-${ZKERNEL_VERSION}.conf
+include conf/machine/include/poodle-${ZKERNEL_VERSION}.conf
 
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad --faketime -n" 
 
@@ -15,13 +15,13 @@ BOOTSTRAP_EXTRA_RDEPENDS += "keymaps e2f
 BOOTSTRAP_EXTRA_DEPENDS += "zaurus-updater keymaps e2fsprogs"
 BOOTSTRAP_EXTRA_RDEPENDS += "keymaps e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-e2fsck"
 
-include conf/machine/handheld-common.conf
+include conf/machine/include/handheld-common.conf
 
 # yes, it has 64MB...
 ROOT_FLASH_SIZE = "21"
 
 # 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"
 
============================================================
--- conf/machine/spitz.conf	f218577c8dca1c217f00a014cf1de6cdb0be2215
+++ conf/machine/spitz.conf	6ab729e015d2faffda8da94279aeb88584212e71
@@ -1,11 +1,11 @@ ZKERNEL_VERSION ?= "2.6"
 #@TYPE: Machine
 #@NAME: Sharp Zaurus SL-C3000
 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3000 device
 
 ZKERNEL_VERSION ?= "2.6"
 
-include conf/machine/zaurus-clamshell.conf
-include conf/machine/zaurus-clamshell-${ZKERNEL_VERSION}.conf
+include conf/machine/include/zaurus-clamshell.conf
+include conf/machine/include/zaurus-clamshell-${ZKERNEL_VERSION}.conf
 
 PIVOTBOOT_EXTRA_DEPENDS  += "pivotinit pcmcia-cs"
 PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit pcmcia-cs"
@@ -34,9 +34,9 @@ MACHINE_ROOTFS_SIZE = "200"
 MACHINE_ROOTFS_SIZE = "200"
 
 # *clamshell*.conf will be removed eventually
-include conf/machine/kernel-modules-${MACHINE_KERNEL_VERSION}.conf
-include conf/machine/zaurus-clamshell.conf
-include conf/machine/zaurus-clamshell-${MACHINE_KERNEL_VERSION}.conf
+include conf/machine/include/kernel-modules-${MACHINE_KERNEL_VERSION}.conf
+include conf/machine/include/zaurus-clamshell.conf
+include conf/machine/include/zaurus-clamshell-${MACHINE_KERNEL_VERSION}.conf
 
 INHERIT += "linux_modules"
 
============================================================
--- conf/machine/tosa.conf	1d75a3ac976f61a0b3c6a9b4ff845eb70564829c
+++ conf/machine/tosa.conf	b3676b1eed3f7a186baa86ea39cf5afbbbae90d7
@@ -6,7 +6,7 @@ ZKERNEL_VERSION ?= "2.6"
 IPKG_ARCHS = "all arm armv4 armv5te tosa"
 
 ZKERNEL_VERSION ?= "2.6"
-include conf/machine/tosa-${ZKERNEL_VERSION}.conf
+include conf/machine/include/tosa-${ZKERNEL_VERSION}.conf
 
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n --faketime"
 
@@ -19,9 +19,9 @@ ROOT_FLASH_SIZE = "32"
 GPE_EXTRA_DEPENDS += "gaim"
 ROOT_FLASH_SIZE = "32"
 
-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"

More information about the Openembedded-commits mailing list