diff options
Diffstat (limited to 'packages')
4 files changed, 51 insertions, 18 deletions
diff --git a/packages/linux/handhelds-sa-2.6_cvs.bb b/packages/linux/handhelds-sa-2.6_cvs.bb index 6a867b9154..0afe2d8474 100644 --- a/packages/linux/handhelds-sa-2.6_cvs.bb +++ b/packages/linux/handhelds-sa-2.6_cvs.bb @@ -3,22 +3,20 @@ DESCRIPTION = "handhelds.org Linux kernel for StrongArm processor based devices. MAINTAINER = "Alex Lange <chicken@handhelds.org>" LICENSE = "GPL" # -KERNEL_CCSUFFIX = "-3.3.4" COMPATIBLE_HOST = "arm.*-linux" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-sa-${PV}" -SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26 \ - file://defconfig-${MACHINE}" +SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26" S = "${WORKDIR}/kernel26" inherit kernel # -PACKAGE_ARCH = "ipaqsa" +PAKCAGE_ARCH = "ipaqsa" PACKAGE_ARCH_jornada56x = "jornada56x" do_configure() { - install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available." + install -m 0644 ${S}/arch/arm/configs/${MACHINE}_defconfig ${S}/.config || die "No default configuration for ${MACHINE} available." (echo N; echo m; echo N) | oe_runmake oldconfig } diff --git a/packages/linux/openzaurus-2.6.11-rc1/add-elpp-stuff.patch b/packages/linux/openzaurus-2.6.11-rc1/add-elpp-stuff.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/openzaurus-2.6.11-rc1/add-elpp-stuff.patch diff --git a/packages/linux/openzaurus-2.6.11-rc1/add-oz-release-string.patch b/packages/linux/openzaurus-2.6.11-rc1/add-oz-release-string.patch index e69de29bb2..22a6fd3943 100644 --- a/packages/linux/openzaurus-2.6.11-rc1/add-oz-release-string.patch +++ b/packages/linux/openzaurus-2.6.11-rc1/add-oz-release-string.patch @@ -0,0 +1,24 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- linux-2.6.11-rc1/init/version.c~add-oz-release-string ++++ linux-2.6.11-rc1/init/version.c +@@ -29,5 +29,5 @@ + EXPORT_SYMBOL(system_utsname); + + const char linux_banner[] = +- "Linux version " UTS_RELEASE " (" LINUX_COMPILE_BY "@" ++ "Linux version " UTS_RELEASE OPENZAURUS_RELEASE " (" LINUX_COMPILE_BY "@" + LINUX_COMPILE_HOST ") (" LINUX_COMPILER ") " UTS_VERSION "\n"; +--- linux-2.6.11-rc1/Makefile~add-oz-release-string ++++ linux-2.6.11-rc1/Makefile +@@ -827,6 +827,7 @@ + exit 1; \ + fi; \ + (echo \#define UTS_RELEASE \"$(KERNELRELEASE)\"; \ ++ echo \#define OPENZAURUS_RELEASE \"$(OPENZAURUS_RELEASE)\"; \ + echo \#define LINUX_VERSION_CODE `expr $(VERSION) \\* 65536 + $(PATCHLEVEL) \\* 256 + $(SUBLEVEL)`; \ + echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))'; \ + ) diff --git a/packages/linux/openzaurus_2.6.11-rc1.bb b/packages/linux/openzaurus_2.6.11-rc1.bb index 967d46e48e..bfc23c47ab 100644 --- a/packages/linux/openzaurus_2.6.11-rc1.bb +++ b/packages/linux/openzaurus_2.6.11-rc1.bb @@ -4,7 +4,7 @@ MAINTAINER = "Richard Purdie <rpurdie@rpsys.net>, Michael 'Mickey' Lauer <mickey LICENSE = "GPL" #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}" KV = "${@bb.data.getVar('PV',d,True)}" -PR = "r1" +PR = "r2" # ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/linux-${KV}.tar.gz \ # http://www.cs.wisc.edu/~lenz/zaurus/ @@ -16,6 +16,7 @@ PR = "r1" SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/linux-${KV}.tar.gz \ file://add-oz-release-string.patch;patch=1 \ + file://add-elpp-stuff.patch \ http://www.rpsys.net/openzaurus/${KV}/jl1/pxa-linking-bug.patch;patch=1 \ http://www.rpsys.net/openzaurus/${KV}/jl1/pxa-cpu.patch;patch=1 \ http://www.rpsys.net/openzaurus/${KV}/jl1/locomo_pm.patch;patch=1 \ @@ -51,10 +52,13 @@ file://defconfig-collie \ file://defconfig-poodle \ file://defconfig-openzaurus-pxa-2.6 " -SRC_URI_append_husky = "http://www.rpsys.net/openzaurus/${KV}/corgi_keymap-r1.patch;patch=1" -SRC_URI_append_openzaurus-pxa-2.6 = "http://www.rpsys.net/openzaurus/${KV}/corgi_keymap-r1.patch;patch=1" -SRC_URI_append_collie = "http://www.rpsys.net/openzaurus/${KV}/jl1/collie_keymap.patch;patch=1" +SRC_URI_append_husky = "http://www.rpsys.net/openzaurus/${KV}/corgi_keymap-r1.patch;patch=1 " +SRC_URI_append_openzaurus-pxa-2.6 = "http://www.rpsys.net/openzaurus/${KV}/corgi_keymap-r1.patch;patch=1 " +SRC_URI_append_collie = "http://www.rpsys.net/openzaurus/${KV}/jl1/collie_keymap.patch;patch=1 " +# Uncomment this to apply the Enhanced Linux Progress Patch. +# You also need to say VERBOSE=progress in /etc/default/rcS make it work +#APPLY_ELPP = "yes" S = "${WORKDIR}/linux-${KV}" @@ -70,16 +74,14 @@ EXTRA_OEMAKE = "OPENZAURUS_RELEASE=-${DISTRO_VERSION}" COMPATIBLE_HOST = "arm.*-linux" # -# Create the kernel command line. +# Create the kernel command line (deprecated) # #CMDLINE_MTDPARTS_poodle = "mtdparts=sharpsl-nand:7168k@0k(smf),22528k@7168k(root),-(home)" #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_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_MEM_husky = "mem=64M" - CMDLINE_CON = "console=ttyS0,115200n8 console=tty0 noinitrd" CMDLINE_ROOT = "root=/dev/mtdblock2 rootfstype=jffs2 " @@ -91,11 +93,10 @@ CMDLINE_MEM_collie = "mem=${mem}M" CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_MTDPARTS} ${CMDLINE_MEM}" do_configure() { - - install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available." + install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available." - if [ "${MACHINE}" == "collie" ] - then + if [ "${MACHINE}" == "collie" ] + then mempos=`echo "obase=16; $mem * 1024 * 1024" | bc` rdsize=`echo "$rd * 1024" | bc` total=`expr $mem + $rd` @@ -111,9 +112,19 @@ do_configure() { echo "CONFIG_MTDRAM_ERASE_SIZE=1" >> ${S}/.config echo "CONFIG_MTDRAM_ABS_POS=$addr" >> ${S}/.config fi - fi + echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config + + if [ "${APPLY_ELPP}" == "yes" ] + then + patcher -i -R ${FILESDIR}/add-elpp-stuff.patch + echo "# Enhanced Linux Progress Patch" >> ${S}/.config + echo "CONFIG_FB_ELPP=y" >> ${S}/.config + echo "CONFIG_LOGO=y" >> ${S}/.config + echo "CONFIG_LOGO_LINUX_CLUT224=y" >> ${S}/.config + fi + yes '' | oe_runmake oldconfig } |