[oe-commits] org.oe.dev merge of '59cc00aa5181acfcee64ce8cec61034622bd74a4'
dyoung commit
openembedded-commits at lists.openembedded.org
Fri Feb 29 05:43:24 UTC 2008
merge of '59cc00aa5181acfcee64ce8cec61034622bd74a4'
and 'd11d5824c76b0b1aa853d8c90b90b0eeaa632eeb'
Author: dyoung at nslu2-linux.org
Branch: org.openembedded.dev
Revision: e1563879f370dd02713e036ee932bb571cce4bc4
ViewMTN: http://monotone.openembedded.org/revision/info/e1563879f370dd02713e036ee932bb571cce4bc4
Files:
1
packages/gcc/gcc-cross_4.2.2.bb
packages/linux/linux-handhelds-2.6.inc
packages/udev/udev-118/init
packages/udev/udev_118.bb
packages/linux/linux-rt-2.6.24/mpc8313e-rdb/mpc8313e-rdb-leds.patch
packages/linux/linux-rt-2.6.24/sysctl_missing_include.patch
packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-leds.patch
packages/linux/linux-rt-2.6.24/mpc8313e-rdb/defconfig
packages/linux/linux-rt_2.6.24.bb
Diffs:
#
# mt diff -r59cc00aa5181acfcee64ce8cec61034622bd74a4 -re1563879f370dd02713e036ee932bb571cce4bc4
#
#
#
# patch "packages/gcc/gcc-cross_4.2.2.bb"
# from [966323ee244047dc2568f0dec747e5437039225f]
# to [12e688f12323d409a909f9a932f8a7651c517ccc]
#
# patch "packages/linux/linux-handhelds-2.6.inc"
# from [b761bc283eb28d9f018764f3ca504f8e1ea6972d]
# to [b7a768d6bfd621b3a76b6f638707ea8a6dd5fec9]
#
# patch "packages/udev/udev-118/init"
# from [39af5bc8230e6a5d1a8c29b715b06fd04ea3551d]
# to [35cae94119e36270fbd2b648a4dbe351ff714d55]
#
# patch "packages/udev/udev_118.bb"
# from [ea5479f679eae83985b0d677a1317948a47e3ac4]
# to [e9281fed9bc0fc17975cbcd7076778e89ce58196]
#
============================================================
--- packages/gcc/gcc-cross_4.2.2.bb 966323ee244047dc2568f0dec747e5437039225f
+++ packages/gcc/gcc-cross_4.2.2.bb 12e688f12323d409a909f9a932f8a7651c517ccc
@@ -5,7 +5,7 @@ FILESDIR = "${@os.path.dirname(bb.data.g
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
# NOTE: split PR. If the main .oe changes something that affects its *build*
# remember to increment this one too.
-PR = "r4"
+PR = "r5"
DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
============================================================
--- packages/linux/linux-handhelds-2.6.inc b761bc283eb28d9f018764f3ca504f8e1ea6972d
+++ packages/linux/linux-handhelds-2.6.inc b7a768d6bfd621b3a76b6f638707ea8a6dd5fec9
@@ -1,9 +1,9 @@ COMPATIBLE_HOST = "arm.*-linux"
SECTION = "kernel"
DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
LICENSE = "GPL"
COMPATIBLE_HOST = "arm.*-linux"
-COMPATIBLE_MACHINE ?= '(asus620|asus730|aximx50|aximx50v|h1910|h2200|h3600|h3800|h3900|h4000|h5000|htcalpine|htcapache|htcblueangel|htchermes|htchimalaya|htcsable|htcuniversal|htcwallaby|hx4700|ghi270|looxc550|jornada56x|magician|rx1950|rx3000)'
+COMPATIBLE_MACHINE ?= "(asus620|asus730|aximx50|aximx50v|eseries|h1910|h2200|h3600|h3800|h3900|h4000|h5000|htcalpine|htcapache|htcblueangel|htchermes|htchimalaya|htcsable|htcuniversal|htcwallaby|hx4700|ghi270|looxc550|jornada56x|magician|rx1950|rx3000)"
# SRC_URI *must* be overriden in includer, but this is a good reference
SRC_URI ?= "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
============================================================
--- packages/udev/udev-118/init 39af5bc8230e6a5d1a8c29b715b06fd04ea3551d
+++ packages/udev/udev-118/init 35cae94119e36270fbd2b648a4dbe351ff714d55
@@ -30,7 +30,7 @@ mount_tmpfs() {
# directory which is guaranteed to be available.
mount -n -o bind /dev /etc/udev
- if ! mount -n -o size=$tmpfs_size,mode=0755 -t tmpfs tmpfs /dev; then
+ if ! mount -n -o size=$tmpfs_size,mode=0755 -t tmpfs udev /dev; then
umount /etc/udev
echo "udev requires tmpfs support, not started."
exit 1
@@ -55,6 +55,7 @@ make_extra_nodes() {
# I hate this hack. -- Md
make_extra_nodes() {
+ mknod -m 666 /dev/null c 1 3
if [ "$(echo /lib/udev/devices/*)" != "/lib/udev/devices/*" ]; then
cp -a /lib/udev/devices/* /dev/
fi
@@ -75,18 +76,11 @@ supported_kernel() {
supported_kernel() {
case "$(uname -r)" in
2.[012345].*|2.6.[0-9]|2.6.[0-9][!0-9]*) return 1 ;;
- 2.6.1[01]|2.6.1[01][!0-9]*) return 1 ;;
+ 2.6.1[0134]|2.6.1[01234][!0-9]*) return 1 ;;
esac
return 0
}
-set_hotplug_handler() {
- case "$(uname -r)" in
- 2.6.1[0-4]|2.6.1[0-4][!0-9]*) HANDLER='/sbin/udevsend' ;;
- esac
- echo $HANDLER > /proc/sys/kernel/hotplug
-}
-
# shell version of /usr/bin/tty
my_tty() {
[ -x /bin/readlink ] || return 0
@@ -94,24 +88,6 @@ my_tty() {
readlink --silent /proc/self/fd/0 || true
}
-warn_if_interactive() {
- if [ "$RUNLEVEL" = "S" -a "$PREVLEVEL" = "N" ]; then
- return
- fi
-
- TTY=$(my_tty)
- if [ -z "$TTY" -o "$TTY" = "/dev/console" ]; then
- return
- fi
-
- printf "\n\n\nIt has been detected that the command\n\n\t$0 $*\n\n"
- printf "has been run from an interactive shell.\n"
- printf "It will probably not do what you expect, so this script will wait\n"
- printf "60 seconds before continuing. Press ^C to stop it.\n"
- printf "RUNNING THIS COMMAND IS HIGHLY DISCOURAGED!\n\n\n\n"
- sleep 60
-}
-
##############################################################################
PATH="/sbin:/bin:/usr/bin"
@@ -120,13 +96,11 @@ tmpfs_size="2M"
# defaults
tmpfs_size="2M"
-udev_root="/dev"
-udevd_timeout=30
. /etc/udev/udev.conf
if ! supported_kernel; then
- echo "udev requires a kernel >= 2.6.12, not started."
+ echo "udev requires a kernel >= 2.6.15, not started."
exit 1
fi
@@ -145,61 +119,31 @@ fi
exit 1
fi
-if [ ! -e /proc/sys/kernel/hotplug ]; then
- echo "udev requires hotplug support, not started."
- exit 1
-fi
-
##############################################################################
# When modifying this script, do not forget that between the time that
# the new /dev has been mounted and udevsynthesize has been run there will be
# no /dev/null. This also means that you cannot use the "&" shell command.
-
case "$1" in
start)
- if [ -e "$udev_root/.udev/" ]; then
- if mountpoint -q /dev/; then
- TMPFS_MOUNTED=1
- else
- echo ".udev/ already exists on the static $udev_root!"
- fi
- else
- warn_if_interactive
- fi
+ unmount_devpts
+ mount_tmpfs
+ [ -d /proc/1 ] || mount -n /proc
- echo "Starting the hotplug events dispatcher" "udevd"
- udevd --daemon
+ # /dev/null must be created before udevd is started
+ make_extra_nodes
- set_hotplug_handler
-
- if [ -z "$TMPFS_MOUNTED" ]; then
- unmount_devpts
- mount_tmpfs
- [ -d /proc/1 ] || mount -n /proc
+ # It's all over netlink now
+ if [ -e /proc/sys/kernel/hotplug ]; then
+ echo "" > /proc/sys/kernel/hotplug
fi
- # if this directory is not present /dev will not be updated by udev
- mkdir -p /dev/.udev/ /dev/.udev/db/ /dev/.udev/queue/ /dev/.udevdb/
- # /dev/null must be created before udevd is started
- make_extra_nodes
+ echo "Starting the hotplug events dispatcher" "udevd"
+ udevd --daemon
echo "Synthesizing the initial hotplug events"
udevtrigger
-
- # wait for the udevd childs to finish
- echo "Waiting for /dev to be fully populated"
- while [ -d /dev/.udev/queue/ ]; do
- sleep 1
- udevd_timeout=$(($udevd_timeout - 1))
- if [ $udevd_timeout -eq 0 ]; then
- # ps axf
- break
- fi
- done
- if [ $udevd_timeout -eq 0 ]; then
- echo 'timeout'
- fi
+ udevsettle
;;
stop)
============================================================
--- packages/udev/udev_118.bb ea5479f679eae83985b0d677a1317948a47e3ac4
+++ packages/udev/udev_118.bb e9281fed9bc0fc17975cbcd7076778e89ce58196
@@ -1,11 +1,11 @@ RPROVIDES_${PN} = "hotplug"
DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \
/dev/, handles hotplug events and loads drivers at boot time. It replaces \
the hotplug package and requires a kernel not older than 2.6.12."
RPROVIDES_${PN} = "hotplug"
-PR = "r0"
+PR = "r2"
-DEFAULT_PREFERENCE = "-115"
+DEFAULT_PREFERENCE = "-118"
SRC_URI = "\
http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
#
# mt diff -rd11d5824c76b0b1aa853d8c90b90b0eeaa632eeb -re1563879f370dd02713e036ee932bb571cce4bc4
#
#
#
# add_file "packages/linux/linux-rt-2.6.24/mpc8313e-rdb/mpc8313e-rdb-leds.patch"
# content [2cc4266da3bf010bf63de74fc5b9e2e9b195ba4a]
#
# add_file "packages/linux/linux-rt-2.6.24/sysctl_missing_include.patch"
# content [564b0841b246892cb814b7e5c100787eb152fa4d]
#
# patch "packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-leds.patch"
# from [c65b7970a1e647bf8a77f9cc13d979ea9215072b]
# to [2cc4266da3bf010bf63de74fc5b9e2e9b195ba4a]
#
# patch "packages/linux/linux-rt-2.6.24/mpc8313e-rdb/defconfig"
# from [df975876d7fb1fb5becbbaa088d6182ad5d18091]
# to [c20dde87e637984705b242283cff68d2e21b1512]
#
# patch "packages/linux/linux-rt_2.6.24.bb"
# from [982f2f7f32de0753b206b0308ebd2667d8a6e5d4]
# to [f3cbc9b9bcdc504fa80a491cd5743b5ed799891f]
#
============================================================
--- packages/linux/linux-rt-2.6.24/mpc8313e-rdb/mpc8313e-rdb-leds.patch 2cc4266da3bf010bf63de74fc5b9e2e9b195ba4a
+++ packages/linux/linux-rt-2.6.24/mpc8313e-rdb/mpc8313e-rdb-leds.patch 2cc4266da3bf010bf63de74fc5b9e2e9b195ba4a
@@ -0,0 +1,207 @@
+Index: linux-2.6.24.3/drivers/leds/Kconfig
+===================================================================
+--- linux-2.6.24.3.orig/drivers/leds/Kconfig 2008-02-26 01:20:20.000000000 +0100
++++ linux-2.6.24.3/drivers/leds/Kconfig 2008-02-29 00:43:28.000000000 +0100
+@@ -114,6 +114,12 @@
+ help
+ This option enables support for the CM-X270 LEDs.
+
++config LEDS_MPC8313E_RDB
++ tristate "LED Support for MPC8313E-RDB LEDs"
++ depends on LEDS_CLASS && PPC_83xx
++ help
++ This option enables support for the LEDs on MPC8313E-RDB board.
++
+ comment "LED Triggers"
+
+ config LEDS_TRIGGERS
+Index: linux-2.6.24.3/drivers/leds/leds-mpc8313e-rdb.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.24.3/drivers/leds/leds-mpc8313e-rdb.c 2008-02-29 01:36:07.000000000 +0100
+@@ -0,0 +1,173 @@
++/*
++ * drivers/leds/leds-mpc8313e-rdb.c
++ * Copyright (C) 2007-2008 Jeremy Laine <jeremy.laine at bolloretelecom.eu>
++ * Copyright (C) 2007-2008 Leon Woestenberg <leon at sidebranch.com>
++ *
++ * This file is subject to the terms and conditions of the GNU General Public
++ * License. See the file COPYING in the main directory of this archive for
++ * more details.
++ *
++ * MPC8313E-RDB LEDs driver
++ *
++ */
++
++#include <linux/module.h>
++#include <linux/platform_device.h>
++#include <linux/ioport.h>
++#include <linux/leds.h>
++#include <linux/err.h>
++#include <asm/io.h>
++
++/* note the board is not wired for read access from the LED buffer */
++#define LEDS_BASE 0xfa000000
++#define LEDS_SIZE 0x2
++
++static struct platform_device *leds_pdev = NULL;
++static struct resource *led_mem = NULL;
++static void *led_io = NULL;
++static u8 led_state = 0xff;
++
++struct mpc8313_led {
++ struct led_classdev cdev;
++ u8 bitmask;
++};
++
++static void mpc8313leds_set(struct led_classdev *led_cdev, enum led_brightness value)
++{
++ struct mpc8313_led *led_dev = container_of(led_cdev, struct mpc8313_led, cdev);
++ if (value)
++ led_state &= ~led_dev->bitmask;
++ else
++ led_state |= led_dev->bitmask;
++ iowrite8(led_state, led_io);
++}
++
++/* led0 is red, led1 is yellow, led2-7 are green */
++static struct mpc8313_led mpc8313_leds[] = {
++ {
++ .cdev = {
++ .name = "mpc8313:led0",
++ .brightness_set = mpc8313leds_set,
++ },
++ .bitmask = 128,
++ },
++ {
++ .cdev = {
++ .name = "mpc8313:led1",
++ .brightness_set = mpc8313leds_set,
++ },
++ .bitmask = 64,
++ },
++ {
++ .cdev = {
++ .name = "mpc8313:led2",
++ .brightness_set = mpc8313leds_set,
++ },
++ .bitmask = 32,
++ },
++ {
++ .cdev = {
++ .name = "mpc8313:led3",
++ .brightness_set = mpc8313leds_set,
++ },
++ .bitmask = 16,
++ },
++ {
++ .cdev = {
++ .name = "mpc8313:led4",
++ .brightness_set = mpc8313leds_set,
++ },
++ .bitmask = 8,
++ },
++ {
++ .cdev = {
++ .name = "mpc8313:led5",
++ .brightness_set = mpc8313leds_set,
++ },
++ .bitmask = 4,
++ },
++ {
++ .cdev = {
++ .name = "mpc8313:led6",
++ .brightness_set = mpc8313leds_set,
++ },
++ .bitmask = 2,
++ },
++ {
++ .cdev = {
++ .name = "mpc8313:led7",
++ .brightness_set = mpc8313leds_set,
++ },
++ .bitmask = 1,
++ },
++};
++
++static int mpc8313leds_probe(struct platform_device *pdev)
++{
++ int i;
++ int ret;
++
++ for (i = ret = 0; ret >= 0 && i < ARRAY_SIZE(mpc8313_leds); i++) {
++ ret = led_classdev_register(&pdev->dev,
++ &mpc8313_leds[i].cdev);
++ }
++
++ if (ret < 0 && i > 1) {
++ for (i = i - 2; i >= 0; i--)
++ led_classdev_unregister(&mpc8313_leds[i].cdev);
++ }
++
++ return ret;
++}
++
++static int mpc8313leds_remove(struct platform_device *pdev)
++{
++ int i;
++
++ for (i = ARRAY_SIZE(mpc8313_leds) - 1; i >= 0; i--)
++ led_classdev_unregister(&mpc8313_leds[i].cdev);
++
++ return 0;
++}
++
++static struct platform_driver mpc8313leds_driver = {
++ .driver = {
++ .name = "mpc8313-leds",
++ .owner = THIS_MODULE,
++ },
++ .probe = mpc8313leds_probe,
++ .remove = mpc8313leds_remove,
++};
++
++static int __init mpc8313leds_init(void)
++{
++ if (!(led_mem = request_mem_region(LEDS_BASE, LEDS_SIZE, "mpc8313-leds")))
++ return -ENOMEM;
++ if (!(led_io = ioremap(LEDS_BASE, LEDS_SIZE)))
++ {
++ release_mem_region(LEDS_BASE, LEDS_SIZE);
++ led_mem = NULL;
++ return -ENOMEM;
++ }
++ iowrite8(led_state, led_io);
++
++ leds_pdev = platform_device_register_simple("mpc8313-leds", -1, NULL, 0);
++
++ return platform_driver_register(&mpc8313leds_driver);
++}
++
++static void __exit mpc8313leds_exit(void)
++{
++ if (led_mem) release_mem_region(LEDS_BASE, LEDS_SIZE);
++ led_mem = NULL;
++ platform_driver_unregister(&mpc8313leds_driver);
++
++ platform_device_unregister(leds_pdev);
++}
++
++module_init(mpc8313leds_init);
++module_exit(mpc8313leds_exit);
++
++MODULE_AUTHOR("Jeremy Laine <jeremy.laine at bolloretelecom.eu>");
++MODULE_DESCRIPTION("MPC8313E-RDB LED driver");
++MODULE_LICENSE("GPL");
+Index: linux-2.6.24.3/drivers/leds/Makefile
+===================================================================
+--- linux-2.6.24.3.orig/drivers/leds/Makefile 2008-02-26 01:20:20.000000000 +0100
++++ linux-2.6.24.3/drivers/leds/Makefile 2008-02-29 00:43:28.000000000 +0100
+@@ -19,6 +19,7 @@
+ obj-$(CONFIG_LEDS_COBALT_RAQ) += leds-cobalt-raq.o
+ obj-$(CONFIG_LEDS_GPIO) += leds-gpio.o
+ obj-$(CONFIG_LEDS_CM_X270) += leds-cm-x270.o
++obj-$(CONFIG_LEDS_MPC8313E_RDB) += leds-mpc8313e-rdb.o
+
+ # LED Triggers
+ obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o
============================================================
--- packages/linux/linux-rt-2.6.24/sysctl_missing_include.patch 564b0841b246892cb814b7e5c100787eb152fa4d
+++ packages/linux/linux-rt-2.6.24/sysctl_missing_include.patch 564b0841b246892cb814b7e5c100787eb152fa4d
@@ -0,0 +1,12 @@
+Index: linux-2.6.24.3/kernel/sysctl.c
+===================================================================
+--- linux-2.6.24.3.orig/kernel/sysctl.c 2008-02-29 00:52:45.000000000 +0100
++++ linux-2.6.24.3/kernel/sysctl.c 2008-02-29 00:52:59.000000000 +0100
+@@ -47,6 +47,7 @@
+ #include <linux/acpi.h>
+ #include <linux/reboot.h>
+ #include <linux/ftrace.h>
++#include <linux/profile.h>
+
+ #include <asm/uaccess.h>
+ #include <asm/processor.h>
============================================================
--- packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-leds.patch c65b7970a1e647bf8a77f9cc13d979ea9215072b
+++ packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-leds.patch 2cc4266da3bf010bf63de74fc5b9e2e9b195ba4a
@@ -1,6 +1,7 @@
-diff -urN linux-2.6.24.orig/drivers/leds/Kconfig linux-2.6.24/drivers/leds/Kconfig
---- linux-2.6.24.orig/drivers/leds/Kconfig 2008-01-24 23:58:37.000000000 +0100
-+++ linux-2.6.24/drivers/leds/Kconfig 2008-02-08 08:12:01.000000000 +0100
+Index: linux-2.6.24.3/drivers/leds/Kconfig
+===================================================================
+--- linux-2.6.24.3.orig/drivers/leds/Kconfig 2008-02-26 01:20:20.000000000 +0100
++++ linux-2.6.24.3/drivers/leds/Kconfig 2008-02-29 00:43:28.000000000 +0100
@@ -114,6 +114,12 @@
help
This option enables support for the CM-X270 LEDs.
@@ -14,14 +15,15 @@ diff -urN linux-2.6.24.orig/drivers/leds
comment "LED Triggers"
config LEDS_TRIGGERS
-diff -urN linux-2.6.24.orig/drivers/leds/leds-mpc8313e-rdb.c linux-2.6.24/drivers/leds/leds-mpc8313e-rdb.c
---- linux-2.6.24.orig/drivers/leds/leds-mpc8313e-rdb.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.24/drivers/leds/leds-mpc8313e-rdb.c 2008-02-08 08:12:01.000000000 +0100
-@@ -0,0 +1,171 @@
+Index: linux-2.6.24.3/drivers/leds/leds-mpc8313e-rdb.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.24.3/drivers/leds/leds-mpc8313e-rdb.c 2008-02-29 01:36:07.000000000 +0100
+@@ -0,0 +1,173 @@
+/*
+ * drivers/leds/leds-mpc8313e-rdb.c
-+ * Copyright (C) 2007 Jeremy Laine <jeremy.laine at bolloretelecom.eu>
-+ * Copyright (C) 2007 Leon Woestenberg <leon at sidebranch.com>
++ * Copyright (C) 2007-2008 Jeremy Laine <jeremy.laine at bolloretelecom.eu>
++ * Copyright (C) 2007-2008 Leon Woestenberg <leon at sidebranch.com>
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file COPYING in the main directory of this archive for
@@ -38,6 +40,7 @@ diff -urN linux-2.6.24.orig/drivers/leds
+#include <linux/err.h>
+#include <asm/io.h>
+
++/* note the board is not wired for read access from the LED buffer */
+#define LEDS_BASE 0xfa000000
+#define LEDS_SIZE 0x2
+
@@ -61,62 +64,63 @@ diff -urN linux-2.6.24.orig/drivers/leds
+ iowrite8(led_state, led_io);
+}
+
++/* led0 is red, led1 is yellow, led2-7 are green */
+static struct mpc8313_led mpc8313_leds[] = {
+ {
+ .cdev = {
+ .name = "mpc8313:led0",
+ .brightness_set = mpc8313leds_set,
+ },
-+ .bitmask = 1,
++ .bitmask = 128,
+ },
+ {
+ .cdev = {
+ .name = "mpc8313:led1",
+ .brightness_set = mpc8313leds_set,
+ },
-+ .bitmask = 2,
++ .bitmask = 64,
+ },
+ {
+ .cdev = {
+ .name = "mpc8313:led2",
+ .brightness_set = mpc8313leds_set,
+ },
-+ .bitmask = 4,
++ .bitmask = 32,
+ },
+ {
+ .cdev = {
+ .name = "mpc8313:led3",
+ .brightness_set = mpc8313leds_set,
+ },
-+ .bitmask = 8,
++ .bitmask = 16,
+ },
+ {
+ .cdev = {
+ .name = "mpc8313:led4",
+ .brightness_set = mpc8313leds_set,
+ },
-+ .bitmask = 16,
++ .bitmask = 8,
+ },
+ {
+ .cdev = {
+ .name = "mpc8313:led5",
+ .brightness_set = mpc8313leds_set,
+ },
-+ .bitmask = 32,
++ .bitmask = 4,
+ },
+ {
+ .cdev = {
+ .name = "mpc8313:led6",
+ .brightness_set = mpc8313leds_set,
+ },
-+ .bitmask = 64,
++ .bitmask = 2,
+ },
+ {
+ .cdev = {
+ .name = "mpc8313:led7",
+ .brightness_set = mpc8313leds_set,
+ },
-+ .bitmask = 128,
++ .bitmask = 1,
+ },
+};
+
@@ -189,9 +193,10 @@ diff -urN linux-2.6.24.orig/drivers/leds
+MODULE_AUTHOR("Jeremy Laine <jeremy.laine at bolloretelecom.eu>");
+MODULE_DESCRIPTION("MPC8313E-RDB LED driver");
+MODULE_LICENSE("GPL");
-diff -urN linux-2.6.24.orig/drivers/leds/Makefile linux-2.6.24/drivers/leds/Makefile
---- linux-2.6.24.orig/drivers/leds/Makefile 2008-01-24 23:58:37.000000000 +0100
-+++ linux-2.6.24/drivers/leds/Makefile 2008-02-08 08:12:38.000000000 +0100
+Index: linux-2.6.24.3/drivers/leds/Makefile
+===================================================================
+--- linux-2.6.24.3.orig/drivers/leds/Makefile 2008-02-26 01:20:20.000000000 +0100
++++ linux-2.6.24.3/drivers/leds/Makefile 2008-02-29 00:43:28.000000000 +0100
@@ -19,6 +19,7 @@
obj-$(CONFIG_LEDS_COBALT_RAQ) += leds-cobalt-raq.o
obj-$(CONFIG_LEDS_GPIO) += leds-gpio.o
============================================================
--- packages/linux/linux-rt-2.6.24/mpc8313e-rdb/defconfig df975876d7fb1fb5becbbaa088d6182ad5d18091
+++ packages/linux/linux-rt-2.6.24/mpc8313e-rdb/defconfig c20dde87e637984705b242283cff68d2e21b1512
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.24-rt1
-# Fri Feb 15 20:51:04 2008
+# Linux kernel version: 2.6.24.3-rt3
+# Fri Feb 29 00:48:47 2008
#
# CONFIG_PPC64 is not set
@@ -73,8 +73,6 @@ CONFIG_LOG_BUF_SHIFT=14
CONFIG_LOG_BUF_SHIFT=14
# CONFIG_CGROUPS is not set
# CONFIG_FAIR_GROUP_SCHED is not set
-# CONFIG_FAIR_USER_SCHED is not set
-# CONFIG_FAIR_CGROUP_SCHED is not set
# CONFIG_SYSFS_DEPRECATED is not set
# CONFIG_RELAY is not set
CONFIG_BLK_DEV_INITRD=y
@@ -594,9 +592,6 @@ CONFIG_MTD_GEN_PROBE=y
# CONFIG_MTD_JEDECPROBE is not set
CONFIG_MTD_GEN_PROBE=y
# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-# CONFIG_MTD_CFI_NOSWAP is not set
-# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
-# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
CONFIG_MTD_MAP_BANK_WIDTH_1=y
CONFIG_MTD_MAP_BANK_WIDTH_2=y
CONFIG_MTD_MAP_BANK_WIDTH_4=y
@@ -1349,11 +1344,12 @@ CONFIG_NEW_LEDS=y
# CONFIG_MMC_TIFM_SD is not set
# CONFIG_MMC_SPI is not set
CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_CLASS=m
#
# LED drivers
#
+CONFIG_LEDS_MPC8313E_RDB=m
#
# LED Triggers
@@ -1645,11 +1641,6 @@ CONFIG_TIMER_STATS=y
# CONFIG_DEBUG_SPINLOCK is not set
# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_EVENT_TRACE is not set
-# CONFIG_FUNCTION_TRACE is not set
-# CONFIG_WAKEUP_TIMING is not set
-# CONFIG_CRITICAL_PREEMPT_TIMING is not set
-# CONFIG_CRITICAL_IRQSOFF_TIMING is not set
# CONFIG_DEBUG_KOBJECT is not set
CONFIG_DEBUG_BUGVERBOSE=y
# CONFIG_DEBUG_INFO is not set
@@ -1660,7 +1651,12 @@ CONFIG_DEBUG_BUGVERBOSE=y
# CONFIG_BOOT_PRINTK_DELAY is not set
# CONFIG_RCU_TORTURE_TEST is not set
# CONFIG_FAULT_INJECTION is not set
-CONFIG_HAVE_MCOUNT=y
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_PREEMPT_TRACER is not set
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_EVENT_TRACER is not set
+# CONFIG_CONTEXT_SWITCH_TRACER is not set
+# CONFIG_PREEMPT_TRACE is not set
# CONFIG_SAMPLES is not set
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
# CONFIG_DEBUG_STACKOVERFLOW is not set
============================================================
--- packages/linux/linux-rt_2.6.24.bb 982f2f7f32de0753b206b0308ebd2667d8a6e5d4
+++ packages/linux/linux-rt_2.6.24.bb f3cbc9b9bcdc504fa80a491cd5743b5ed799891f
@@ -6,18 +6,19 @@ DEPENDS_append_mpc8313e-rdb = " dtc-nati
DEPENDS_append_mpc8313e-rdb = " dtc-native"
-PR = "r2"
+PR = "r3"
-SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \
- ${KERNELORG_MIRROR}/pub/linux/kernel/projects/rt/patch-2.6.24-rt1.bz2;patch=1 \
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.3.tar.bz2 \
+ ${KERNELORG_MIRROR}/pub/linux/kernel/projects/rt/patch-2.6.24.3-rt3.bz2;patch=1;p=1 \
http://kamikaze.waninkoko.info/patches/2.6.24/kamikaze1/broken-out/squashfs-lzma-2.6.24.patch;patch=1 \
+ file://sysctl_missing_include.patch;patch=1 \
file://powerpc-clockres.patch;patch=1 \
file://defconfig"
-S = "${WORKDIR}/linux-2.6.24"
+S = "${WORKDIR}/linux-2.6.24.3"
-#SRC_URI_append_mpc8313e-rdb = "\
-# file://mpc8313e-rdb-leds.patch;patch=1"
+SRC_URI_append_mpc8313e-rdb = "\
+ file://mpc8313e-rdb-leds.patch;patch=1"
# file://mpc831x-nand.patch;patch=1 \
# file://mpc8313e-rdb-rtc.patch;patch=1 "
More information about the Openembedded-commits
mailing list