summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/distro/angstrom-2007.1.conf2
-rw-r--r--conf/distro/include/angstrom-2007-preferred-versions.inc2
-rw-r--r--packages/curl/curl_7.16.4.bb1
-rw-r--r--packages/linux/linux-2.6.23/mpc8313e-rdb/defconfig4
-rw-r--r--packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch138
-rw-r--r--packages/linux/linux-2.6.23/mpc8323e-rdb/defconfig4
-rw-r--r--packages/linux/linux-linkstationarm_2.6.12.bb1
-rw-r--r--packages/linux/linux-linkstationppc_2.6.21-rc5.bb2
-rw-r--r--packages/linux/linux_2.6.23.bb2
-rw-r--r--packages/tasks/task-base.bb2
-rw-r--r--packages/uboot/u-boot-utils-native_1.2.0.bb3
-rw-r--r--packages/uboot/u-boot-utils_1.2.0.bb7
-rw-r--r--packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver2
-rw-r--r--packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb2
14 files changed, 107 insertions, 65 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 954f4b5e9c..a03cebf1ab 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -7,7 +7,7 @@
#@--------------------------------------------------------------------
# The release will the 2007.12
-DISTRO_VERSION = "2007.11RC1"
+DISTRO_VERSION = "2007.11RC1.1"
DISTRO_REVISION = "48"
require conf/distro/include/sane-srcdates.inc
diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc
index ddd9b61791..1b6ed46ac7 100644
--- a/conf/distro/include/angstrom-2007-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2007-preferred-versions.inc
@@ -1891,7 +1891,7 @@ PREFERRED_VERSION_u-boot-omap2430sdp ?= "1.1.4"
PREFERRED_VERSION_u2nl ?= "1.3"
PREFERRED_VERSION_uae4all ?= "0.7.1"
PREFERRED_VERSION_ubahnnav ?= "0.4.1"
-PREFERRED_VERSION_u-boot-utils-native ?= "1.2.0"
+PREFERRED_VERSION_u-boot-utils ?= "1.2.0"
PREFERRED_VERSION_udev ?= "092"
PREFERRED_VERSION_udev-hostap-cs-vcc-workaround ?= "1.0"
PREFERRED_VERSION_udhcp ?= "0.9.8"
diff --git a/packages/curl/curl_7.16.4.bb b/packages/curl/curl_7.16.4.bb
index ce6175b419..0053a12fdb 100644
--- a/packages/curl/curl_7.16.4.bb
+++ b/packages/curl/curl_7.16.4.bb
@@ -12,6 +12,7 @@ inherit autotools pkgconfig binconfig
EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
--with-gnutls=${STAGING_BINDIR_CROSS}/ \
--without-ssl \
+ --without-libssh2 \
--with-random=/dev/urandom \
--without-libidn \
--enable-crypto-auth \
diff --git a/packages/linux/linux-2.6.23/mpc8313e-rdb/defconfig b/packages/linux/linux-2.6.23/mpc8313e-rdb/defconfig
index 2cd1cb3b1a..be9a93bc54 100644
--- a/packages/linux/linux-2.6.23/mpc8313e-rdb/defconfig
+++ b/packages/linux/linux-2.6.23/mpc8313e-rdb/defconfig
@@ -1454,12 +1454,12 @@ CONFIG_MMC_BLOCK_BOUNCE=y
# CONFIG_MMC_WBSD is not set
# CONFIG_MMC_TIFM_SD is not set
CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=m
+CONFIG_LEDS_CLASS=y
#
# LED drivers
#
-CONFIG_LEDS_MPC8313E_RDB=m
+CONFIG_LEDS_MPC8313E_RDB=y
#
# LED Triggers
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 56176c1095..be322be927 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,6 +1,6 @@
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-12-03 11:08:06.000000000 +0100
++++ linux-2.6.23/drivers/leds/Kconfig 2007-12-14 15:32:37.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.
@@ -16,8 +16,8 @@ diff -urN linux-2.6.23.orig/drivers/leds/Kconfig linux-2.6.23/drivers/leds/Kconf
config LEDS_TRIGGERS
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-12-03 11:08:36.000000000 +0100
-@@ -0,0 +1,127 @@
++++ linux-2.6.23/drivers/leds/leds-mpc8313e-rdb.c 2007-12-14 15:32:55.000000000 +0100
+@@ -0,0 +1,171 @@
+/*
+ * drivers/leds/leds-mpc8313e-rdb.c
+ * Copyright (C) 2007 Leon Woestenberg <leon@sidebranch.com>
@@ -41,73 +41,115 @@ diff -urN linux-2.6.23.orig/drivers/leds/leds-mpc8313e-rdb.c linux-2.6.23/driver
+#define LEDS_BASE 0xfa000000
+#define LEDS_SIZE 0x2
+
-+static struct platform_dev *leds_pdev = NULL;
++static struct platform_device *leds_pdev = NULL;
+static struct resource *led_mem = NULL;
+static void *led_io = NULL;
-+static u8 led_state = 0;
++static u8 led_state = 0xff;
+
-+static void mpc8313leds_green_set(struct led_classdev *led_cdev, enum led_brightness value)
-+{
-+ led_state = value ? led_state&~32 : led_state|32;
-+ iowrite8(led_state, led_io);
-+}
-+
-+static struct led_classdev mpc8313_green_led = {
-+ .name = "mpc8313:green",
-+ .brightness_set = mpc8313leds_green_set,
++struct mpc8313_led {
++ struct led_classdev cdev;
++ u8 bitmask;
+};
+
-+static void mpc8313leds_yellow_set(struct led_classdev *led_cdev, enum led_brightness value)
++static void mpc8313leds_set(struct led_classdev *led_cdev, enum led_brightness value)
+{
-+ led_state = value ? led_state&~64 : led_state|64;
++ 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);
+}
+
-+static struct led_classdev mpc8313_yellow_led = {
-+ .name = "mpc8313:yellow",
-+ .brightness_set = mpc8313leds_yellow_set,
-+};
-+
-+static void mpc8313leds_red_set(struct led_classdev *led_cdev, enum led_brightness value)
-+{
-+ led_state = value ? led_state&~128 : led_state|128;
-+ iowrite8(led_state, led_io);
-+}
-+
-+static struct led_classdev mpc8313_red_led = {
-+ .name = "mpc8313:red",
-+ .brightness_set = mpc8313leds_red_set,
++static struct mpc8313_led mpc8313_leds[] = {
++ {
++ .cdev = {
++ .name = "mpc8313:led0",
++ .brightness_set = mpc8313leds_set,
++ },
++ .bitmask = 1,
++ },
++ {
++ .cdev = {
++ .name = "mpc8313:led1",
++ .brightness_set = mpc8313leds_set,
++ },
++ .bitmask = 2,
++ },
++ {
++ .cdev = {
++ .name = "mpc8313:led2",
++ .brightness_set = mpc8313leds_set,
++ },
++ .bitmask = 4,
++ },
++ {
++ .cdev = {
++ .name = "mpc8313:led3",
++ .brightness_set = mpc8313leds_set,
++ },
++ .bitmask = 8,
++ },
++ {
++ .cdev = {
++ .name = "mpc8313:led4",
++ .brightness_set = mpc8313leds_set,
++ },
++ .bitmask = 16,
++ },
++ {
++ .cdev = {
++ .name = "mpc8313:green",
++ .brightness_set = mpc8313leds_set,
++ },
++ .bitmask = 32,
++ },
++ {
++ .cdev = {
++ .name = "mpc8313:yellow",
++ .brightness_set = mpc8313leds_set,
++ },
++ .bitmask = 64,
++ },
++ {
++ .cdev = {
++ .name = "mpc8313:red",
++ .brightness_set = mpc8313leds_set,
++ },
++ .bitmask = 128,
++ },
+};
+
+static int mpc8313leds_probe(struct platform_device *pdev)
+{
++ int i;
+ int ret;
-+
-+ ret = led_classdev_register(&pdev->dev, &mpc8313_green_led);
-+ if (ret < 0)
-+ return ret;
-+
-+ ret = led_classdev_register(&pdev->dev, &mpc8313_yellow_led);
-+ if (ret < 0)
-+ return ret;
-+
-+ ret = led_classdev_register(&pdev->dev, &mpc8313_red_led);
-+ if (ret < 0)
-+ return 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)
+{
-+ led_classdev_unregister(&mpc8313_green_led);
-+ led_classdev_unregister(&mpc8313_yellow_led);
-+ led_classdev_unregister(&mpc8313_red_led);
++ 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 = {
++ .driver = {
+ .name = "mpc8313-leds",
+ .owner = THIS_MODULE,
+ },
@@ -125,6 +167,8 @@ diff -urN linux-2.6.23.orig/drivers/leds/leds-mpc8313e-rdb.c linux-2.6.23/driver
+ 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);
@@ -147,7 +191,7 @@ diff -urN linux-2.6.23.orig/drivers/leds/leds-mpc8313e-rdb.c linux-2.6.23/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-12-03 11:08:06.000000000 +0100
++++ linux-2.6.23/drivers/leds/Makefile 2007-12-14 15:32:37.000000000 +0100
@@ -17,6 +17,7 @@
obj-$(CONFIG_LEDS_H1940) += leds-h1940.o
obj-$(CONFIG_LEDS_COBALT) += leds-cobalt.o
diff --git a/packages/linux/linux-2.6.23/mpc8323e-rdb/defconfig b/packages/linux/linux-2.6.23/mpc8323e-rdb/defconfig
index f1990e62cc..c4a0e6c8cf 100644
--- a/packages/linux/linux-2.6.23/mpc8323e-rdb/defconfig
+++ b/packages/linux/linux-2.6.23/mpc8323e-rdb/defconfig
@@ -1413,12 +1413,12 @@ CONFIG_MMC_BLOCK_BOUNCE=y
# CONFIG_MMC_WBSD is not set
# CONFIG_MMC_TIFM_SD is not set
CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=m
+CONFIG_LEDS_CLASS=y
#
# LED drivers
#
-CONFIG_LEDS_MPC832X=m
+CONFIG_LEDS_MPC832X=y
#
# LED Triggers
diff --git a/packages/linux/linux-linkstationarm_2.6.12.bb b/packages/linux/linux-linkstationarm_2.6.12.bb
index 77703ad999..704309162c 100644
--- a/packages/linux/linux-linkstationarm_2.6.12.bb
+++ b/packages/linux/linux-linkstationarm_2.6.12.bb
@@ -1,6 +1,7 @@
DESCRIPTION = "Linux Kernel for ARM based Buffalo Linkstations"
SECTION = "kernel"
LICENSE = "GPL"
+DEPENDS += "u-boot-utils-native"
PR = "r2"
COMPATIBLE_MACHINE = "lsarm"
diff --git a/packages/linux/linux-linkstationppc_2.6.21-rc5.bb b/packages/linux/linux-linkstationppc_2.6.21-rc5.bb
index 7a6efb0059..6bcc0d9a06 100644
--- a/packages/linux/linux-linkstationppc_2.6.21-rc5.bb
+++ b/packages/linux/linux-linkstationppc_2.6.21-rc5.bb
@@ -3,7 +3,7 @@ SECTION = "kernel"
LICENSE = "GPL"
PR = "r0"
-DEPENDS = "dtc-native"
+DEPENDS = "dtc-native u-boot-utils-native"
COMPATIBLE_MACHINE = "(lsppchd|lsppchg)"
SRC_URI = "http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2 \
diff --git a/packages/linux/linux_2.6.23.bb b/packages/linux/linux_2.6.23.bb
index 6a4d8ceac2..a35799b75a 100644
--- a/packages/linux/linux_2.6.23.bb
+++ b/packages/linux/linux_2.6.23.bb
@@ -9,7 +9,7 @@ DEFAULT_PREFERENCE_mpc8323e-rdb = "1"
DEPENDS_append_mpc8313e-rdb = " dtc-native"
DEPENDS_append_mpc8323e-rdb = " dtc-native"
-PR = "r7"
+PR = "r8"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \
file://binutils-buildid-arm.patch;patch=1 \
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index dc071f16ce..def6bec2bc 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -295,7 +295,7 @@ RRECOMMENDS_task-base-usbhost = "\
kernel-module-usb-storage "
RDEPENDS_task-base-uboot = "\
- u-boot-utils-native"
+ u-boot"
RDEPENDS_task-base-redboot = "\
fis"
diff --git a/packages/uboot/u-boot-utils-native_1.2.0.bb b/packages/uboot/u-boot-utils-native_1.2.0.bb
index 02f9748ae3..b04b366ffe 100644
--- a/packages/uboot/u-boot-utils-native_1.2.0.bb
+++ b/packages/uboot/u-boot-utils-native_1.2.0.bb
@@ -22,7 +22,6 @@ do_compile () {
# install mkimage for the kernel makefile
do_stage() {
- install -d ${STAGING_BINDIR_NATIVE}
- install -m 755 ${S}/tools/mkimage ${STAGING_BINDIR_NATIVE}/
+ install -m 0755 tools/mkimage ${STAGING_BINDIR_NATIVE}/
}
diff --git a/packages/uboot/u-boot-utils_1.2.0.bb b/packages/uboot/u-boot-utils_1.2.0.bb
index e86fc60311..1734b41a0e 100644
--- a/packages/uboot/u-boot-utils_1.2.0.bb
+++ b/packages/uboot/u-boot-utils_1.2.0.bb
@@ -2,11 +2,10 @@ DESCRIPTION = "U-boot bootloader OS env. access tools"
SECTION = "bootloaders"
PRIORITY = "optional"
LICENSE = "GPL"
-DEPENDS_openprotium = "mtd-utils"
+DEPENDS = "mtd-utils"
PR = "r7"
-SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2"
-SRC_URI_append_openprotium = " \
+SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \
file://fw_env.c.patch;patch=1 \
file://tools-Makefile.patch;patch=1 \
file://env-Makefile.patch;patch=1 \
@@ -16,8 +15,6 @@ S = "${WORKDIR}/u-boot-${PV}"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/u-boot-${PV}"
-EXTRA_OEMAKE_openprotium = "CROSS_COMPILE=${TARGET_PREFIX}"
-
do_configure() {
:
}
diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver b/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver
index 99a4138473..d99921ca5d 100644
--- a/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver
+++ b/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver
@@ -118,4 +118,4 @@ fi
DISPLAY=':0'
-exec xinit /etc/X11/Xsession -- $XSERVER $DISPLAY $ARGS $*
+exec xinit /etc/X11/Xsession -- $XSERVER $DISPLAY $ARGS $* >/tmp/x.log 2>&1
diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb b/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
index db50c6c1c4..1d07f75203 100644
--- a/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
+++ b/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts"
LICENSE = "GPL"
SECTION = "x11"
RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit"
-PR = "r24"
+PR = "r25"
SRC_URI = "\
file://Xdefaults \
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 01:26:40 +0000