diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2004-09-13 16:48:05 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2004-09-13 16:48:05 +0000 |
| commit | 1195249bd83f250ed12c51739548c8d7efe57ace (patch) | |
| tree | ada8cade96973b8fad65786ca116faafd540c945 /linux | |
| parent | b2ab47f9612c40fab8bcb76a7ca91c383327cc57 (diff) | |
Merge bk://openembedded@openembedded.bkbits.net/packages
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages
2004/09/13 18:47:39+02:00 uni-frankfurt.de!mickeyl
disable sharpsl bootloader params and construct own cmdline for tosa
BKrev: 4145cf45qOYrlXIubZE4dmCZsGYPsQ
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-tosa | 4 | ||||
| -rw-r--r-- | linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-tosa b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-tosa index cf21ecf0e8..5dade995fb 100644 --- a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-tosa +++ b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-tosa @@ -229,8 +229,8 @@ CONFIG_APM_CPU_IDLE=y CONFIG_APM_DISPLAY_BLANK=y CONFIG_APM_RTC_IS_GMT=y # CONFIG_ARTHUR is not set -CONFIG_CMDLINE="console=ttyS0 root=/dev/mtdblock2" -CONFIG_SHARPSL_BOOTLDR_PARAMS=y +CONFIG_CMDLINE="<see .oe file>" +# CONFIG_SHARPSL_BOOTLDR_PARAMS is not set CONFIG_ALIGNMENT_TRAP=y CONFIG_FREEPG_SIGNAL=y CONFIG_OOM_KILL_SURVIVAL=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 8fdba93aee..c06e2c81d2 100644 --- a/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe +++ b/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe @@ -4,7 +4,7 @@ KV = "2.4.18" RMKV = "7" PXAV = "3" SHARPV = "20031107" -PR = "r6" +PR = "r7" DESCRIPTION = "Linux kernel for OpenZaurus PXA processor based devices." MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/openzaurus-pxa-${KV}-rmk${RMKV}-pxa${PXAV}-embedix${SHARPV}" @@ -50,7 +50,7 @@ CMDLINE_MTDPARTS_poodle = "mtdparts=sharpsl-nand:7168k@0k(smf),22528k@7168k(ro 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_MTDPARTS_tosa = "mtdparts=sharpsl-nand:7168k@0k(smf),28672k@7168k(root),-(home) EQUIPMENT=2" CMDLINE_ROOT = "root=/dev/mtdblock2 rootfstype=jffs2 jffs2_orphaned_inodes=delete" CMDLINE = "${CMDLINE_MTDPARTS} ${CMDLINE_ROOT} ${CMDLINE_CONSOLE}" |