diff options
| author | Matthias Hentges <oe@hentges.net> | 2005-07-25 10:12:07 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-07-25 10:12:07 +0000 |
| commit | dd12514d60861d5f6b2b72f7c31d86e9cdac8e6c (patch) | |
| tree | bba8b1fc84c6a638c673231548eff5ab815556d0 /packages/linux | |
| parent | fbb95e6d3a10d146020246be9216b2093c58390f (diff) | |
Akita/Spitz: Use OE für setting CMDLINE, not defconfig.
Diffstat (limited to 'packages/linux')
3 files changed, 9 insertions, 6 deletions
diff --git a/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20050228/defconfig-akita b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20050228/defconfig-akita index 0df598d8a8..d838f3710f 100644 --- a/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20050228/defconfig-akita +++ b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20050228/defconfig-akita @@ -254,7 +254,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),59392k@7168k(root),-(home) jffs2_orphaned_inodes=delete EQUIPMENT=0 LOGOLANG=1 DEFYEAR=2006 LOGO=1 LAUNCH=q" +CONFIG_CMDLINE="<see .bb file>" # CONFIG_SHARPSL_BOOTLDR_PARAMS is not set CONFIG_ALIGNMENT_TRAP=y CONFIG_FREEPG_SIGNAL=y diff --git a/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20050228/defconfig-spitz b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20050228/defconfig-spitz index 7da6775e2b..486486ee5a 100644 --- a/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20050228/defconfig-spitz +++ b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20050228/defconfig-spitz @@ -253,7 +253,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),5120k@7168k(root),-(home) jffs2_orphaned_inodes=delete RTC_RESET=1 EQUIPMENT=4 LOGOLANG=1 DEFYEAR=2005 LOGO=1 LAUNCH=q" +CONFIG_CMDLINE="<see .bb file>" # CONFIG_SHARPSL_BOOTLDR_PARAMS is not set CONFIG_ALIGNMENT_TRAP=y CONFIG_FREEPG_SIGNAL=y 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 59cd6e872f..493b7ef61e 100644 --- a/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb +++ b/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb @@ -41,7 +41,7 @@ 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} " S = "${WORKDIR}/linux_n1" @@ -51,9 +51,6 @@ inherit kernel # Breaks compilation for now, needs to be fixed # SRC_URI += "file://CPAR050218.patch;patch=1" -# autoload modules -module_autoload_usb-ohci-pxa27x = "usb-ohci-pxa27x" - # # Compensate for sucky bootloader on all Sharp Zaurus models # @@ -72,6 +69,11 @@ FILES_kernel-image = "" 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_INIT = " " +CMDLINE = "${CMDLINE_MTDPARTS} ${CMDLINE_ROOT} ${CMDLINE_CONSOLE} ${CMDLINE_INIT}" + + PARALLEL_MAKE = "" EXTRA_OEMAKE = "OPENZAURUS_RELEASE=-${DISTRO_VERSION}" KERNEL_CCSUFFIX = "-2.95" @@ -84,6 +86,7 @@ module_autoload_pxa27x_bi = "pxa27x_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 } do_deploy() { |