openzaurus-pxa27x:

- restore module_autoload
- reorder metadata to be more comparable to openzaurus-pxa-2.4.18

2 files changed, 27 insertions, 29 deletions

diff --git a/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb b/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb
index 493b7ef61e..1bf70a62d6 100644
--- a/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb
+++ b/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb
@@ -41,52 +41,48 @@ SRC_URI = "http://developer.ezaurus.com/sl_j/source/c1000/20050228/linux-c1000-2
            file://1764-1.patch;patch=1 \
            file://armdeffix.patch;patch=1 \
            file://add-oz-release-string.patch;patch=1 \
-	   file://saner-spitz-keymap.patch;patch=1 \
+           file://saner-spitz-keymap.patch;patch=1 \
            file://defconfig-${MACHINE} "
+# Breaks compilation for now, needs to be fixed
+# SRC_URI += "file://CPAR050218.patch;patch=1"
 
 S = "${WORKDIR}/linux_n1"
 
 inherit kernel
 
-# Breaks compilation for now, needs to be fixed
-# SRC_URI += "file://CPAR050218.patch;patch=1"
-
-#
-# Compensate for sucky bootloader on all Sharp Zaurus models
-#
-ALLOW_EMPTY = "1"
-FILES_kernel-image = ""
-
 #
-# mtd layout on spitz (akita has same layout as husky)
+# Create the kernel command line. CMDLINE_CONSOLE is set through kernel.oeclass.
 #
-# dev:    size   erasesize  name
-# mtd0: 006b0000 00020000 "Filesystem"
-# mtd1: 00700000 00004000 "smf"
-# mtd2: 00500000 00004000 "root"
-# mtd3: 00400000 00004000 "home"
+CMDLINE_MTDPARTS_spitz   = "mtdparts=sharpsl-nand:7168k@0k(smf),5120k@7168k(root),-(home)  EQUIPMENT=0"
+CMDLINE_MTDPARTS_akita   = "mtdparts=sharpsl-nand:7168k@0k(smf),54272k@7168k(root),-(home) EQUIPMENT=4"
 
-CMDLINE_MTDPARTS_spitz   = "mtdparts=sharpsl-nand:7168k@0k(smf),5120k@7168k(root),-(home)"
-CMDLINE_MTDPARTS_akita   = "mtdparts=sharpsl-nand:7168k@0k(smf),54272k@7168k(root),-(home)"
-
-CMDLINE_ROOT = "root=/dev/mtdblock2 jffs2 jffs2_orphaned_inodes=delete EQUIPMENT=0 LOGOLANG=1 DEFYEAR=2006 LOGO=1 LAUNCH=q"
+CMDLINE_ROOT = "root=/dev/mtdblock2 jffs2 jffs2_orphaned_inodes=delete LOGOLANG=1 DEFYEAR=2006 LOGO=1 LAUNCH=q"
+# CMDLINE_INIT = "init=/bin/busybox ash"
 CMDLINE_INIT = " "
 CMDLINE = "${CMDLINE_MTDPARTS} ${CMDLINE_ROOT} ${CMDLINE_CONSOLE} ${CMDLINE_INIT}"
 
-
-PARALLEL_MAKE = ""
+#
+# Compensate for sucky bootloader on all Sharp Zaurus models
+#
+ALLOW_EMPTY = "1"
+FILES_kernel-image = ""
 EXTRA_OEMAKE = "OPENZAURUS_RELEASE=-${DISTRO_VERSION}"
 KERNEL_CCSUFFIX = "-2.95"
 KERNEL_LDSUFFIX = "-2.11.2"
 COMPATIBLE_HOST = "arm.*-linux"
+PARALLEL_MAKE = ""
 
+#
+# autoload modules
+#
 module_conf_usbdmonitor = "alias usbd0 usbdmonitor"
 module_conf_pxa27x_bi = "below pxa27x_bi net_fd usbdcore "
 module_autoload_pxa27x_bi = "pxa27x_bi"
+module_autoload_usb-ohci-pxa27x = "usb-ohci-pxa27x"
 
 do_configure_prepend() {
-	install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available."
-	echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config
+        install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available."
+        echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config
 }
 
 do_deploy() {
diff --git a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
index 9cd6eb1fcb..acaeb5b189 100644
--- a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
+++ b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
@@ -79,20 +79,23 @@ CMDLINE = "${CMDLINE_MTDPARTS} ${CMDLINE_ROOT} ${CMDLINE_CONSOLE} ${CMDLINE_INIT
 #
 ALLOW_EMPTY = "1"
 FILES_kernel-image = ""
-
 EXTRA_OEMAKE = " EMBEDIXRELEASE=-${DISTRO_VERSION}"
 KERNEL_CCSUFFIX = "-2.95"
 KERNEL_LDSUFFIX = "-2.11.2"
 COMPATIBLE_HOST = "arm.*-linux"
+PARALLEL_MAKE = ""
 
+#
+# autoload modules
+#
 module_conf_usbdmonitor = "alias usbd0 usbdmonitor"
 module_conf_pxa_bi = "below pxa_bi net_fd usbdcore "
 module_autoload_pxa_bi = "pxa_bi"
 
 do_configure_prepend() {
-	patch -p1 < cifs_24.patch
-	install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available."
-	echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config
+        patch -p1 < cifs_24.patch
+        install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available."
+        echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config
 }
 
 do_deploy() {
@@ -107,4 +110,3 @@ addtask deploy before do_build after do_compile
 PACKAGE_ARCH_corgi    = "c7x0"
 PACKAGE_ARCH_shepherd = "c7x0"
 PACKAGE_ARCH_husky    = "c7x0"
-