From 34ad3bf832bd78d0f8d26df56955ba76d18c1e6a Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Mon, 6 Aug 2007 11:42:09 +0000
Subject: zaurus: Rename included conf files to .inc

---
 conf/machine/include/poodle-2.6.conf       |  2 +-
 conf/machine/include/zaurus-2.6.conf       | 42 ------------------------------
 conf/machine/include/zaurus-2.6.inc        | 42 ++++++++++++++++++++++++++++++
 conf/machine/include/zaurus-clamshell.conf | 13 ---------
 conf/machine/include/zaurus-clamshell.inc  | 13 +++++++++
 5 files changed, 56 insertions(+), 56 deletions(-)
 delete mode 100644 conf/machine/include/zaurus-2.6.conf
 create mode 100644 conf/machine/include/zaurus-2.6.inc
 delete mode 100644 conf/machine/include/zaurus-clamshell.conf
 create mode 100644 conf/machine/include/zaurus-clamshell.inc

(limited to 'conf/machine/include')

diff --git a/conf/machine/include/poodle-2.6.conf b/conf/machine/include/poodle-2.6.conf
index 01a06b7c27..fa24a3281b 100644
--- a/conf/machine/include/poodle-2.6.conf
+++ b/conf/machine/include/poodle-2.6.conf
@@ -1 +1 @@
-require conf/machine/include/zaurus-2.6.conf
+require conf/machine/include/zaurus-2.6.inc
diff --git a/conf/machine/include/zaurus-2.6.conf b/conf/machine/include/zaurus-2.6.conf
deleted file mode 100644
index ada838f0d6..0000000000
--- a/conf/machine/include/zaurus-2.6.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-# Zaurus Clamshell specific configuration for kernel 2.6
-# Don't forget to include zaurus-clamshell.conf as well
-
-TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
-
-MACHINE_KERNEL_VERSION = "2.6"
-
-ERASEBLOCKSIZE = "0x4000"
-ERASEBLOCKSIZE_akita = "0x20000"
-
-EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --faketime -n" 
-
-IMAGE_CMD_jffs2 = "mkfs.jffs2 -x lzo --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.bin ${EXTRA_IMAGECMD}"
-
-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
-
-SERIAL_CONSOLE = "115200 ttyS0"
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-
-PCMCIA_MANAGER ?= "pcmciautils"
-
-MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen"
-MACHINE_FEATURES_append_tosa  = " usbhost wifi "
-MACHINE_FEATURES_append_akita = " usbhost "
-MACHINE_FEATURES_append_spitz = " usbhost ext2 "
-
-MACHINE_EXTRA_RDEPENDS = "zaurusd"
-MACHINE_EXTRA_RRECOMMENDS_c7x0   = "kernel-module-snd-soc-corgi"
-MACHINE_EXTRA_RRECOMMENDS_akita  = "kernel-module-snd-soc-spitz"
-MACHINE_EXTRA_RRECOMMENDS_spitz  = "kernel-module-snd-soc-spitz"
-MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle"
-
-GUI_MACHINE_CLASS = "bigscreen"
-GUI_MACHINE_CLASS_poodle = "smallscreen"
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
new file mode 100644
index 0000000000..ada838f0d6
--- /dev/null
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -0,0 +1,42 @@
+# Zaurus Clamshell specific configuration for kernel 2.6
+# Don't forget to include zaurus-clamshell.conf as well
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
+
+MACHINE_KERNEL_VERSION = "2.6"
+
+ERASEBLOCKSIZE = "0x4000"
+ERASEBLOCKSIZE_akita = "0x20000"
+
+EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --faketime -n" 
+
+IMAGE_CMD_jffs2 = "mkfs.jffs2 -x lzo --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.bin ${EXTRA_IMAGECMD}"
+
+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
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+
+PCMCIA_MANAGER ?= "pcmciautils"
+
+MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen"
+MACHINE_FEATURES_append_tosa  = " usbhost wifi "
+MACHINE_FEATURES_append_akita = " usbhost "
+MACHINE_FEATURES_append_spitz = " usbhost ext2 "
+
+MACHINE_EXTRA_RDEPENDS = "zaurusd"
+MACHINE_EXTRA_RRECOMMENDS_c7x0   = "kernel-module-snd-soc-corgi"
+MACHINE_EXTRA_RRECOMMENDS_akita  = "kernel-module-snd-soc-spitz"
+MACHINE_EXTRA_RRECOMMENDS_spitz  = "kernel-module-snd-soc-spitz"
+MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle"
+
+GUI_MACHINE_CLASS = "bigscreen"
+GUI_MACHINE_CLASS_poodle = "smallscreen"
diff --git a/conf/machine/include/zaurus-clamshell.conf b/conf/machine/include/zaurus-clamshell.conf
deleted file mode 100644
index f66502eff1..0000000000
--- a/conf/machine/include/zaurus-clamshell.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700"
-
-IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime -m favourlzo \
-                   --output=${T}/${IMAGE_NAME}.rootfs.jffs2 --pad --little-endian --eraseblock=${ERASEBLOCKSIZE} -n \
-                   && sumtool -i ${T}/${IMAGE_NAME}.rootfs.jffs2 \
-                   -o ${T}/${IMAGE_NAME}.rootfs.jffs2.summary \
-                   --eraseblock=${ERASEBLOCKSIZE} -l -p; \
-                   cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
-                   ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2; \
-                   rm ${T}/${IMAGE_NAME}.rootfs.jffs2; \
-                   cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
-                   ${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.jffs2; \
-                   rm ${T}/${IMAGE_NAME}.rootfs.jffs2.summary;"
diff --git a/conf/machine/include/zaurus-clamshell.inc b/conf/machine/include/zaurus-clamshell.inc
new file mode 100644
index 0000000000..f66502eff1
--- /dev/null
+++ b/conf/machine/include/zaurus-clamshell.inc
@@ -0,0 +1,13 @@
+EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700"
+
+IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime -m favourlzo \
+                   --output=${T}/${IMAGE_NAME}.rootfs.jffs2 --pad --little-endian --eraseblock=${ERASEBLOCKSIZE} -n \
+                   && sumtool -i ${T}/${IMAGE_NAME}.rootfs.jffs2 \
+                   -o ${T}/${IMAGE_NAME}.rootfs.jffs2.summary \
+                   --eraseblock=${ERASEBLOCKSIZE} -l -p; \
+                   cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
+                   ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2; \
+                   rm ${T}/${IMAGE_NAME}.rootfs.jffs2; \
+                   cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
+                   ${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.jffs2; \
+                   rm ${T}/${IMAGE_NAME}.rootfs.jffs2.summary;"
-- 
cgit v1.2.3