[oe-commits] org.oe.dev merge of '51c8bec079d3bd6ef15c2674a76e2fd007e47122'
florian commit
oe at amethyst.openembedded.net
Fri May 23 22:27:43 UTC 2008
merge of '51c8bec079d3bd6ef15c2674a76e2fd007e47122'
and 'a4c7fdea302dedfc9dc32cbc08963aabe21f38b8'
Author: florian at openembedded.org
Branch: org.openembedded.dev
Revision: f2f4b5afb4a12de427743160e41723c1a54ad1c6
ViewMTN: http://monotone.openembedded.org/revision/info/f2f4b5afb4a12de427743160e41723c1a54ad1c6
Files:
1
packages/gpe-conf/gpe-conf_0.2.7.bb
packages/gpe-login/gpe-login_0.92.bb
packages/gpe-session-scripts/gpe-session-scripts_0.68.bb
packages/gpe-todo/gpe-todo_0.57.bb
conf/machine/mpc8315e-rdb.conf
packages/agg/agg-minimal_2.5.bb
packages/failme.bb
packages/linux/linux-rp-2.6.24/pxa2xx_udc-clock.patch
conf/distro/chinook-compat.conf
packages/dsplink/dsplink_1.50.bb
packages/linux/linux-davinci/davinci-sffsdr/defconfig
packages/linux/linux-davinci/davinci-sffsdr/sffsdr.patch
packages/linux/linux-rp-2.6.24/defconfig-akita
packages/linux/linux-rp-2.6.24/defconfig-c7x0
packages/linux/linux-rp-2.6.24/defconfig-poodle
packages/linux/linux-rp-2.6.24/defconfig-spitz
packages/linux/linux-rp-2.6.24/defconfig-tosa
packages/linux/linux-rp_2.6.24.bb
packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb
Diffs:
#
# mt diff -r51c8bec079d3bd6ef15c2674a76e2fd007e47122 -rf2f4b5afb4a12de427743160e41723c1a54ad1c6
#
#
#
# add_file "packages/gpe-conf/gpe-conf_0.2.7.bb"
# content [68996b4d73e9f850d50609f764d56d76224be052]
#
# add_file "packages/gpe-login/gpe-login_0.92.bb"
# content [37a976053be7e397317ee38072b254e3fac7a435]
#
# add_file "packages/gpe-session-scripts/gpe-session-scripts_0.68.bb"
# content [a329b3ac9f1300b73646e914b5088a9d3adccee3]
#
# add_file "packages/gpe-todo/gpe-todo_0.57.bb"
# content [5f2d37e2f8cd59774274b320ecaf606505208231]
#
============================================================
--- packages/gpe-conf/gpe-conf_0.2.7.bb 68996b4d73e9f850d50609f764d56d76224be052
+++ packages/gpe-conf/gpe-conf_0.2.7.bb 68996b4d73e9f850d50609f764d56d76224be052
@@ -0,0 +1,25 @@
+DESCRIPTION = "Configuration applets for GPE"
+SECTION = "gpe"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+DEPENDS = "gtk+ esound audiofile libgpewidget libxsettings libxsettings-client libxrandr"
+RDEPENDS_${PN} = "xst gpe-confd xset ntpdate gpe-icons tzdata xrandr"
+RDEPENDS_gpe-conf-panel = "gpe-conf"
+
+RPROVIDES_${PN} += " bl"
+RCONFLICTS_${PN} = "bl"
+
+PR = "r0"
+
+GPE_TARBALL_SUFFIX = "bz2"
+
+inherit gpe autotools pkgconfig
+
+PACKAGES += "gpe-conf-panel"
+
+FILES_${PN} = "${sysconfdir} ${bindir} ${datadir}/pixmaps \
+ ${datadir}/applications/gpe-conf-* ${datadir}/gpe/pixmaps \
+ ${datadir}/gpe-conf"
+FILES_gpe-conf-panel = "${datadir}/applications/gpe-conf.desktop"
+
============================================================
--- packages/gpe-login/gpe-login_0.92.bb 37a976053be7e397317ee38072b254e3fac7a435
+++ packages/gpe-login/gpe-login_0.92.bb 37a976053be7e397317ee38072b254e3fac7a435
@@ -0,0 +1,24 @@
+DESCRIPTION = "GPE user login screen"
+SECTION = "gpe"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd"
+RDEPENDS = "xkbd gpe-theme-clearlooks"
+RPROVIDES_${PN} = "gpe-session-starter"
+PR = "r0"
+
+SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
+
+GPE_TARBALL_SUFFIX = "bz2"
+
+inherit gpe autotools pkgconfig
+
+
+SRC_URI += "file://removeblue-fontsize8.patch;patch=1"
+SRC_URI += " file://chvt-keylaunch.patch;patch=1 "
+SRC_URI += " file://c-locale.patch;patch=1 "
+
+SRC_URI_append_spitz = "file://brightness-adjust-keyluanchrc.patch;patch=1"
+SRC_URI_append_akita = "file://brightness-adjust-keyluanchrc.patch;patch=1"
+SRC_URI_append_c7x0 = "file://brightness-adjust-keyluanchrc.patch;patch=1"
+
============================================================
--- packages/gpe-session-scripts/gpe-session-scripts_0.68.bb a329b3ac9f1300b73646e914b5088a9d3adccee3
+++ packages/gpe-session-scripts/gpe-session-scripts_0.68.bb a329b3ac9f1300b73646e914b5088a9d3adccee3
@@ -0,0 +1,56 @@
+inherit gpe
+
+DESCRIPTION = "GPE session startup scripts"
+LICENSE = "GPL"
+SECTION = "gpe"
+PRIORITY = "optional"
+RDEPENDS_${PN} = "matchbox-panel matchbox-desktop matchbox-common gpe-session-starter xtscal gpe-question matchbox-applet-inputmanager xmodmap xdpyinfo xserver-common ipaq-sleep"
+# more rdepends: keylaunch apmd blueprobe
+DEPENDS = "matchbox-wm matchbox-panel xtscal gpe-question matchbox-applet-inputmanager xmodmap xdpyinfo xserver-common ipaq-sleep"
+
+SRC_URI += "file://matchbox-session \
+ file://disable-composite.xsettings"
+
+PR = "r0"
+
+#apply a patch to set the fontsize for bigdpi (200+) devices to 5
+SRC_URI_append_hx4700 = " file://highdpifontfix.patch;patch=1"
+SRC_URI_append_spitz = " file://highdpifontfix.patch;patch=1"
+SRC_URI_append_akita = " file://highdpifontfix.patch;patch=1"
+SRC_URI_append_c7x0 = " file://highdpifontfix.patch;patch=1"
+SRC_URI_append_nokia770 = " file://highdpifontfix.patch;patch=1"
+
+
+do_configure_append_angstrom() {
+ sed -i s:Default:Clearlooks:g X11/xsettings.default
+ sed -i s:Industrial:Clearlooks:g X11/xsettings.default
+}
+
+export CURSOR_HIDE = '${@base_contains("MACHINE_FEATURES","touchscreen","-use_cursor no","-use_cursor yes",d)}'
+
+do_install_append() {
+ install -d ${D}${sysconfdir}/gpe/xsettings-default.d
+ if [ "${GUI_MACHINE_CLASS}" != "bigscreen" ]; then
+ echo "Gtk/ToolbarStyle:S:icons" > ${D}${sysconfdir}/gpe/xsettings-default.d/toolbar
+ fi
+ install -d ${D}${sysconfdir}/matchbox
+ install ${WORKDIR}/matchbox-session ${D}${sysconfdir}/matchbox/session
+ printf "exec matchbox-window-manager ${CURSOR_HIDE} \$@ \n" >> ${D}${sysconfdir}/matchbox/session
+
+
+ install -d ${D}${sysconfdir}/gpe/xsettings-default.d
+ install -m 0644 ${WORKDIR}/disable-composite.xsettings ${D}${sysconfdir}/gpe/xsettings-default.d/disable-composite
+
+ mv ${D}/usr/bin/gpe-logout.sh ${D}/usr/bin/gpe-logout.sh.matchbox
+}
+
+pkg_postinst_${PN}() {
+ update-alternatives --install /usr/bin/gpe-logout.sh gpe-logout.sh /usr/bin/gpe-logout.sh.matchbox 10
+}
+
+pkg_postrm_${PN}() {
+ update-alternatives --remove gpe-logout.sh /usr/bin/gpe-logout.sh.matchbox
+}
+
+# This makes use of GUI_MACHINE_CLASS, so set PACKAGE_ARCH appropriately
+PACKAGE_ARCH = "${MACHINE_ARCH}"
============================================================
--- packages/gpe-todo/gpe-todo_0.57.bb 5f2d37e2f8cd59774274b320ecaf606505208231
+++ packages/gpe-todo/gpe-todo_0.57.bb 5f2d37e2f8cd59774274b320ecaf606505208231
@@ -0,0 +1,3 @@
+require gpe-todo.inc
+
+DEPENDS += "gtk+ libgpepimc"
#
# mt diff -ra4c7fdea302dedfc9dc32cbc08963aabe21f38b8 -rf2f4b5afb4a12de427743160e41723c1a54ad1c6
#
#
#
# add_file "conf/machine/mpc8315e-rdb.conf"
# content [a20869aceee999ab67f09b905078aef386eede64]
#
# add_file "packages/agg/agg-minimal_2.5.bb"
# content [2a252d8b9158808a66009910415687d2d81f817f]
#
# add_file "packages/failme.bb"
# content [0bd9c7a7c436d385836892a97f194dd00a2f30e5]
#
# add_file "packages/linux/linux-rp-2.6.24/pxa2xx_udc-clock.patch"
# content [4d1eaa5fd0823e232e423f4ec98563c53090a9d8]
#
# patch "conf/distro/chinook-compat.conf"
# from [c5844f900694f22660695c8b7f810b0ff9eb235c]
# to [6f4774c59d5c8589f1b8d21db8f3fed3f209e847]
#
# patch "packages/dsplink/dsplink_1.50.bb"
# from [ba3fbbc36f80f856194516e3676c4be8ff95593f]
# to [cea3f0783310d4a2a32b0c7f38aa90c15cbb2ff4]
#
# patch "packages/linux/linux-davinci/davinci-sffsdr/defconfig"
# from [4df55e9222bbc1baee2a2743820e24de5b910ac8]
# to [63985e194d5e1ff38d13a4d1d13f25a9683141b4]
#
# patch "packages/linux/linux-davinci/davinci-sffsdr/sffsdr.patch"
# from [540f3377225d179721cf1096db5ccc39e1428d80]
# to [ae4ffc2fe0c420da295b80670ab6349f1df20056]
#
# patch "packages/linux/linux-rp-2.6.24/defconfig-akita"
# from [33d8cc0f8a30277b834a2c1da09fb6ece1d098a5]
# to [1d797e5ffd81b69e0985d2fe9663db5a798b79a1]
#
# patch "packages/linux/linux-rp-2.6.24/defconfig-c7x0"
# from [b45f438b494270a020d8feec2d5110707bde21f1]
# to [ddc33aec79255b267fcfce9b3fc13ea540b0ae1f]
#
# patch "packages/linux/linux-rp-2.6.24/defconfig-poodle"
# from [c66e00f8061a663ee80edff2c737bc0266f3df43]
# to [2c9baccc4098e9b1d1e1392f20c2b55aa947bb28]
#
# patch "packages/linux/linux-rp-2.6.24/defconfig-spitz"
# from [58c5d3463be6ec2d735fef9b44f8c1be7c658075]
# to [1f2f1fd61af250329c4ee2ae60d0315acf2f95c0]
#
# patch "packages/linux/linux-rp-2.6.24/defconfig-tosa"
# from [8f0bf8a513bad928394f2e4ff80b6284302f6685]
# to [a69c2dbac0a15fbbcf77f0f6b52223e92fa6210d]
#
# patch "packages/linux/linux-rp_2.6.24.bb"
# from [a462636fa146486f11ad987d424ad2ebdd235df2]
# to [bdf515f4dba80c6b7d3022a76de73a5130b8ed5a]
#
# patch "packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb"
# from [395167a26cd17318d047dfec7f4761b1c8546cec]
# to [63c582236d5e631780a864456ba4db4862602a0e]
#
============================================================
--- conf/machine/mpc8315e-rdb.conf a20869aceee999ab67f09b905078aef386eede64
+++ conf/machine/mpc8315e-rdb.conf a20869aceee999ab67f09b905078aef386eede64
@@ -0,0 +1,32 @@
+#@TYPE: Machine
+#@Name: Freescale MPC8315E-RDB
+#@DESCRIPTION: Machine configuration for the Freescale MPC8315E-RDB
+
+# Development board with low power PowerPC SoC with MMU/FPU and PCI,
+# PCI Express, SATA onboard.
+
+TARGET_ARCH = "powerpc"
+PACKAGE_EXTRA_ARCHS = "ppce300c3"
+
+PREFERRED_PROVIDER_virtual/kernel ?= "linux"
+
+MACHINE_FEATURES = "kernel26 usbhost pci ext2 uboot"
+
+KERNEL_IMAGETYPE = "uImage"
+
+PREFERRED_VERSION_u-boot = "1.3.2"
+UBOOT_MACHINE = "MPC8315ERDB_config"
+UBOOT_ENTRYPOINT = "0"
+UBOOT_LOADADDRESS = "0"
+
+#rootfs on NAND flash
+EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x4000 --no-cleanmarkers"
+
+#don't try to access tty1
+USE_VT = "0"
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+#tune for the e300c3 core
+require conf/machine/include/tune-ppce300c3.inc
+
============================================================
--- packages/agg/agg-minimal_2.5.bb 2a252d8b9158808a66009910415687d2d81f817f
+++ packages/agg/agg-minimal_2.5.bb 2a252d8b9158808a66009910415687d2d81f817f
@@ -0,0 +1,43 @@
+DESCRIPTION = "Anti Grain Geometry - A High Quality Rendering Engine for C++"
+AUTHOR = "mcseem at antigrain.com"
+HOMEPAGE = "http://www.antigrain.com"
+SECTION = "libs"
+LICENSE = "AGG License"
+DEPENDS = "freetype"
+
+PR = "r0"
+
+SRC_URI = "http://www.antigrain.com/agg-${PV}.tar.gz"
+SRC_URI += "http://www.wxsvg.org/files/agg-2.5_cygming.patch;patch=1"
+S = "${WORKDIR}/agg-${PV}"
+
+inherit autotools pkgconfig
+
+CFLAGS += " -I{$STAGING_INCDIR} "
+
+FILES_${PN} = "${libdir}/libagg.so.* \
+ ${libdir}/libaggfontfreetype.so.*"
+
+LEAD_SONAME = "libagg.so"
+
+EXTRA_OECONF = "--disable-gpc --without-x --disable-examples --disable-ctrl \
+--disable-platform --disable-win32tt --disable-sdltest"
+
+do_stage() {
+ oe_libinstall -a -so libagg ${STAGING_LIBDIR}
+ oe_libinstall -a -so libaggfontfreetype ${STAGING_LIBDIR}
+ install -m 0644 libagg.m4 ${STAGING_DATADIR}/aclocal/
+ install -d ${STAGING_INCDIR}/agg2
+
+ for f in font_freetype font_win32_tt gpc
+ do
+ install -m 0644 ${S}/$f/*.h ${STAGING_INCDIR}/agg2/
+ done
+
+ cd include
+ headers=`find . -name "*.h"`
+ for f in $headers
+ do
+ install -D -m 0644 $f ${STAGING_INCDIR}/agg2/$f
+ done
+}
============================================================
--- packages/failme.bb 0bd9c7a7c436d385836892a97f194dd00a2f30e5
+++ packages/failme.bb 0bd9c7a7c436d385836892a97f194dd00a2f30e5
@@ -0,0 +1,5 @@
+
+do_configure() {
+idontexist
+}
+
============================================================
--- packages/linux/linux-rp-2.6.24/pxa2xx_udc-clock.patch 4d1eaa5fd0823e232e423f4ec98563c53090a9d8
+++ packages/linux/linux-rp-2.6.24/pxa2xx_udc-clock.patch 4d1eaa5fd0823e232e423f4ec98563c53090a9d8
@@ -0,0 +1,221 @@
+---
+ drivers/usb/gadget/pxa2xx_udc.c | 88 ++++++++++++++++++++++------------------
+ drivers/usb/gadget/pxa2xx_udc.h | 4 +
+ 2 files changed, 53 insertions(+), 39 deletions(-)
+
+--- g26.orig/drivers/usb/gadget/pxa2xx_udc.c 2008-02-19 12:47:06.000000000 -0800
++++ g26/drivers/usb/gadget/pxa2xx_udc.c 2008-02-19 14:07:17.000000000 -0800
+@@ -103,6 +103,12 @@ static const char ep0name [] = "ep0";
+ #error "Can't configure both IXP and PXA"
+ #endif
+
++/* IXP doesn't yet support <linux/clk.h> */
++#define clk_get(dev,name) NULL
++#define clk_enable(clk) do { } while (0)
++#define clk_disable(clk) do { } while (0)
++#define clk_put(clk) do { } while (0)
++
+ #endif
+
+ #include "pxa2xx_udc.h"
+@@ -934,20 +940,31 @@ static void udc_disable(struct pxa2xx_ud
+ /* We disable the UDC -- and its 48 MHz clock -- whenever it's not
+ * in active use.
+ */
+-static int pullup(struct pxa2xx_udc *udc, int is_active)
++static int pullup(struct pxa2xx_udc *udc)
+ {
+- is_active = is_active && udc->vbus && udc->pullup;
++ int is_active = udc->vbus && udc->pullup && !udc->suspended;
+ DMSG("%s\n", is_active ? "active" : "inactive");
+- if (is_active)
+- udc_enable(udc);
+- else {
+- if (udc->gadget.speed != USB_SPEED_UNKNOWN) {
+- DMSG("disconnect %s\n", udc->driver
+- ? udc->driver->driver.name
+- : "(no driver)");
+- stop_activity(udc, udc->driver);
++ if (is_active) {
++ if (!udc->active) {
++ udc->active = 1;
++ /* Enable clock for USB device */
++ clk_enable(udc->clk);
++ udc_enable(udc);
+ }
+- udc_disable(udc);
++ } else {
++ if (udc->active) {
++ if (udc->gadget.speed != USB_SPEED_UNKNOWN) {
++ DMSG("disconnect %s\n", udc->driver
++ ? udc->driver->driver.name
++ : "(no driver)");
++ stop_activity(udc, udc->driver);
++ }
++ udc_disable(udc);
++ /* Disable clock for USB device */
++ clk_disable(udc->clk);
++ udc->active = 0;
++ }
++
+ }
+ return 0;
+ }
+@@ -958,9 +975,9 @@ static int pxa2xx_udc_vbus_session(struc
+ struct pxa2xx_udc *udc;
+
+ udc = container_of(_gadget, struct pxa2xx_udc, gadget);
+- udc->vbus = is_active = (is_active != 0);
++ udc->vbus = (is_active != 0);
+ DMSG("vbus %s\n", is_active ? "supplied" : "inactive");
+- pullup(udc, is_active);
++ pullup(udc);
+ return 0;
+ }
+
+@@ -975,9 +992,8 @@ static int pxa2xx_udc_pullup(struct usb_
+ if (!udc->mach->gpio_pullup && !udc->mach->udc_command)
+ return -EOPNOTSUPP;
+
+- is_active = (is_active != 0);
+- udc->pullup = is_active;
+- pullup(udc, is_active);
++ udc->pullup = (is_active != 0);
++ pullup(udc);
+ return 0;
+ }
+
+@@ -1146,11 +1162,6 @@ static void udc_disable(struct pxa2xx_ud
+
+ udc_clear_mask_UDCCR(UDCCR_UDE);
+
+-#ifdef CONFIG_ARCH_PXA
+- /* Disable clock for USB device */
+- clk_disable(dev->clk);
+-#endif
+-
+ ep0_idle (dev);
+ dev->gadget.speed = USB_SPEED_UNKNOWN;
+ }
+@@ -1191,11 +1202,6 @@ static void udc_enable (struct pxa2xx_ud
+ {
+ udc_clear_mask_UDCCR(UDCCR_UDE);
+
+-#ifdef CONFIG_ARCH_PXA
+- /* Enable clock for USB device */
+- clk_enable(dev->clk);
+-#endif
+-
+ /* try to clear these bits before we enable the udc */
+ udc_ack_int_UDCCR(UDCCR_SUSIR|/*UDCCR_RSTIR|*/UDCCR_RESIR);
+
+@@ -1286,7 +1292,7 @@ fail:
+ * for set_configuration as well as eventual disconnect.
+ */
+ DMSG("registered gadget driver '%s'\n", driver->driver.name);
+- pullup(dev, 1);
++ pullup(dev);
+ dump_state(dev);
+ return 0;
+ }
+@@ -1329,7 +1335,8 @@ int usb_gadget_unregister_driver(struct
+ return -EINVAL;
+
+ local_irq_disable();
+- pullup(dev, 0);
++ dev->pullup = 0;
++ pullup(dev);
+ stop_activity(dev, driver);
+ local_irq_enable();
+
+@@ -2131,13 +2138,11 @@ static int __init pxa2xx_udc_probe(struc
+ if (irq < 0)
+ return -ENODEV;
+
+-#ifdef CONFIG_ARCH_PXA
+ dev->clk = clk_get(&pdev->dev, "UDCCLK");
+ if (IS_ERR(dev->clk)) {
+ retval = PTR_ERR(dev->clk);
+ goto err_clk;
+ }
+-#endif
+
+ pr_debug("%s: IRQ %d%s%s\n", driver_name, irq,
+ dev->has_cfr ? "" : " (!cfr)",
+@@ -2250,10 +2255,8 @@ lubbock_fail0:
+ if (dev->mach->gpio_vbus)
+ gpio_free(dev->mach->gpio_vbus);
+ err_gpio_vbus:
+-#ifdef CONFIG_ARCH_PXA
+ clk_put(dev->clk);
+ err_clk:
+-#endif
+ return retval;
+ }
+
+@@ -2269,7 +2272,9 @@ static int __exit pxa2xx_udc_remove(stru
+ if (dev->driver)
+ return -EBUSY;
+
+- udc_disable(dev);
++ dev->pullup = 0;
++ pullup(dev);
++
+ remove_proc_files();
+
+ if (dev->got_irq) {
+@@ -2289,9 +2294,7 @@ static int __exit pxa2xx_udc_remove(stru
+ if (dev->mach->gpio_pullup)
+ gpio_free(dev->mach->gpio_pullup);
+
+-#ifdef CONFIG_ARCH_PXA
+ clk_put(dev->clk);
+-#endif
+
+ platform_set_drvdata(pdev, NULL);
+ the_controller = NULL;
+@@ -2317,10 +2320,15 @@ static int __exit pxa2xx_udc_remove(stru
+ static int pxa2xx_udc_suspend(struct platform_device *dev, pm_message_t state)
+ {
+ struct pxa2xx_udc *udc = platform_get_drvdata(dev);
++ unsigned long flags;
+
+ if (!udc->mach->gpio_pullup && !udc->mach->udc_command)
+ WARN("USB host won't detect disconnect!\n");
+- pullup(udc, 0);
++ udc->suspended = 1;
++
++ local_irq_save(flags);
++ pullup(udc);
++ local_irq_restore(flags);
+
+ return 0;
+ }
+@@ -2328,8 +2336,12 @@ static int pxa2xx_udc_suspend(struct pla
+ static int pxa2xx_udc_resume(struct platform_device *dev)
+ {
+ struct pxa2xx_udc *udc = platform_get_drvdata(dev);
++ unsigned long flags;
+
+- pullup(udc, 1);
++ udc->suspended = 0;
++ local_irq_save(flags);
++ pullup(udc);
++ local_irq_restore(flags);
+
+ return 0;
+ }
+--- g26.orig/drivers/usb/gadget/pxa2xx_udc.h 2008-02-19 12:47:06.000000000 -0800
++++ g26/drivers/usb/gadget/pxa2xx_udc.h 2008-02-19 12:57:42.000000000 -0800
+@@ -119,7 +119,9 @@ struct pxa2xx_udc {
+ has_cfr : 1,
+ req_pending : 1,
+ req_std : 1,
+- req_config : 1;
++ req_config : 1,
++ suspended : 1,
++ active : 1;
+
+ #define start_watchdog(dev) mod_timer(&dev->timer, jiffies + (HZ/200))
+ struct timer_list timer;
+-
============================================================
--- conf/distro/chinook-compat.conf c5844f900694f22660695c8b7f810b0ff9eb235c
+++ conf/distro/chinook-compat.conf 6f4774c59d5c8589f1b8d21db8f3fed3f209e847
@@ -163,8 +163,10 @@ PREFERRED_VERSION_osso-gnome-vfs2 = "2.1
PREFERRED_VERSION_osso-gnome-vfs2 = "2.16.3"
# Java stuff
+PREFERRED_PROVIDER_midpath = "midpath-maemo"
+PREFERRED_PROVIDER_midpath-backend-gtk = "midpath-backend-gtk-hildon"
-PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
+PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
PREFERRED_PROVIDER_classpath = "classpath"
PREFERRED_VERSION_classpath = "0.97.1"
@@ -197,6 +199,8 @@ PKG_libsdl-directfb = "libsdl1.2"
PKG_libsdl-image = "libsdl-image1.2"
PKG_libsdl-directfb = "libsdl1.2"
+PKG_libsdl-ttf = "libsdl-ttf2.0-0"
+PKG_libsdl-gfx = "libsdl-gfx1.2-4"
PKG_bluez-libs = "libbluetooth2"
============================================================
--- packages/dsplink/dsplink_1.50.bb ba3fbbc36f80f856194516e3676c4be8ff95593f
+++ packages/dsplink/dsplink_1.50.bb cea3f0783310d4a2a32b0c7f38aa90c15cbb2ff4
@@ -47,6 +47,7 @@ do_compile () {
do_compile () {
ln -sf ${S}/gpp/src/api/*h ${S}/gpp/inc/
ln -sf ${S}/gpp/src/pmgr/Linux/2.6.18 ${S}/gpp/src/pmgr/Linux/2.6.26-rc2-omap1
+ unset DISPLAY
oe_runmake -C ${S}/gpp/src
}
============================================================
--- packages/linux/linux-davinci/davinci-sffsdr/defconfig 4df55e9222bbc1baee2a2743820e24de5b910ac8
+++ packages/linux/linux-davinci/davinci-sffsdr/defconfig 63985e194d5e1ff38d13a4d1d13f25a9683141b4
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.25-rc8-davinci1
-# Tue Apr 15 07:09:55 2008
+# Linux kernel version: 2.6.25-davinci1
+# Thu May 22 17:00:44 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -31,6 +31,7 @@ CONFIG_BROKEN_ON_SMP=y
#
CONFIG_EXPERIMENTAL=y
CONFIG_BROKEN_ON_SMP=y
+CONFIG_LOCK_KERNEL=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_LOCALVERSION=""
CONFIG_LOCALVERSION_AUTO=y
@@ -145,7 +146,7 @@ CONFIG_CLASSIC_RCU=y
# CONFIG_ARCH_KS8695 is not set
# CONFIG_ARCH_NS9XXX is not set
# CONFIG_ARCH_MXC is not set
-# CONFIG_ARCH_ORION is not set
+# CONFIG_ARCH_ORION5X is not set
# CONFIG_ARCH_PNX4008 is not set
# CONFIG_ARCH_PXA is not set
# CONFIG_ARCH_RPC is not set
@@ -177,7 +178,8 @@ CONFIG_ARCH_DAVINCI644x=y
#
# DaVinci Board Type
#
-CONFIG_MACH_DAVINCI_EVM=y
+# CONFIG_MACH_DAVINCI_EVM is not set
+CONFIG_MACH_SFFSDR=y
CONFIG_DAVINCI_I2C_EXPANDER=y
# CONFIG_DAVINCI_MCBSP is not set
@@ -219,14 +221,14 @@ CONFIG_ARM_THUMB=y
#
# Kernel Features
#
-# CONFIG_TICK_ONESHOT is not set
-# CONFIG_NO_HZ is not set
-# CONFIG_HIGH_RES_TIMERS is not set
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-# CONFIG_PREEMPT is not set
+CONFIG_PREEMPT=y
CONFIG_HZ=100
CONFIG_AEABI=y
-CONFIG_OABI_COMPAT=y
+# CONFIG_OABI_COMPAT is not set
# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
CONFIG_SELECT_MEMORY_MODEL=y
CONFIG_FLATMEM_MANUAL=y
@@ -261,8 +263,6 @@ CONFIG_CMDLINE=""
#
# At least one emulation must be selected
#
-# CONFIG_FPE_NWFPE is not set
-# CONFIG_FPE_FASTFPE is not set
# CONFIG_VFP is not set
#
@@ -338,8 +338,10 @@ CONFIG_IPV6_SIT=m
CONFIG_INET6_XFRM_MODE_BEET=m
# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
CONFIG_IPV6_SIT=m
+CONFIG_IPV6_NDISC_NODETYPE=y
# CONFIG_IPV6_TUNNEL is not set
# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MROUTE is not set
# CONFIG_NETWORK_SECMARK is not set
CONFIG_NETFILTER=y
# CONFIG_NETFILTER_DEBUG is not set
@@ -506,9 +508,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
# CONFIG_BLK_DEV_XIP is not set
# CONFIG_CDROM_PKTCDVD is not set
# CONFIG_ATA_OVER_ETH is not set
-CONFIG_MISC_DEVICES=y
-# CONFIG_EEPROM_93CX6 is not set
-# CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_MISC_DEVICES is not set
CONFIG_HAVE_IDE=y
# CONFIG_IDE is not set
@@ -582,6 +582,7 @@ CONFIG_TI_DAVINCI_EMAC=y
#
# CONFIG_WLAN_PRE80211 is not set
# CONFIG_WLAN_80211 is not set
+# CONFIG_IWLWIFI_LEDS is not set
#
# USB Network Adapters
@@ -621,29 +622,41 @@ CONFIG_INPUT=y
#
# Userland interfaces
#
-CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV=m
CONFIG_INPUT_MOUSEDEV_PSAUX=y
CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
# CONFIG_INPUT_JOYDEV is not set
CONFIG_INPUT_EVDEV=m
-# CONFIG_INPUT_EVBUG is not set
+CONFIG_INPUT_EVBUG=m
#
# Input Device Drivers
#
CONFIG_INPUT_KEYBOARD=y
-CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_ATKBD=m
# CONFIG_KEYBOARD_SUNKBD is not set
# CONFIG_KEYBOARD_LKKBD is not set
-CONFIG_KEYBOARD_XTKBD=y
+CONFIG_KEYBOARD_XTKBD=m
# CONFIG_KEYBOARD_NEWTON is not set
# CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_KEYBOARD_GPIO is not set
+# CONFIG_KEYBOARD_LM8323 is not set
+CONFIG_KEYBOARD_GPIO=y
# CONFIG_INPUT_MOUSE is not set
# CONFIG_INPUT_JOYSTICK is not set
# CONFIG_INPUT_TABLET is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
+CONFIG_INPUT_TOUCHSCREEN=y
+# CONFIG_TOUCHSCREEN_FUJITSU is not set
+# CONFIG_TOUCHSCREEN_GUNZE is not set
+# CONFIG_TOUCHSCREEN%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list