diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-10-06 23:56:23 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-10-06 23:56:23 +0000 |
| commit | 539eae6db69efbe6d3f53147c521916d8aa3d250 (patch) | |
| tree | fbfd040877a4d04c82dc990a52aa5776f47ad8dc /packages | |
| parent | 8c838676d5f07387ad3138824804c315fa5e5765 (diff) | |
| parent | 7a5388e17be3a3d4b3789edf8ecbd4366740f8b7 (diff) | |
merge of '4ad998485279a205c19c8548d890f34eed8853bc'
and '907b09122e18d1c5bf7d911edc9c19d8eff6cfe4'
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/linux/compulab-pxa270-2.6.22/defconfig | 2 | ||||
| -rw-r--r-- | packages/linux/compulab-pxa270_2.6.22.bb | 4 | ||||
| -rw-r--r-- | packages/pango/pango-directfb_1.18.1.bb | 10 |
3 files changed, 4 insertions, 12 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 diff --git a/packages/pango/pango-directfb_1.18.1.bb b/packages/pango/pango-directfb_1.18.1.bb deleted file mode 100644 index 7e5c798221..0000000000 --- a/packages/pango/pango-directfb_1.18.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -require pango.inc -RCONFLICTS = "pango" -RPROVIDES = "pango-directfb" -DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv gtk-doc cairo-directfb" -SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/pango/1.18/pango-${PV}.tar.bz2 \ - file://no-tests.patch;patch=1" - -S = "${WORKDIR}/pango-${PV}" -RRECOMMENDS_${PN} = "" -FILESPATH = "${FILE_DIRNAME}/pango-${PV}:${FILE_DIRNAME}/files" |