summaryrefslogtreecommitdiff
path: root/packages/linux
diff options
context:
space:
mode:
authornslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-03-30 20:41:29 +0000
committernslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-03-30 20:41:29 +0000
commit6c520870df5bb6fc065acc89c6ffc23a36aad668 (patch)
treed9e7ce9b4031af0bfe0c6f623fa02533218268ea /packages/linux
parent4432fea81041e5ae18979d57cbbdba9dce680693 (diff)
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/03/30 21:54:30+02:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/03/30 21:54:07+02:00 uni-frankfurt.de!mickeyl fix missing dependency to kernel-image-<ver> by ALLOW_EMPTY=1 for Zaurus kernels 2005/03/30 20:52:02+01:00 (none)!cwiiis Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/ into cwiiisdesktop.(none):/home/cwiiis/Dev/oe/openembedded 2005/03/30 20:47:32+01:00 rpsys.net!RP base.bbclass: spliting on the last "." breaks for patch series' with similar filesnames (eg: 2.6.12-patch1, 2.6.12-patch2) 2005/03/30 20:21:34+01:00 (none)!cwiiis Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/ into cwiiisdesktop.(none):/home/cwiiis/Dev/oe/openembedded 2005/03/30 20:20:49+01:00 (none)!cwiiis Correct SRC_URI for matchbox-panel-manager BKrev: 424b0ef9_dORxDSjGZ1WQExBCPmvmQ
Diffstat (limited to 'packages/linux')
-rw-r--r--packages/linux/linux-openzaurus_2.6.11.bb2
-rw-r--r--packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20041116.bb5
-rw-r--r--packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc5
3 files changed, 5 insertions, 7 deletions
diff --git a/packages/linux/linux-openzaurus_2.6.11.bb b/packages/linux/linux-openzaurus_2.6.11.bb
index 3079e5e8c7..064d1a8a40 100644
--- a/packages/linux/linux-openzaurus_2.6.11.bb
+++ b/packages/linux/linux-openzaurus_2.6.11.bb
@@ -103,7 +103,7 @@ COMPATIBLE_HOST = "arm.*-linux"
#CMDLINE_MTDPARTS_husky = "mtdparts=sharpsl-nand:7168k@0k(smf),54272k@7168k(root),-(home) mem=64M"
#CMDLINE_MTDPARTS_tosa = "mtdparts=sharpsl-nand:7168k@0k(smf),28672k@7168k(root),-(home) EQUIPMENT=2"
-CMDLINE_CON = "console=ttyS0,115200n8 console=tty0 noinitrd"
+CMDLINE_CON = "console=ttyS0,115200n8 console=tty1 noinitrd"
CMDLINE_ROOT = "root=/dev/mtdblock2 rootfstype=jffs2 "
CMDLINE_ROOT_poodle = "root=/dev/mtdblock1 rootfstype=jffs2 "
diff --git a/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20041116.bb b/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20041116.bb
index c1503cf5d4..8eded17217 100644
--- a/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20041116.bb
+++ b/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20041116.bb
@@ -5,9 +5,7 @@ SECTION = "kernel"
PV = "2.4.20-rmk2-embedix"
LICENSE = "GPL"
KV = "2.4.20"
-PR = "r1"
-
-ALLOW_EMPTY_kernel = "1"
+PR = "r2"
SRC_URI = "http://developer.ezaurus.com/sl_j/source/c3000/20041116/linux-c3000-20041116-rom1_01.tar.bz2 \
file://swap-performance.patch;patch=1 \
@@ -37,6 +35,7 @@ inherit kernel
#
# Compensate for sucky bootloader on all Sharp Zaurus models
#
+ALLOW_EMPTY = "1"
FILES_kernel-image = ""
#
diff --git a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
index b703e10886..1d2487966c 100644
--- a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
+++ b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
@@ -7,11 +7,9 @@ KV = "2.4.18"
RMKV = "7"
PXAV = "3"
SHARPV = "20031107"
-PR = "r35"
+PR = "r36"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/openzaurus-pxa-${KV}-rmk${RMKV}-pxa${PXAV}-embedix${SHARPV}"
-ALLOW_EMPTY_kernel = "1"
-
SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \
ftp://ftp.linux.org.uk/pub/armlinux/source/kernel-patches/v2.4/patch-${KV}-rmk${RMKV}.gz;patch=1 \
ftp://source.mvista.com/pub/xscale/pxa/diff-${KV}-rmk${RMKV}-pxa${PXAV}.gz;patch=1 \
@@ -77,6 +75,7 @@ CMDLINE = "${CMDLINE_MTDPARTS} ${CMDLINE_ROOT} ${CMDLINE_CONSOLE} ${CMDLINE_INIT
#
# Compensate for sucky bootloader on all Sharp Zaurus models
#
+ALLOW_EMPTY = "1"
FILES_kernel-image = ""
EXTRA_OEMAKE = " EMBEDIXRELEASE=-${DISTRO_VERSION}"