From: Koen Kooi <koen@openembedded.org>
Date: Thu, 28 Jul 2005 10:39:30 +0000 (+0000)
Subject: merge of 38c59f83153253c1fabaad0222e0d23afef45135
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a59190121b4935e0ffae9f3972a395e93e15a5a;p=openembedded.git

merge of 38c59f83153253c1fabaad0222e0d23afef45135
     and b88b6c8b65aeead6d10de926c2e99ffbcd6ca5fe
---

2a59190121b4935e0ffae9f3972a395e93e15a5a
diff --cc packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb
index 3aaed3b607,65e01a18f7..31c2b8fdf8
--- a/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb
+++ b/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb
@@@ -53,14 -53,12 +53,13 @@@ inherit kerne
  #
  # Create the kernel command line. CMDLINE_CONSOLE is set through kernel.oeclass.
  #
 -CMDLINE_MTDPARTS_spitz   = "mtdparts=sharpsl-nand:7168k@0k(smf),5120k@7168k(root),-(home)  EQUIPMENT=4 RTC_RESET=1"
 -CMDLINE_MTDPARTS_akita   = "mtdparts=sharpsl-nand:7168k@0k(smf),54272k@7168k(root),-(home) EQUIPMENT=0"
 +CMDLINE_MTDPARTS_spitz   = "mtdparts=sharpsl-nand:7168k@0k(smf),5120k@7168k(root),-(home)"
 +CMDLINE_SHARP_spitz      = "RTC_RESET=1 EQUIPMENT=4 LOGOLANG=1 DEFYEAR=2005 LOGO=1 LAUNCH=q"
 +
- CMDLINE_MTDPARTS_akita   = "mtdparts=sharpsl-nand:7168k@0k(smf),54272k@7168k(root),-(home)"
- CMDLINE_SHARP_akita      = "EQUIPMENT=0 LOGOLANG=1 DEFYEAR=2005 LOGO=1 LAUNCH=q"
- 
- CMDLINE_ROOT = "root=/dev/mtdblock2 jffs2_orphaned_inodes=delete"
- CMDLINE = "${CMDLINE_CONSOLE} ${CMDLINE_MTDPARTS} ${CMDLINE_ROOT} ${CMDLINE_SHARP}"
+ CMDLINE_ROOT = "root=/dev/mtdblock2 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}"
  
  #
  # Compensate for sucky bootloader on all Sharp Zaurus models