From 5c0de96fc41ea8a72d56e5489a2dc0bd11429ab3 Mon Sep 17 00:00:00 2001 From: Jeremy Laine Date: Thu, 29 Nov 2007 08:16:33 +0000 Subject: linux-2.6.23: fix mpc8313e-rdb LEDs patch (didn't apply cleanly) --- .../mpc8313e-rdb/mpc8313e-rdb-leds.patch | 23 ++++++++++------------ 1 file changed, 10 insertions(+), 13 deletions(-) (limited to 'packages/linux') diff --git a/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch b/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch index 7eadfc61fe..d8a477af2a 100644 --- a/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch +++ b/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch @@ -1,7 +1,6 @@ -Index: linux-2.6.23/drivers/leds/Kconfig -=================================================================== +diff -urN linux-2.6.23.orig/drivers/leds/Kconfig linux-2.6.23/drivers/leds/Kconfig --- linux-2.6.23.orig/drivers/leds/Kconfig 2007-10-09 22:31:38.000000000 +0200 -+++ linux-2.6.23/drivers/leds/Kconfig 2007-11-28 23:16:05.000000000 +0100 ++++ linux-2.6.23/drivers/leds/Kconfig 2007-11-29 09:02:42.000000000 +0100 @@ -101,6 +101,12 @@ outputs. To be useful the particular board must have LEDs and they must be connected to the GPIO lines. @@ -15,10 +14,9 @@ Index: linux-2.6.23/drivers/leds/Kconfig comment "LED Triggers" config LEDS_TRIGGERS -Index: linux-2.6.23/drivers/leds/leds-mpc8313e-rdb.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.23/drivers/leds/leds-mpc8313e-rdb.c 2007-11-29 00:45:42.000000000 +0100 +diff -urN linux-2.6.23.orig/drivers/leds/leds-mpc8313e-rdb.c linux-2.6.23/drivers/leds/leds-mpc8313e-rdb.c +--- linux-2.6.23.orig/drivers/leds/leds-mpc8313e-rdb.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.23/drivers/leds/leds-mpc8313e-rdb.c 2007-11-29 09:02:42.000000000 +0100 @@ -0,0 +1,128 @@ +/* + * drivers/leds/leds-mpc8313e-rdb.c @@ -148,15 +146,14 @@ Index: linux-2.6.23/drivers/leds/leds-mpc8313e-rdb.c +MODULE_AUTHOR("Leon Woestenberg "); +MODULE_DESCRIPTION("MPC8313E-RDB LED driver"); + -Index: linux-2.6.23/drivers/leds/Makefile -=================================================================== ---- linux-2.6.23.orig/drivers/leds/Makefile 2007-11-28 23:17:29.000000000 +0100 -+++ linux-2.6.23/drivers/leds/Makefile 2007-11-28 23:35:32.000000000 +0100 +diff -urN linux-2.6.23.orig/drivers/leds/Makefile linux-2.6.23/drivers/leds/Makefile +--- linux-2.6.23.orig/drivers/leds/Makefile 2007-10-09 22:31:38.000000000 +0200 ++++ linux-2.6.23/drivers/leds/Makefile 2007-11-29 09:03:09.000000000 +0100 @@ -17,6 +17,7 @@ obj-$(CONFIG_LEDS_H1940) += leds-h1940.o obj-$(CONFIG_LEDS_COBALT) += leds-cobalt.o obj-$(CONFIG_LEDS_GPIO) += leds-gpio.o +obj-$(CONFIG_LEDS_MPC8313E_RDB) += leds-mpc8313e-rdb.o - + # LED Triggers - obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o + obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o -- cgit v1.2.3 From 82ef14e73032b4364c7ef2b372f9868f5ceed793 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 29 Nov 2007 12:18:45 +0000 Subject: linux-openmoko_2.6.22.5.bb : CONFIG_MTD_NAND_S3C2410_CLKSTOP breaks accessing the mtd partitions from usespace so disable for now. --- packages/linux/linux-openmoko/defconfig-2.6.22.5 | 4 ++-- packages/linux/linux-openmoko_2.6.22.5.bb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'packages/linux') diff --git a/packages/linux/linux-openmoko/defconfig-2.6.22.5 b/packages/linux/linux-openmoko/defconfig-2.6.22.5 index 62a61935f6..e9e40fed38 100644 --- a/packages/linux/linux-openmoko/defconfig-2.6.22.5 +++ b/packages/linux/linux-openmoko/defconfig-2.6.22.5 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.22.5 -# Wed Nov 21 11:45:19 2007 +# Tue Nov 27 09:09:32 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -705,7 +705,7 @@ CONFIG_MTD_NAND_S3C2410=y CONFIG_MTD_NAND_S3C2410_BBT=y # CONFIG_MTD_NAND_S3C2410_DEBUG is not set CONFIG_MTD_NAND_S3C2410_HWECC=y -CONFIG_MTD_NAND_S3C2410_CLKSTOP=y +# CONFIG_MTD_NAND_S3C2410_CLKSTOP is not set # CONFIG_MTD_NAND_DISKONCHIP is not set # CONFIG_MTD_NAND_NANDSIM is not set # CONFIG_MTD_NAND_PLATFORM is not set diff --git a/packages/linux/linux-openmoko_2.6.22.5.bb b/packages/linux/linux-openmoko_2.6.22.5.bb index 1af9ed58a7..c623504c73 100644 --- a/packages/linux/linux-openmoko_2.6.22.5.bb +++ b/packages/linux/linux-openmoko_2.6.22.5.bb @@ -9,7 +9,7 @@ KERNEL_RELEASE = "2.6.22.5" #PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}-moko11+svnr${SRCREV}" PV = "${KERNEL_RELEASE}-moko11+svnr${SRCREV}" -PR = "r9" +PR = "r10" KERNEL_IMAGETYPE = "uImage" UBOOT_ENTRYPOINT = "30008000" -- cgit v1.2.3 From 86ac2421b3bb0fc7d8b38c7fa43477db1f389b14 Mon Sep 17 00:00:00 2001 From: Jeremy Laine Date: Thu, 29 Nov 2007 16:35:55 +0000 Subject: linux-2.6.23: add license for mpc8313e-rdb LEDs module, fixes module loading --- packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/linux') diff --git a/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch b/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch index d8a477af2a..0310746dfe 100644 --- a/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch +++ b/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch @@ -145,7 +145,7 @@ diff -urN linux-2.6.23.orig/drivers/leds/leds-mpc8313e-rdb.c linux-2.6.23/driver + +MODULE_AUTHOR("Leon Woestenberg "); +MODULE_DESCRIPTION("MPC8313E-RDB LED driver"); -+ ++MODULE_LICENSE("GPL"); diff -urN linux-2.6.23.orig/drivers/leds/Makefile linux-2.6.23/drivers/leds/Makefile --- linux-2.6.23.orig/drivers/leds/Makefile 2007-10-09 22:31:38.000000000 +0200 +++ linux-2.6.23/drivers/leds/Makefile 2007-11-29 09:03:09.000000000 +0100 -- cgit v1.2.3 From 67a1d946c02b02f76e70e792d4cfb1b0c5ada84e Mon Sep 17 00:00:00 2001 From: Jeremy Laine Date: Thu, 29 Nov 2007 19:08:17 +0000 Subject: linux-2.6.23: enable mpc8313e-rdb realtime clock (ds1339) --- .../mpc8313e-rdb/mpc8313e-rdb-rtc.patch | 32 ++++++++++++++++++++++ packages/linux/linux_2.6.23.bb | 3 +- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-rtc.patch (limited to 'packages/linux') diff --git a/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-rtc.patch b/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-rtc.patch new file mode 100644 index 0000000000..7c6cbcaa0b --- /dev/null +++ b/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-rtc.patch @@ -0,0 +1,32 @@ +diff -urN linux-2.6.23.orig/arch/powerpc/boot/dts/mpc8313erdb.dts linux-2.6.23/arch/powerpc/boot/dts/mpc8313erdb.dts +--- linux-2.6.23.orig/arch/powerpc/boot/dts/mpc8313erdb.dts 2007-10-09 22:31:38.000000000 +0200 ++++ linux-2.6.23/arch/powerpc/boot/dts/mpc8313erdb.dts 2007-11-29 19:32:21.000000000 +0100 +@@ -60,6 +60,12 @@ + interrupts = ; + interrupt-parent = < &ipic >; + dfsrr; ++ ++ rtc@68 { ++ device_type = "rtc"; ++ compatible = "dallas,ds1339"; ++ reg = <68>; ++ }; + }; + + i2c@3100 { +diff -urN linux-2.6.23.orig/arch/powerpc/sysdev/fsl_soc.c linux-2.6.23/arch/powerpc/sysdev/fsl_soc.c +--- linux-2.6.23.orig/arch/powerpc/sysdev/fsl_soc.c 2007-10-09 22:31:38.000000000 +0200 ++++ linux-2.6.23/arch/powerpc/sysdev/fsl_soc.c 2007-11-29 19:31:58.000000000 +0100 +@@ -319,6 +319,12 @@ + {"ricoh,rs5c372b", "rtc-rs5c372", "rs5c372b",}, + {"ricoh,rv5c386", "rtc-rs5c372", "rv5c386",}, + {"ricoh,rv5c387a", "rtc-rs5c372", "rv5c387a",}, ++ {"dallas,ds1307", "rtc-ds1307", "ds1307",}, ++ {"dallas,ds1337", "rtc-ds1307", "ds1337",}, ++ {"dallas,ds1338", "rtc-ds1307", "ds1338",}, ++ {"dallas,ds1339", "rtc-ds1307", "ds1339",}, ++ {"dallas,ds1340", "rtc-ds1307", "ds1340",}, ++ {"stm,m41t00", "rtc-ds1307", "m41t00"}, + }; + + static int __init of_find_i2c_driver(struct device_node *node, struct i2c_board_info *info) diff --git a/packages/linux/linux_2.6.23.bb b/packages/linux/linux_2.6.23.bb index 6d9a3c718d..0c242e5e2c 100644 --- a/packages/linux/linux_2.6.23.bb +++ b/packages/linux/linux_2.6.23.bb @@ -25,7 +25,8 @@ SRC_URI_append_cm-x270 = "\ SRC_URI_append_mpc8313e-rdb = "\ file://mpc831x-nand.patch;patch=1 \ - file://mpc8313e-rdb-leds.patch;patch=1" + file://mpc8313e-rdb-leds.patch;patch=1 \ + file://mpc8313e-rdb-rtc.patch;patch=1" SRC_URI_append_mpc8323e-rdb = "\ file://mpc832x-leds.patch;patch=1" -- cgit v1.2.3 From 39565118303f565d78a6b5429eafdbad99ee6351 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Fri, 30 Nov 2007 09:48:04 +0000 Subject: linux.inc : change the generation of uImage to do_compile_append so that the later stages like install/packaging/deploy can make use of this. This was done so that kernel-image could contain a uImage but is suitable for other cases as well. --- packages/linux/linux.inc | 48 ++++++++++++++++++------------------------------ 1 file changed, 18 insertions(+), 30 deletions(-) (limited to 'packages/linux') diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc index 09cf05f7d4..6fa4791150 100644 --- a/packages/linux/linux.inc +++ b/packages/linux/linux.inc @@ -74,7 +74,7 @@ do_configure_prepend() { -e '/CONFIG_CMDLINE=/d' \ -i ${S}/.config echo "CONFIG_INET=y" >> ${S}/.config - echo "CONFIG_IP_PNP=y" >> ${S}/.config + echo "CONFIG_IP_PNP=y" >> ${S}/.config echo "CONFIG_USB_GADGET=y" >> ${S}/.config echo "CONFIG_USB_GADGET_SELECTED=y" >> ${S}/.config echo "CONFIG_USB_ETH=y" >> ${S}/.config @@ -97,22 +97,24 @@ do_sizecheck() { fi } -do_install_prepend() { - if test -e arch/${ARCH}/boot/Image ; then - ln -f arch/${ARCH}/boot/Image arch/${ARCH}/boot/uImage - fi - - if test -e arch/${ARCH}/boot/images/uImage ; then - ln -f arch/${ARCH}/boot/images/uImage arch/${ARCH}/boot/uImage - fi +UBOOT_ENTRYPOINT ?= "20008000" - if test -e arch/${ARCH}/kernel/vmlinux.lds ; then - ln -f arch/${ARCH}/kernel/vmlinux.lds arch/${ARCH}/boot/vmlinux +do_compile_append() { + if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then + if test -e arch/${ARCH}/boot/compressed/vmlinux ; then + ${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin + uboot-mkimage -A ${ARCH} -O linux -T kernel -C none -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin arch/${ARCH}/boot/uImage + rm -f linux.bin + else + ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin + rm -f linux.bin.gz + gzip -9 linux.bin + uboot-mkimage -A ${ARCH} -O linux -T kernel -C gzip -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz arch/${ARCH}/boot/uImage + rm -f linux.bin.gz fi + fi } -UBOOT_ENTRYPOINT ?= "20008000" - KERNEL_IMAGE_BASE_NAME = "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}-${DATETIME}" KERNEL_IMAGE_SYMLINK_NAME = "${KERNEL_IMAGETYPE}-${MACHINE}" @@ -120,24 +122,10 @@ do_deploy() { install -d ${DEPLOY_DIR_IMAGE} install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${PR}-${MACHINE}.tgz -C ${D} lib - - if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then - if test -e arch/${ARCH}/boot/compressed/vmlinux ; then - ${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin - uboot-mkimage -A ${ARCH} -O linux -T kernel -C none -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin - rm -f linux.bin - else - ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin - rm -f linux.bin.gz - gzip -9 linux.bin - uboot-mkimage -A ${ARCH} -O linux -T kernel -C gzip -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin - rm -f linux.bin.gz - fi - fi - cd ${DEPLOY_DIR_IMAGE} - rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin - ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGE_SYMLINK_NAME}.bin + cd ${DEPLOY_DIR_IMAGE} + rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin + ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGE_SYMLINK_NAME}.bin } do_deploy[dirs] = "${S}" -- cgit v1.2.3