From c8d061c3cce88349a18b5070170c05a167465380 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 17 Aug 2004 12:44:30 +0000 Subject: [PATCH] Merge bk://openembedded@openembedded.bkbits.net/packages into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2004/08/17 14:44:22+02:00 uni-frankfurt.de!mickey - add variable for kernel console to kernel.oeclass: KERNEL_CONSOLE - make Zaurus kernels (openzaurus-pxa and openzaurus-sa) use the new variable - make it clear that the CONFIG_CMDLINE in defconfig- is irrelevant BKrev: 4121fdaeah1NKmgjtU85X3JWOmq0Mw --- classes/kernel.oeclass | 5 +++++ .../defconfig-corgi | 2 +- .../defconfig-husky | 2 +- .../defconfig-poodle | 2 +- .../defconfig-shepherd | 2 +- ...aurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe | 16 +++++++++++++++- ...zaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe | 6 +++--- 7 files changed, 27 insertions(+), 8 deletions(-) diff --git a/classes/kernel.oeclass b/classes/kernel.oeclass index 1eb85f72ca..08462caf07 100644 --- a/classes/kernel.oeclass +++ b/classes/kernel.oeclass @@ -14,6 +14,11 @@ KERNEL_LDSUFFIX ?= "" KERNEL_CC = "${CCACHE}${HOST_PREFIX}gcc${KERNEL_CCSUFFIX}" KERNEL_LD = "${LD}${KERNEL_LDSUFFIX}" +# +# configuration +# +export CMDLINE_CONSOLE = "console=${@oe.data.getVar("KERNEL_CONSOLE",d,1) or "ttyS0"}" + # parse kernel ABI version out of def get_kernelversion(p): import re diff --git a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-corgi b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-corgi index 4ee819a154..67daba2c08 100644 --- a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-corgi +++ b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-corgi @@ -230,7 +230,7 @@ CONFIG_APM_CPU_IDLE=y CONFIG_APM_DISPLAY_BLANK=y CONFIG_APM_RTC_IS_GMT=y # CONFIG_ARTHUR is not set -CONFIG_CMDLINE="console=null root=/dev/mtdblock2 mtdparts=sharpsl-nand:7168k@0k(smf),25600k@7168k(root),-(home) jffs2_orphaned_inodes=delete" +CONFIG_CMDLINE="" # CONFIG_SHARPSL_BOOTLDR_PARAMS is not set CONFIG_ALIGNMENT_TRAP=y CONFIG_FREEPG_SIGNAL=y diff --git a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-husky b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-husky index 9ee8cbff3d..25a87e771e 100644 --- a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-husky +++ b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-husky @@ -214,7 +214,7 @@ CONFIG_APM_CPU_IDLE=y CONFIG_APM_DISPLAY_BLANK=y CONFIG_APM_RTC_IS_GMT=y # CONFIG_ARTHUR is not set -CONFIG_CMDLINE="console=null root=/dev/mtdblock2 mtdparts=sharpsl-nand:7168k@0k(smf),54272k@7168k(root),-(home) jffs2_orphaned_inodes=delete rootfstype=jffs2" +CONFIG_CMDLINE="" # CONFIG_SHARPSL_BOOTLDR_PARAMS is not set CONFIG_ALIGNMENT_TRAP=y CONFIG_FREEPG_SIGNAL=y diff --git a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-poodle b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-poodle index 38fb1453a6..789aba23ab 100644 --- a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-poodle +++ b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-poodle @@ -213,7 +213,7 @@ CONFIG_APM_CPU_IDLE=y CONFIG_APM_DISPLAY_BLANK=y CONFIG_APM_RTC_IS_GMT=y # CONFIG_ARTHUR is not set -CONFIG_CMDLINE="console=null root=/dev/mtdblock2 mtdparts=sharpsl-nand:7168k@0k(smf),22528k@7168k(root),-(home) jffs2_orphaned_inodes=delete" +CONFIG_CMDLINE="" # CONFIG_SHARPSL_BOOTLDR_PARAMS is not set CONFIG_ALIGNMENT_TRAP=y CONFIG_FREEPG_SIGNAL=y diff --git a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-shepherd b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-shepherd index 712f344bc7..c40d7e6505 100644 --- a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-shepherd +++ b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-shepherd @@ -230,7 +230,7 @@ CONFIG_APM_CPU_IDLE=y CONFIG_APM_DISPLAY_BLANK=y CONFIG_APM_RTC_IS_GMT=y # CONFIG_ARTHUR is not set -CONFIG_CMDLINE="console=tty1 root=/dev/mtdblock2 mtdparts=sharpsl-nand:7168k@0k(smf),25600k@7168k(root),-(home) jffs2_orphaned_inodes=delete rootfstype=jffs2 probe_io=0" +CONFIG_CMDLINE="" # CONFIG_SHARPSL_BOOTLDR_PARAMS is not set CONFIG_ALIGNMENT_TRAP=y CONFIG_FREEPG_SIGNAL=y diff --git a/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe b/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe index cc70e501ab..9fa796a0a1 100644 --- a/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe +++ b/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe @@ -4,8 +4,9 @@ KV = "2.4.18" RMKV = "7" PXAV = "3" SHARPV = "20031107" -PR = "r5" +PR = "r6" DESCRIPTION = "Linux kernel for OpenZaurus PXA processor based devices." +MAINTAINER = "Michael 'Mickey' Lauer " FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/openzaurus-pxa-${KV}-rmk${RMKV}-pxa${PXAV}-embedix${SHARPV}" SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \ @@ -42,6 +43,18 @@ S = "${WORKDIR}/linux" inherit kernel +# +# Create the kernel command line. CMDLINE_CONSOLE is set through kernel.oeclass. +# +CMDLINE_MTDPARTS_poodle = "mtdparts=sharpsl-nand:7168k@0k(smf),22528k@7168k(root),-(home)" +CMDLINE_MTDPARTS_corgi = "mtdparts=sharpsl-nand:7168k@0k(smf),25600k@7168k(root),-(home)" +CMDLINE_MTDPARTS_shepherd = "mtdparts=sharpsl-nand:7168k@0k(smf),25600k@7168k(root),-(home)" +CMDLINE_MTDPARTS_husky = "mtdparts=sharpsl-nand:7168k@0k(smf),54272k@7168k(root),-(home)" +CMDLINE_MTDPARTS_tosa = "mtdparts=irrelevant-for-now-since-we-use-the-bootloader-params" + +CMDLINE_ROOT = "root=/dev/mtdblock2 rootfstype=jffs2 jffs2_orphaned_inodes=delete" +CMDLINE = "${CMDLINE_MTDPARTS} ${CMDLINE_ROOT} ${CMDLINE_CONSOLE}" + # # Compensate for sucky bootloader on all Sharp Zaurus models # @@ -58,4 +71,5 @@ module_autoload_pxa_bi = "pxa_bi" do_configure_prepend() { install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available." + echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config } diff --git a/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe b/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe index 65bde7518e..8b41e3576e 100644 --- a/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe +++ b/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe @@ -4,9 +4,9 @@ KV = "2.4.18" RMKV = "7" PXAV = "3" SHARPV = "20030509" -PR = "r5" +PR = "r6" DESCRIPTION = "Linux kernel for OpenZaurus StrongArm processor based devices." - +MAINTAINER = "Michael 'Mickey' Lauer " FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/openzaurus-sa-${KV}-rmk${RMKV}-pxa${PXAV}-embedix${SHARPV}" SRC_URI = "http://aurach.ewu.edu/ield_software/ch5/ROM3.10_stuff/linux-sl5500-${SHARPV}-rom3_10.tar.bz2 \ @@ -54,7 +54,7 @@ module_autoload_sa1100_bi = "sa1100_bi" # export mem = ${@oe.data.getVar("COLLIE_MEMORY_SIZE",d,1) or "32"} export rd = ${@oe.data.getVar("COLLIE_RAMDISK_SIZE",d,1) or "32"} -export CMDLINE = "console=ttyS0 root=/dev/mtdblock4 rootfstype=jffs2 jffs2_orphand_inodes=delete" +export CMDLINE = "${CMDLINE_CONSOLE} root=/dev/mtdblock4 rootfstype=jffs2 jffs2_orphand_inodes=delete" do_configure_prepend() { install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available." -- 2.39.5