diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-10-07 00:22:03 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-10-07 00:22:03 +0000 |
| commit | 496d5415774f03b6e09aee17763ac9432d9c2755 (patch) | |
| tree | cd7e32f41c17f72694ea3ff3a01320758cff7a7b /packages/linux | |
| parent | e522d5d50c4708cf97c14f7255fa8faf41f99d46 (diff) | |
| parent | 80d8a840bba6ba27bff345e40f5d5fa2ef318d02 (diff) | |
merge of '2ba712b467ac5c686bf68f2c52317171b00a2a14'
and '52be2ff079be681e1ba27f4d4342036b38404b89'
Diffstat (limited to 'packages/linux')
| -rw-r--r-- | packages/linux/compulab-pxa270-2.6.22/defconfig | 2 | ||||
| -rw-r--r-- | packages/linux/compulab-pxa270_2.6.22.bb | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/packages/linux/compulab-pxa270-2.6.22/defconfig b/packages/linux/compulab-pxa270-2.6.22/defconfig index a6966d2dad..63bc69533f 100644 --- a/packages/linux/compulab-pxa270-2.6.22/defconfig +++ b/packages/linux/compulab-pxa270-2.6.22/defconfig @@ -220,7 +220,7 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttyS1,38400 monitor=8 bpp=16 mem=64M mtdparts=physmap-flash.0:256k(boot)ro,0x180000(kernel),-(root);cm-x270-nand:64m(app),-(data)" +CONFIG_CMDLINE="console=ttyS1,38400 monitor=8 bpp=16 mem=64M mtdparts=physmap-flash.0:256k(boot)ro,0x180000(kernel),-(root);cm-x270-nand:64m(app),-(data) rdinit=/sbin/init root=mtd3 rootfstype=jffs2" # CONFIG_XIP_KERNEL is not set # CONFIG_KEXEC is not set diff --git a/packages/linux/compulab-pxa270_2.6.22.bb b/packages/linux/compulab-pxa270_2.6.22.bb index 963a8cf39f..86a7626d8a 100644 --- a/packages/linux/compulab-pxa270_2.6.22.bb +++ b/packages/linux/compulab-pxa270_2.6.22.bb @@ -3,7 +3,7 @@ require linux.inc SECTION = "kernel" DESCRIPTION = "Linux kernel for the Compulab PXA270 system" LICENSE = "GPL" -PR = "r0" +PR = "r1" SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ file://0001-cm-x270-base2.patch;patch=1 \ @@ -30,6 +30,8 @@ S = "${WORKDIR}/linux-${PV}" COMPATIBLE_HOST = 'arm.*-linux' COMPATIBLE_MACHINE = "compulab-pxa270" +CMDLINE = "console=${CMX270_CONSOLE_SERIAL_PORT},38400 monitor=8 bpp=16 mem=64M mtdparts=physmap-flash.0:256k(boot)ro,0x180000(kernel),-(root);cm-x270-nand:64m(app),-(data) rdinit=/sbin/init root=mtd3 rootfstype=jffs2" + inherit kernel inherit package |