From 5da5ee1a5708f9a30c61636f29548acd3a4ae02c Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 30 Oct 2009 10:27:27 +0100 Subject: abiword: replace 2.8.0 with 2.8.1, some crashes fixed and libtool macros updated --- conf/checksums.ini | 4 ++++ recipes/abiword/abiword_2.8.0.bb | 48 ---------------------------------------- recipes/abiword/abiword_2.8.1.bb | 46 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 48 deletions(-) delete mode 100644 recipes/abiword/abiword_2.8.0.bb create mode 100644 recipes/abiword/abiword_2.8.1.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index 061a24eba6..d01c21c3d2 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -1418,6 +1418,10 @@ sha256=b6656a0da13d94b334f02637c89d8fe13aa54752040ad1b8f14f668d8cb96e93 md5=f61c623cdb3c3b2aed05bbc868050ddd sha256=b0d0f723a08372ac0889e44a590ee1f13f8c5487b394181396f978191a627bdd +[http://www.abisource.com/downloads/abiword/2.8.1/source/abiword-2.8.1.tar.gz] +md5=284fe25289c160c3797b527a8aacad12 +sha256=f51b614b1202cf63a5f7ede093d31d638ece3c8e76da4036cc4aed589a9cd2ec + [http://www.abiword.org/downloads/abiword/2.5.1/source/abiword-plugins-2.5.1.tar.gz] md5=b1ce7ca49a0ee4e04f828e10eaebe6a9 sha256=37faf6ea346c9b6473c5b2dfd1bb599457faa06b6a7cdef58e3e9f3e2773976b diff --git a/recipes/abiword/abiword_2.8.0.bb b/recipes/abiword/abiword_2.8.0.bb deleted file mode 100644 index 546e29cd64..0000000000 --- a/recipes/abiword/abiword_2.8.0.bb +++ /dev/null @@ -1,48 +0,0 @@ -require abiword-2.5.inc - -PR = "r1" - -SRC_URI = "http://www.abisource.com/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz" - -do_configure() { - autotools_do_configure -} - -EXTRA_OECONF = " --disable-static \ - --enable-plugins \ - --enable-collab-backend-xmpp \ - --enable-collab-backend-tcp \ - --enable-collab-backend-service \ -" - -RCONFLICTS = "abiword-embedded" - -FILES_${PN} += "${datadir}/mime-info ${datadir}/abiword-${SHRT_VER}/ui ${datadir}/abiword-${SHRT_VER}/xsl* ${datadir}/abiword-${SHRT_VER}/mime-info ${datadir}/abiword-${SHRT_VER}/Pr*.xml" -FILES_abiword-strings += "${datadir}/abiword-${SHRT_VER}/strings" -FILES_abiword-systemprofiles += "${datadir}/abiword-${SHRT_VER}/system.profile*" - -PACKAGES_DYNAMIC = "abiword-meta abiword-plugin-*" - -python populate_packages_prepend () { - abiword_libdir = bb.data.expand('${libdir}/abiword-2.8/plugins', d) - do_split_packages(d, abiword_libdir, '(.*)\.so$', 'abiword-plugin-%s', 'Abiword plugin for %s', extra_depends='') - - metapkg = "abiword-meta" - bb.data.setVar('ALLOW_EMPTY_' + metapkg, "1", d) - bb.data.setVar('FILES_' + metapkg, "", d) - blacklist = [ 'abiword-plugins-dbg', 'abiword-plugins', 'abiword-plugins-doc', 'abiword-plugins-dev', 'abiword-plugins-locale' ] - metapkg_rdepends = [] - packages = bb.data.getVar('PACKAGES', d, 1).split() - for pkg in packages[1:]: - if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.count("-dev") and not pkg.count("-dbg") and not pkg.count("static") and not pkg.count("locale") and not pkg.count("abiword-doc"): - print "Modifying ", pkg - metapkg_rdepends.append(pkg) - bb.data.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends), d) - bb.data.setVar('DESCRIPTION_' + metapkg, 'abiword-plugin meta package', d) - packages.append(metapkg) - bb.data.setVar('PACKAGES', ' '.join(packages), d) -} - -FILES_${PN}-dev += "${libdir}/abiword-${SHRT_VER}/plugins/*.la" -FILES_${PN}-dbg += "${libdir}/abiword-${SHRT_VER}/plugins/.debug" - diff --git a/recipes/abiword/abiword_2.8.1.bb b/recipes/abiword/abiword_2.8.1.bb new file mode 100644 index 0000000000..24e20a4e55 --- /dev/null +++ b/recipes/abiword/abiword_2.8.1.bb @@ -0,0 +1,46 @@ +require abiword-2.5.inc + +SRC_URI = "http://www.abisource.com/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz" + +do_configure() { + autotools_do_configure +} + +EXTRA_OECONF = " --disable-static \ + --enable-plugins \ + --enable-collab-backend-xmpp \ + --enable-collab-backend-tcp \ + --enable-collab-backend-service \ +" + +RCONFLICTS = "abiword-embedded" + +FILES_${PN} += "${datadir}/mime-info ${datadir}/abiword-${SHRT_VER}/ui ${datadir}/abiword-${SHRT_VER}/xsl* ${datadir}/abiword-${SHRT_VER}/mime-info ${datadir}/abiword-${SHRT_VER}/Pr*.xml" +FILES_abiword-strings += "${datadir}/abiword-${SHRT_VER}/strings" +FILES_abiword-systemprofiles += "${datadir}/abiword-${SHRT_VER}/system.profile*" + +PACKAGES_DYNAMIC = "abiword-meta abiword-plugin-*" + +python populate_packages_prepend () { + abiword_libdir = bb.data.expand('${libdir}/abiword-2.8/plugins', d) + do_split_packages(d, abiword_libdir, '(.*)\.so$', 'abiword-plugin-%s', 'Abiword plugin for %s', extra_depends='') + + metapkg = "abiword-meta" + bb.data.setVar('ALLOW_EMPTY_' + metapkg, "1", d) + bb.data.setVar('FILES_' + metapkg, "", d) + blacklist = [ 'abiword-plugins-dbg', 'abiword-plugins', 'abiword-plugins-doc', 'abiword-plugins-dev', 'abiword-plugins-locale' ] + metapkg_rdepends = [] + packages = bb.data.getVar('PACKAGES', d, 1).split() + for pkg in packages[1:]: + if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.count("-dev") and not pkg.count("-dbg") and not pkg.count("static") and not pkg.count("locale") and not pkg.count("abiword-doc"): + print "Modifying ", pkg + metapkg_rdepends.append(pkg) + bb.data.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends), d) + bb.data.setVar('DESCRIPTION_' + metapkg, 'abiword-plugin meta package', d) + packages.append(metapkg) + bb.data.setVar('PACKAGES', ' '.join(packages), d) +} + +FILES_${PN}-dev += "${libdir}/abiword-${SHRT_VER}/plugins/*.la" +FILES_${PN}-dbg += "${libdir}/abiword-${SHRT_VER}/plugins/.debug" + -- cgit v1.2.3 From 04bf7d5d151173ac058f4aff2e4be3ae0f98216e Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 30 Oct 2009 11:38:49 +0100 Subject: u-boot: added Sheevaplug support Marvell devices needs u-boot.kwb instead of u-boot.bin due to header for first stage bootloader. UBOOT_BINARY variable was introduced due of that. --- recipes/u-boot/u-boot.inc | 3 ++- recipes/u-boot/u-boot_git.bb | 13 ++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/recipes/u-boot/u-boot.inc b/recipes/u-boot/u-boot.inc index 8ab0282743..6fdbaac87f 100644 --- a/recipes/u-boot/u-boot.inc +++ b/recipes/u-boot/u-boot.inc @@ -13,6 +13,7 @@ PARALLEL_MAKE="" EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" UBOOT_MACHINE ?= "${MACHINE}_config" +UBOOT_BINARY ?= "u-boot.bin" UBOOT_IMAGE ?= "u-boot-${MACHINE}-${PV}-${PR}.bin" UBOOT_SYMLINK ?= "u-boot-${MACHINE}.bin" @@ -39,7 +40,7 @@ do_install () { do_deploy () { install -d ${DEPLOY_DIR_IMAGE} - install ${S}/u-boot.bin ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE} + install ${S}/${UBOOT_BINARY} ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE} package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE} cd ${DEPLOY_DIR_IMAGE} diff --git a/recipes/u-boot/u-boot_git.bb b/recipes/u-boot/u-boot_git.bb index 15c3060a39..59c0598f97 100644 --- a/recipes/u-boot/u-boot_git.bb +++ b/recipes/u-boot/u-boot_git.bb @@ -1,5 +1,5 @@ require u-boot.inc -PR ="r32" +PR ="r33" FILESPATHPKG =. "u-boot-git:" @@ -143,6 +143,9 @@ SRC_URI_append_c7x0 = "file://pdaXrom-u-boot.patch;patch=1 \ file://uboot-eabi-fix-HACK2.patch;patch=1 \ file://corgi-standard-partitioning.patch;patch=1 \ " +SRC_URI_sheevaplug = "git://git.denx.de/u-boot-marvell.git;protocol=git;branch=testing" +SRCREV_sheevaplug = "119b9942da2e450d4e525fc004208dd7f7d062e0" + S = "${WORKDIR}/git" @@ -158,6 +161,14 @@ do_configure_prepend_c7x0() { sed -i s:ROOT_FLASH_SIZE:${ROOT_FLASH_SIZE}:g ${S}/include/configs/corgi.h } +do_compile_append_sheevaplug() { + oe_runmake u-boot.kwb +} + +UBOOT_IMAGE_sheevaplug = "u-boot-${MACHINE}-${PV}-${PR}.kwb" +UBOOT_BINARY_sheevaplug = "u-boot.kwb" +UBOOT_SYMLINK_sheevaplug ?= "u-boot-${MACHINE}.kwb" + do_deploy_prepend_mini2440() { cp ${S}/u-boot-nand16k.bin ${S}/u-boot.bin } -- cgit v1.2.3 From 11aa8fff676b86cec288737391375d73a1245a5a Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Fri, 30 Oct 2009 11:59:55 +0100 Subject: sane-srcrevs: add webkit-efl|gtk Signed-off-by: Sebastian Spaeth --- conf/distro/include/sane-srcrevs.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 2f22a7d91d..78b6453ff3 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -232,6 +232,8 @@ SRCREV_pn-u-boot-openmoko ?= "650149a53dbdd48bf6dfef90930c8ab182adb512" SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19" SRCREV_pn-usbpath ?= "3172" SRCREV_pn-usbpath-native ?= "3172" +SRCREV_pn-webkit-efl ?= "3a5ee77664c898ed51a2b2d5759822f8c0a06472" +SRCREV_pn-webkit-gtk ?= "48579" SRCREV_pn-wlan-ng-modules ?= "1859" SRCREV_pn-wlan-ng-utils ?= "1859" SRCREV_pn-wmiconfig ?= "5394" -- cgit v1.2.3 From 4ab9ea946965be0b9dd3d15396dd70fea78b2aad Mon Sep 17 00:00:00 2001 From: OE Builder Date: Fri, 30 Oct 2009 12:18:56 +0100 Subject: linux-2.6.31: add driver for boc01 buttons --- .../linux-2.6.31/boc01/014-091030-buttons.patch | 233 +++++++++++++++++++++ recipes/linux/linux-2.6.31/boc01/defconfig | 1 + recipes/linux/linux_2.6.31.bb | 1 + 3 files changed, 235 insertions(+) create mode 100644 recipes/linux/linux-2.6.31/boc01/014-091030-buttons.patch diff --git a/recipes/linux/linux-2.6.31/boc01/014-091030-buttons.patch b/recipes/linux/linux-2.6.31/boc01/014-091030-buttons.patch new file mode 100644 index 0000000000..9e56ad12b0 --- /dev/null +++ b/recipes/linux/linux-2.6.31/boc01/014-091030-buttons.patch @@ -0,0 +1,233 @@ +Index: linux-2.6.31/drivers/input/misc/Kconfig +=================================================================== +--- linux-2.6.31.orig/drivers/input/misc/Kconfig 2009-10-30 11:08:24.000000000 +0100 ++++ linux-2.6.31/drivers/input/misc/Kconfig 2009-10-30 11:08:32.000000000 +0100 +@@ -270,6 +270,13 @@ + To compile this driver as a module, choose M here: the + module will be called dm355evm_keys. + ++config INPUT_BOC_BTNS ++ tristate "BoC buttons interface" ++ select INPUT_POLLDEV ++ help ++ To compile this driver as a module, choose M here: ++ the module will be called boc-btns. ++ + config INPUT_CAPSENSE_BTNS + tristate "CAPSENSE CY8C201xx buttons interface" + select INPUT_POLLDEV +Index: linux-2.6.31/drivers/input/misc/Makefile +=================================================================== +--- linux-2.6.31.orig/drivers/input/misc/Makefile 2009-10-30 11:08:51.000000000 +0100 ++++ linux-2.6.31/drivers/input/misc/Makefile 2009-10-30 11:08:58.000000000 +0100 +@@ -26,4 +26,5 @@ + obj-$(CONFIG_INPUT_UINPUT) += uinput.o + obj-$(CONFIG_INPUT_WISTRON_BTNS) += wistron_btns.o + obj-$(CONFIG_INPUT_YEALINK) += yealink.o ++obj-$(CONFIG_INPUT_BOC_BTNS) += boc-btns.o + obj-$(CONFIG_INPUT_CAPSENSE_BTNS) += capsense-btns.o +Index: linux-2.6.31/drivers/input/misc/boc-btns.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.31/drivers/input/misc/boc-btns.c 2009-10-30 11:57:13.000000000 +0100 +@@ -0,0 +1,200 @@ ++/* ++ * Buttons for BoC ++ * ++ * Copyright (C) 2009, Bollore telecom (www.bolloretelecom.eu). ++ * ++ * Jeremy Lainé ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++ ++#define BUTTONS_POLL_INTERVAL 30 /* msec */ ++ ++static unsigned char input_gpio[] = { ++ 231, // reset button ++}; ++ ++static unsigned short input_keymap[] = { ++ KEY_ESC, ++}; ++ ++struct buttons_dev { ++ struct input_polled_dev *poll_dev; ++ unsigned short keymap[ARRAY_SIZE(input_keymap)]; ++ int state[ARRAY_SIZE(input_keymap)]; ++}; ++ ++/* ++ * Buttons events handling ++ */ ++ ++static void handle_buttons(struct input_polled_dev *dev) ++{ ++ int i, value; ++ struct buttons_dev *bdev = dev->private; ++ struct input_dev *input = dev->input; ++ ++ // read GPIO ++ for (i = 0; i < ARRAY_SIZE(input_keymap); i++) ++ { ++ value = gpio_get_value(input_gpio[i]); ++ if (value != bdev->state[i]) ++ { ++ input_event(input, EV_MSC, MSC_SCAN, i); ++ input_report_key(input, input_keymap[i], value); ++ input_sync(input); ++ bdev->state[i] = value; ++ } ++ } ++} ++ ++/* ++ * Device initialisation ++ */ ++ ++static int __devinit boc_buttons_probe(struct platform_device *pdev) ++{ ++ struct buttons_dev *bdev; ++ struct input_polled_dev *poll_dev; ++ struct input_dev *input; ++ int error, i; ++ ++ for (i = 0; i < ARRAY_SIZE(input_keymap); i++) ++ { ++ if (gpio_request(input_gpio[i], NULL) < 0) ++ return -ENODEV; ++ } ++ ++ bdev = kzalloc(sizeof(struct buttons_dev), GFP_KERNEL); ++ if (!bdev) ++ return -ENOMEM; ++ ++ poll_dev = input_allocate_polled_device(); ++ if (!poll_dev) { ++ error = -ENOMEM; ++ goto out_allocated; ++ } ++ ++ memcpy(bdev->keymap, input_keymap, sizeof(bdev->keymap)); ++ ++ poll_dev->private = bdev; ++ poll_dev->poll = handle_buttons; ++ poll_dev->poll_interval = BUTTONS_POLL_INTERVAL; ++ ++ input = poll_dev->input; ++ input->name = "BoC buttons"; ++ input->phys = "boc/input0"; ++ input->id.bustype = BUS_HOST; ++ input->dev.parent = &pdev->dev; ++ ++ input->keycode = bdev->keymap; ++ input->keycodemax = ARRAY_SIZE(bdev->keymap); ++ input->keycodesize = sizeof(unsigned short); ++ ++ input_set_capability(input, EV_MSC, MSC_SCAN); ++ set_bit(EV_KEY, input->evbit); ++ ++ bdev->poll_dev = poll_dev; ++ dev_set_drvdata(&pdev->dev, bdev); ++ ++ error = input_register_polled_device(poll_dev); ++ if (error < 0) ++ goto out_polled; ++ ++ return 0; ++ ++out_polled: ++ input_free_polled_device(poll_dev); ++out_allocated: ++ kfree(bdev); ++ return error; ++} ++ ++static int __devexit boc_buttons_remove(struct platform_device *pdev) ++{ ++ struct device *dev = &pdev->dev; ++ struct buttons_dev *bdev = dev_get_drvdata(dev); ++ int i; ++ ++ input_unregister_polled_device(bdev->poll_dev); ++ input_free_polled_device(bdev->poll_dev); ++ kfree(bdev); ++ dev_set_drvdata(dev, NULL); ++ ++ for (i = 0; i < ARRAY_SIZE(input_keymap); i++) ++ gpio_free(input_gpio[i]); ++ ++ return 0; ++} ++ ++/* ++ * Driver initialisation ++ */ ++ ++static struct platform_driver boc_buttons_driver = { ++ .probe = boc_buttons_probe, ++ .remove = __devexit_p(boc_buttons_remove), ++ .driver = { ++ .name = "boc-btns", ++ .owner = THIS_MODULE, ++ }, ++}; ++ ++static struct platform_device *boc_buttons_device; ++ ++static int __init boc_buttons_init(void) ++{ ++ int err; ++ ++ err = platform_driver_register(&boc_buttons_driver); ++ if (err) ++ return err; ++ ++ boc_buttons_device = platform_device_alloc("boc-btns", -1); ++ if (!boc_buttons_device) { ++ err = -ENOMEM; ++ goto err_unregister_driver; ++ } ++ ++ err = platform_device_add(boc_buttons_device); ++ if (err) ++ goto err_free_device; ++ ++ return 0; ++ ++err_free_device: ++ platform_device_put(boc_buttons_device); ++err_unregister_driver: ++ platform_driver_unregister(&boc_buttons_driver); ++ return err; ++} ++ ++static void __exit boc_buttons_exit(void) ++{ ++ platform_device_unregister(boc_buttons_device); ++ platform_driver_unregister(&boc_buttons_driver); ++} ++ ++MODULE_AUTHOR("Jeremy Laine "); ++MODULE_DESCRIPTION("BoC input driver"); ++MODULE_LICENSE("GPL"); ++module_init(boc_buttons_init); ++module_exit(boc_buttons_exit); diff --git a/recipes/linux/linux-2.6.31/boc01/defconfig b/recipes/linux/linux-2.6.31/boc01/defconfig index ad7856ce85..56e10a04a0 100644 --- a/recipes/linux/linux-2.6.31/boc01/defconfig +++ b/recipes/linux/linux-2.6.31/boc01/defconfig @@ -1089,6 +1089,7 @@ CONFIG_INPUT_MISC=y # CONFIG_INPUT_CM109 is not set # CONFIG_INPUT_UINPUT is not set # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set +CONFIG_INPUT_BOC_BTNS=y CONFIG_INPUT_CAPSENSE_BTNS=y # diff --git a/recipes/linux/linux_2.6.31.bb b/recipes/linux/linux_2.6.31.bb index 0956afdf75..d908326016 100644 --- a/recipes/linux/linux_2.6.31.bb +++ b/recipes/linux/linux_2.6.31.bb @@ -30,6 +30,7 @@ SRC_URI_append_boc01 = "\ file://011-091028-gpio.patch;patch=1 \ file://012-091019-capsense.patch;patch=1 \ file://013-091015-lcd.patch;patch=1 \ + file://014-091030-buttons.patch;patch=1 \ " SRC_URI_append_collie = "\ -- cgit v1.2.3 From 056193c6638892ddde7bddbfc6f6f06a2288ba64 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Fri, 30 Oct 2009 12:48:03 +0100 Subject: Revert "package.bbclass: Cleanup getVar syntax to use True, not 1 as third argument (from Poky)" This reverts commit fcee557e1b0551d1743bbb3ad61102b9ccc4cba8. --- classes/package.bbclass | 120 ++++++++++++++++++++++++------------------------ 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/classes/package.bbclass b/classes/package.bbclass index e7865754eb..7a9b987c7c 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -28,12 +28,12 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst """ import os, os.path, bb - dvar = bb.data.getVar('D', d, True) + dvar = bb.data.getVar('D', d, 1) if not dvar: bb.error("D not defined") return - packages = bb.data.getVar('PACKAGES', d, True).split() + packages = bb.data.getVar('PACKAGES', d, 1).split() if postinst: postinst = '#!/bin/sh\n' + postinst + '\n' @@ -94,7 +94,7 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst the_files.append(aux_files_pattern_verbatim % m.group(1)) bb.data.setVar('FILES_' + pkg, " ".join(the_files), d) if extra_depends != '': - the_depends = bb.data.getVar('RDEPENDS_' + pkg, d, True) + the_depends = bb.data.getVar('RDEPENDS_' + pkg, d, 1) if the_depends: the_depends = '%s %s' % (the_depends, extra_depends) else: @@ -106,7 +106,7 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst if postrm: bb.data.setVar('pkg_postrm_' + pkg, postrm, d) else: - oldfiles = bb.data.getVar('FILES_' + pkg, d, True) + oldfiles = bb.data.getVar('FILES_' + pkg, d, 1) if not oldfiles: bb.fatal("Package '%s' exists but has no files" % pkg) bb.data.setVar('FILES_' + pkg, oldfiles + " " + os.path.join(root, o), d) @@ -152,7 +152,7 @@ def runstrip(file, d): import bb, os, commands, stat - pathprefix = "export PATH=%s; " % bb.data.getVar('PATH', d, True) + pathprefix = "export PATH=%s; " % bb.data.getVar('PATH', d, 1) ret, result = commands.getstatusoutput("%sfile '%s'" % (pathprefix, file)) @@ -169,8 +169,8 @@ def runstrip(file, d): bb.debug(2, "Already ran strip on %s" % file) return 0 - strip = bb.data.getVar("STRIP", d, True) - objcopy = bb.data.getVar("OBJCOPY", d, True) + strip = bb.data.getVar("STRIP", d, 1) + objcopy = bb.data.getVar("OBJCOPY", d, 1) newmode = None if not os.access(file, os.W_OK): @@ -268,10 +268,10 @@ def get_package_mapping (pkg, d): def runtime_mapping_rename (varname, d): import bb, os - #bb.note("%s before: %s" % (varname, bb.data.getVar(varname, d, True))) + #bb.note("%s before: %s" % (varname, bb.data.getVar(varname, d, 1))) new_depends = [] - for depend in explode_deps(bb.data.getVar(varname, d, True) or ""): + for depend in explode_deps(bb.data.getVar(varname, d, 1) or ""): # Have to be careful with any version component of the depend split_depend = depend.split(' (') new_depend = get_package_mapping(split_depend[0].strip(), d) @@ -282,7 +282,7 @@ def runtime_mapping_rename (varname, d): bb.data.setVar(varname, " ".join(new_depends) or None, d) - #bb.note("%s after: %s" % (varname, bb.data.getVar(varname, d, True))) + #bb.note("%s after: %s" % (varname, bb.data.getVar(varname, d, 1))) # # Package functions suitable for inclusion in PACKAGEFUNCS @@ -291,23 +291,23 @@ def runtime_mapping_rename (varname, d): python package_do_split_locales() { import os - if (bb.data.getVar('PACKAGE_NO_LOCALE', d, True) == '1'): + if (bb.data.getVar('PACKAGE_NO_LOCALE', d, 1) == '1'): bb.debug(1, "package requested not splitting locales") return - packages = (bb.data.getVar('PACKAGES', d, True) or "").split() + packages = (bb.data.getVar('PACKAGES', d, 1) or "").split() - datadir = bb.data.getVar('datadir', d, True) + datadir = bb.data.getVar('datadir', d, 1) if not datadir: bb.note("datadir not defined") return - dvar = bb.data.getVar('D', d, True) + dvar = bb.data.getVar('D', d, 1) if not dvar: bb.error("D not defined") return - pn = bb.data.getVar('PN', d, True) + pn = bb.data.getVar('PN', d, 1) if not pn: bb.error("PN not defined") return @@ -346,27 +346,27 @@ python package_do_split_locales() { python populate_packages () { import glob, stat, errno, re - workdir = bb.data.getVar('WORKDIR', d, True) + workdir = bb.data.getVar('WORKDIR', d, 1) if not workdir: bb.error("WORKDIR not defined, unable to package") return import os # path manipulations - outdir = bb.data.getVar('DEPLOY_DIR', d, True) + outdir = bb.data.getVar('DEPLOY_DIR', d, 1) if not outdir: bb.error("DEPLOY_DIR not defined, unable to package") return bb.mkdirhier(outdir) - dvar = bb.data.getVar('D', d, True) + dvar = bb.data.getVar('D', d, 1) if not dvar: bb.error("D not defined, unable to package") return bb.mkdirhier(dvar) - packages = bb.data.getVar('PACKAGES', d, True) + packages = bb.data.getVar('PACKAGES', d, 1) - pn = bb.data.getVar('PN', d, True) + pn = bb.data.getVar('PN', d, 1) if not pn: bb.error("PN not defined") return @@ -392,19 +392,19 @@ python populate_packages () { else: package_list.append(pkg) - if (bb.data.getVar('INHIBIT_PACKAGE_STRIP', d, True) != '1'): + if (bb.data.getVar('INHIBIT_PACKAGE_STRIP', d, 1) != '1'): for root, dirs, files in os.walk(dvar): for f in files: file = os.path.join(root, f) if not os.path.islink(file) and not os.path.isdir(file) and isexec(file): runstrip(file, d) - pkgdest = bb.data.getVar('PKGDEST', d, True) + pkgdest = bb.data.getVar('PKGDEST', d, 1) os.system('rm -rf %s' % pkgdest) seen = [] main_is_empty = 1 - main_pkg = bb.data.getVar('PN', d, True) + main_pkg = bb.data.getVar('PN', d, 1) for pkg in package_list: localdata = bb.data.createCopy(d) @@ -412,13 +412,13 @@ python populate_packages () { bb.mkdirhier(root) bb.data.setVar('PKG', pkg, localdata) - overrides = bb.data.getVar('OVERRIDES', localdata, True) + overrides = bb.data.getVar('OVERRIDES', localdata, 1) if not overrides: raise bb.build.FuncFailed('OVERRIDES not defined') bb.data.setVar('OVERRIDES', overrides + ':' + pkg, localdata) bb.data.update_data(localdata) - filesvar = bb.data.getVar('FILES', localdata, True) or "" + filesvar = bb.data.getVar('FILES', localdata, 1) or "" files = filesvar.split() for file in files: if os.path.isabs(file): @@ -473,7 +473,7 @@ python populate_packages () { bb.build.exec_func("package_name_hook", d) for pkg in package_list: - pkgname = bb.data.getVar('PKG_%s' % pkg, d, True) + pkgname = bb.data.getVar('PKG_%s' % pkg, d, 1) if pkgname is None: bb.data.setVar('PKG_%s' % pkg, pkg, d) @@ -532,11 +532,11 @@ python emit_pkgdata() { c = codecs.getencoder("string_escape") return c(str)[0] - val = bb.data.getVar('%s_%s' % (var, pkg), d, True) + val = bb.data.getVar('%s_%s' % (var, pkg), d, 1) if val: f.write('%s_%s: %s\n' % (var, pkg, encode(val))) return - val = bb.data.getVar('%s' % (var), d, True) + val = bb.data.getVar('%s' % (var), d, 1) if val: f.write('%s: %s\n' % (var, encode(val))) return @@ -554,7 +554,7 @@ python emit_pkgdata() { f.close() package_stagefile(data_file, d) - workdir = bb.data.getVar('WORKDIR', d, True) + workdir = bb.data.getVar('WORKDIR', d, 1) for pkg in packages.split(): subdata_file = pkgdatadir + "/runtime/%s" % pkg @@ -582,9 +582,9 @@ python emit_pkgdata() { #if pkgdatadir2: # bb.copyfile(subdata_file, pkgdatadir2 + "/runtime/%s" % pkg) - allow_empty = bb.data.getVar('ALLOW_EMPTY_%s' % pkg, d, True) + allow_empty = bb.data.getVar('ALLOW_EMPTY_%s' % pkg, d, 1) if not allow_empty: - allow_empty = bb.data.getVar('ALLOW_EMPTY', d, True) + allow_empty = bb.data.getVar('ALLOW_EMPTY', d, 1) root = "%s/install/%s" % (workdir, pkg) os.chdir(root) g = glob('*') + glob('.[!.]*') @@ -618,21 +618,21 @@ python package_do_shlibs() { lib_re = re.compile("^lib.*\.so") libdir_re = re.compile(".*/lib$") - packages = bb.data.getVar('PACKAGES', d, True) + packages = bb.data.getVar('PACKAGES', d, 1) - workdir = bb.data.getVar('WORKDIR', d, True) + workdir = bb.data.getVar('WORKDIR', d, 1) if not workdir: bb.error("WORKDIR not defined") return - ver = bb.data.getVar('PV', d, True) + ver = bb.data.getVar('PV', d, 1) if not ver: bb.error("PV not defined") return - pkgdest = bb.data.getVar('PKGDEST', d, True) + pkgdest = bb.data.getVar('PKGDEST', d, 1) - shlibs_dir = bb.data.getVar('SHLIBSDIR', d, True) + shlibs_dir = bb.data.getVar('SHLIBSDIR', d, 1) bb.mkdirhier(shlibs_dir) pstageactive = bb.data.getVar('PSTAGING_ACTIVE', d, True) @@ -650,12 +650,12 @@ python package_do_shlibs() { use_ldconfig = False needed = {} - private_libs = bb.data.getVar('PRIVATE_LIBS', d, True) + private_libs = bb.data.getVar('PRIVATE_LIBS', d, 1) for pkg in packages.split(): needs_ldconfig = False bb.debug(2, "calculating shlib provides for %s" % pkg) - pkgver = bb.data.getVar('PV_' + pkg, d, True) + pkgver = bb.data.getVar('PV_' + pkg, d, 1) if not pkgver: pkgver = ver @@ -668,8 +668,8 @@ python package_do_shlibs() { soname = None path = os.path.join(root, file) if (os.access(path, os.X_OK) or lib_re.match(file)) and not os.path.islink(path): - cmd = bb.data.getVar('OBJDUMP', d, True) + " -p " + path + " 2>/dev/null" - cmd = "PATH=\"%s\" %s" % (bb.data.getVar('PATH', d, True), cmd) + cmd = bb.data.getVar('OBJDUMP', d, 1) + " -p " + path + " 2>/dev/null" + cmd = "PATH=\"%s\" %s" % (bb.data.getVar('PATH', d, 1), cmd) fd = os.popen(cmd) lines = fd.readlines() fd.close() @@ -708,10 +708,10 @@ python package_do_shlibs() { package_stagefile(shver_file, d) if needs_ldconfig and use_ldconfig: bb.debug(1, 'adding ldconfig call to postinst for %s' % pkg) - postinst = bb.data.getVar('pkg_postinst_%s' % pkg, d, True) or bb.data.getVar('pkg_postinst', d, True) + postinst = bb.data.getVar('pkg_postinst_%s' % pkg, d, 1) or bb.data.getVar('pkg_postinst', d, 1) if not postinst: postinst = '#!/bin/sh\n' - postinst += bb.data.getVar('ldconfig_postinst_fragment', d, True) + postinst += bb.data.getVar('ldconfig_postinst_fragment', d, 1) bb.data.setVar('pkg_postinst_%s' % pkg, postinst, d) if pstageactive == "1": @@ -738,7 +738,7 @@ python package_do_shlibs() { for l in lines: shlib_provider[l.rstrip()] = (dep_pkg, lib_ver) - assumed_libs = bb.data.getVar('ASSUME_SHLIBS', d, True) + assumed_libs = bb.data.getVar('ASSUME_SHLIBS', d, 1) if assumed_libs: for e in assumed_libs.split(): l, dep_pkg = e.split(":") @@ -786,16 +786,16 @@ python package_do_shlibs() { python package_do_pkgconfig () { import re, os - packages = bb.data.getVar('PACKAGES', d, True) + packages = bb.data.getVar('PACKAGES', d, 1) - workdir = bb.data.getVar('WORKDIR', d, True) + workdir = bb.data.getVar('WORKDIR', d, 1) if not workdir: bb.error("WORKDIR not defined") return - pkgdest = bb.data.getVar('PKGDEST', d, True) + pkgdest = bb.data.getVar('PKGDEST', d, 1) - shlibs_dir = bb.data.getVar('SHLIBSDIR', d, True) + shlibs_dir = bb.data.getVar('SHLIBSDIR', d, 1) bb.mkdirhier(shlibs_dir) pc_re = re.compile('(.*)\.pc$') @@ -890,7 +890,7 @@ python package_do_pkgconfig () { } python read_shlibdeps () { - packages = bb.data.getVar('PACKAGES', d, True).split() + packages = bb.data.getVar('PACKAGES', d, 1).split() for pkg in packages: rdepends = explode_deps(bb.data.getVar('RDEPENDS_' + pkg, d, 0) or bb.data.getVar('RDEPENDS', d, 0) or "") for extension in ".shlibdeps", ".pcdeps", ".clilibdeps": @@ -918,14 +918,14 @@ python package_depchains() { package. """ - packages = bb.data.getVar('PACKAGES', d, True) - postfixes = (bb.data.getVar('DEPCHAIN_POST', d, True) or '').split() - prefixes = (bb.data.getVar('DEPCHAIN_PRE', d, True) or '').split() + packages = bb.data.getVar('PACKAGES', d, 1) + postfixes = (bb.data.getVar('DEPCHAIN_POST', d, 1) or '').split() + prefixes = (bb.data.getVar('DEPCHAIN_PRE', d, 1) or '').split() def pkg_adddeprrecs(pkg, base, suffix, getname, depends, d): #bb.note('depends for %s is %s' % (base, depends)) - rreclist = explode_deps(bb.data.getVar('RRECOMMENDS_' + pkg, d, True) or bb.data.getVar('RRECOMMENDS', d, True) or "") + rreclist = explode_deps(bb.data.getVar('RRECOMMENDS_' + pkg, d, 1) or bb.data.getVar('RRECOMMENDS', d, 1) or "") for depend in depends: if depend.find('-native') != -1 or depend.find('-cross') != -1 or depend.startswith('virtual/'): @@ -946,7 +946,7 @@ python package_depchains() { def pkg_addrrecs(pkg, base, suffix, getname, rdepends, d): #bb.note('rdepends for %s is %s' % (base, rdepends)) - rreclist = explode_deps(bb.data.getVar('RRECOMMENDS_' + pkg, d, True) or bb.data.getVar('RRECOMMENDS', d, True) or "") + rreclist = explode_deps(bb.data.getVar('RRECOMMENDS_' + pkg, d, 1) or bb.data.getVar('RRECOMMENDS', d, 1) or "") for depend in rdepends: if depend.endswith('-dev'): @@ -966,15 +966,15 @@ python package_depchains() { list.append(dep) depends = [] - for dep in explode_deps(bb.data.getVar('DEPENDS', d, True) or ""): + for dep in explode_deps(bb.data.getVar('DEPENDS', d, 1) or ""): add_dep(depends, dep) rdepends = [] - for dep in explode_deps(bb.data.getVar('RDEPENDS', d, True) or ""): + for dep in explode_deps(bb.data.getVar('RDEPENDS', d, 1) or ""): add_dep(rdepends, dep) for pkg in packages.split(): - for dep in explode_deps(bb.data.getVar('RDEPENDS_' + pkg, d, True) or ""): + for dep in explode_deps(bb.data.getVar('RDEPENDS_' + pkg, d, 1) or ""): add_dep(rdepends, dep) #bb.note('rdepends is %s' % rdepends) @@ -1007,7 +1007,7 @@ python package_depchains() { pkg_addrrecs(pkg, base, suffix, func, rdepends, d) else: rdeps = [] - for dep in explode_deps(bb.data.getVar('RDEPENDS_' + base, d, True) or bb.data.getVar('RDEPENDS', d, True) or ""): + for dep in explode_deps(bb.data.getVar('RDEPENDS_' + base, d, 1) or bb.data.getVar('RDEPENDS', d, 1) or ""): add_dep(rdeps, dep) pkg_addrrecs(pkg, base, suffix, func, rdeps, d) } @@ -1035,7 +1035,7 @@ def package_run_hooks(f, d): bb.parse.parse_py.BBHandler.feeder(line, l, fn, os.path.basename(fn), d) line += 1 fp.close() - anonqueue = bb.data.getVar("__anonqueue", d, True) or [] + anonqueue = bb.data.getVar("__anonqueue", d, 1) or [] body = [x['content'] for x in anonqueue] flag = { 'python' : 1, 'func' : 1 } bb.data.setVar("__anonfunc", "\n".join(body), d) @@ -1054,12 +1054,12 @@ def package_run_hooks(f, d): bb.data.delVar("__anonfunc", d) python package_do_package () { - packages = (bb.data.getVar('PACKAGES', d, True) or "").split() + packages = (bb.data.getVar('PACKAGES', d, 1) or "").split() if len(packages) < 1: bb.debug(1, "No packages to build, skipping do_package") return - for f in (bb.data.getVar('PACKAGEFUNCS', d, True) or '').split(): + for f in (bb.data.getVar('PACKAGEFUNCS', d, 1) or '').split(): bb.build.exec_func(f, d) package_run_hooks(f, d) } -- cgit v1.2.3 From 050c77a7fe37cf6a4875b5ce3db809e32ebed149 Mon Sep 17 00:00:00 2001 From: OE Builder Date: Fri, 30 Oct 2009 13:33:44 +0100 Subject: linux-2.6.31: make capsense keys remapable for boc01 --- .../linux-2.6.31/boc01/012-091019-capsense.patch | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/recipes/linux/linux-2.6.31/boc01/012-091019-capsense.patch b/recipes/linux/linux-2.6.31/boc01/012-091019-capsense.patch index d82f8b1e54..ae5428ddd0 100644 --- a/recipes/linux/linux-2.6.31/boc01/012-091019-capsense.patch +++ b/recipes/linux/linux-2.6.31/boc01/012-091019-capsense.patch @@ -1,7 +1,7 @@ Index: linux-2.6.31/drivers/input/misc/Kconfig =================================================================== ---- linux-2.6.31.orig/drivers/input/misc/Kconfig 2009-10-19 16:32:13.000000000 +0200 -+++ linux-2.6.31/drivers/input/misc/Kconfig 2009-10-19 16:49:22.000000000 +0200 +--- linux-2.6.31.orig/drivers/input/misc/Kconfig 2009-10-30 12:50:24.000000000 +0100 ++++ linux-2.6.31/drivers/input/misc/Kconfig 2009-10-30 13:20:50.000000000 +0100 @@ -269,4 +269,14 @@ To compile this driver as a module, choose M here: the @@ -19,8 +19,8 @@ Index: linux-2.6.31/drivers/input/misc/Kconfig endif Index: linux-2.6.31/drivers/input/misc/Makefile =================================================================== ---- linux-2.6.31.orig/drivers/input/misc/Makefile 2009-10-19 16:32:13.000000000 +0200 -+++ linux-2.6.31/drivers/input/misc/Makefile 2009-10-19 16:49:22.000000000 +0200 +--- linux-2.6.31.orig/drivers/input/misc/Makefile 2009-10-30 12:50:24.000000000 +0100 ++++ linux-2.6.31/drivers/input/misc/Makefile 2009-10-30 13:20:50.000000000 +0100 @@ -26,3 +26,4 @@ obj-$(CONFIG_INPUT_UINPUT) += uinput.o obj-$(CONFIG_INPUT_WISTRON_BTNS) += wistron_btns.o @@ -29,8 +29,8 @@ Index: linux-2.6.31/drivers/input/misc/Makefile Index: linux-2.6.31/drivers/input/misc/capsense-btns.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.31/drivers/input/misc/capsense-btns.c 2009-10-19 16:49:22.000000000 +0200 -@@ -0,0 +1,440 @@ ++++ linux-2.6.31/drivers/input/misc/capsense-btns.c 2009-10-30 13:21:11.000000000 +0100 +@@ -0,0 +1,443 @@ +/* + * CAPSENSE Interface driver + * @@ -185,9 +185,12 @@ Index: linux-2.6.31/drivers/input/misc/capsense-btns.c + changed = capsense->key_state ^ new_state; + for (i = 0; i < ARRAY_SIZE(input_keymap); i++) + if (changed & (1 << i)) ++ { ++ input_event(dev->input, EV_MSC, MSC_SCAN, i); + input_report_key(dev->input, input_keymap[i], (new_state & (1 << i))); ++ input_sync(dev->input); ++ } + capsense->key_state = new_state; -+ input_sync(dev->input); +} + + @@ -474,7 +477,7 @@ Index: linux-2.6.31/drivers/input/misc/capsense-btns.c Index: linux-2.6.31/drivers/input/misc/capsense-procfs.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.31/drivers/input/misc/capsense-procfs.c 2009-10-19 16:50:35.000000000 +0200 ++++ linux-2.6.31/drivers/input/misc/capsense-procfs.c 2009-10-30 13:20:03.000000000 +0100 @@ -0,0 +1,380 @@ +/* + * CAPSENSE Interface driver -- cgit v1.2.3 From 27009b0a42b77dde41e43c704e75898b5f0ef9ff Mon Sep 17 00:00:00 2001 From: OE Builder Date: Fri, 30 Oct 2009 13:51:22 +0100 Subject: linux-2.6.31: improve GPIO support for boc01 --- recipes/linux/linux-2.6.31/boc01/011-091028-gpio.patch | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/recipes/linux/linux-2.6.31/boc01/011-091028-gpio.patch b/recipes/linux/linux-2.6.31/boc01/011-091028-gpio.patch index c71f9e6289..12f5435599 100644 --- a/recipes/linux/linux-2.6.31/boc01/011-091028-gpio.patch +++ b/recipes/linux/linux-2.6.31/boc01/011-091028-gpio.patch @@ -1,7 +1,7 @@ Index: linux-2.6.31/arch/powerpc/platforms/83xx/mpc831x_rdb.c =================================================================== ---- linux-2.6.31.orig/arch/powerpc/platforms/83xx/mpc831x_rdb.c 2009-10-29 16:31:14.000000000 +0100 -+++ linux-2.6.31/arch/powerpc/platforms/83xx/mpc831x_rdb.c 2009-10-29 17:23:51.000000000 +0100 +--- linux-2.6.31.orig/arch/powerpc/platforms/83xx/mpc831x_rdb.c 2009-09-10 00:13:59.000000000 +0200 ++++ linux-2.6.31/arch/powerpc/platforms/83xx/mpc831x_rdb.c 2009-10-30 12:44:52.000000000 +0100 @@ -13,6 +13,7 @@ * option) any later version. */ @@ -18,7 +18,7 @@ Index: linux-2.6.31/arch/powerpc/platforms/83xx/mpc831x_rdb.c #include "mpc83xx.h" -@@ -79,7 +81,22 @@ +@@ -79,7 +81,21 @@ static int __init declare_of_platform_devices(void) { @@ -29,13 +29,12 @@ Index: linux-2.6.31/arch/powerpc/platforms/83xx/mpc831x_rdb.c + of_platform_bus_probe(NULL, of_bus_ids, NULL); + -+ /* activate USB, RFID and touch board */ ++ /* activate USB and RFID */ + np = of_find_compatible_node(NULL, NULL, "fsl,mpc8313-exio"); + if (np) + { + gpio_direction_output(217, 1); // EXIO1 : USB + gpio_direction_output(219, 1); // EXIO3 : RFID -+ gpio_direction_output(220, 1); // EXIO4 : Touch board + of_node_put(np); + } return 0; -- cgit v1.2.3 From 7cfed4fa3768dc37a4649b654d0fec8953c62001 Mon Sep 17 00:00:00 2001 From: OE Builder Date: Fri, 30 Oct 2009 14:15:33 +0100 Subject: linux-2.6.31: add support for multiple buttons on boc01 --- .../linux-2.6.31/boc01/014-091030-buttons.patch | 43 +++++++++++++--------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/recipes/linux/linux-2.6.31/boc01/014-091030-buttons.patch b/recipes/linux/linux-2.6.31/boc01/014-091030-buttons.patch index 9e56ad12b0..c589a47086 100644 --- a/recipes/linux/linux-2.6.31/boc01/014-091030-buttons.patch +++ b/recipes/linux/linux-2.6.31/boc01/014-091030-buttons.patch @@ -1,7 +1,7 @@ Index: linux-2.6.31/drivers/input/misc/Kconfig =================================================================== ---- linux-2.6.31.orig/drivers/input/misc/Kconfig 2009-10-30 11:08:24.000000000 +0100 -+++ linux-2.6.31/drivers/input/misc/Kconfig 2009-10-30 11:08:32.000000000 +0100 +--- linux-2.6.31.orig/drivers/input/misc/Kconfig 2009-10-30 13:52:02.000000000 +0100 ++++ linux-2.6.31/drivers/input/misc/Kconfig 2009-10-30 13:52:02.000000000 +0100 @@ -270,6 +270,13 @@ To compile this driver as a module, choose M here: the module will be called dm355evm_keys. @@ -18,8 +18,8 @@ Index: linux-2.6.31/drivers/input/misc/Kconfig select INPUT_POLLDEV Index: linux-2.6.31/drivers/input/misc/Makefile =================================================================== ---- linux-2.6.31.orig/drivers/input/misc/Makefile 2009-10-30 11:08:51.000000000 +0100 -+++ linux-2.6.31/drivers/input/misc/Makefile 2009-10-30 11:08:58.000000000 +0100 +--- linux-2.6.31.orig/drivers/input/misc/Makefile 2009-10-30 13:52:02.000000000 +0100 ++++ linux-2.6.31/drivers/input/misc/Makefile 2009-10-30 13:52:02.000000000 +0100 @@ -26,4 +26,5 @@ obj-$(CONFIG_INPUT_UINPUT) += uinput.o obj-$(CONFIG_INPUT_WISTRON_BTNS) += wistron_btns.o @@ -29,8 +29,8 @@ Index: linux-2.6.31/drivers/input/misc/Makefile Index: linux-2.6.31/drivers/input/misc/boc-btns.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.31/drivers/input/misc/boc-btns.c 2009-10-30 11:57:13.000000000 +0100 -@@ -0,0 +1,200 @@ ++++ linux-2.6.31/drivers/input/misc/boc-btns.c 2009-10-30 13:52:26.000000000 +0100 +@@ -0,0 +1,209 @@ +/* + * Buttons for BoC + * @@ -61,17 +61,23 @@ Index: linux-2.6.31/drivers/input/misc/boc-btns.c + +#define BUTTONS_POLL_INTERVAL 30 /* msec */ + -+static unsigned char input_gpio[] = { -+ 231, // reset button ++struct input_button { ++ unsigned char gpio; ++ unsigned char active_low; ++}; ++ ++static struct input_button input_buttons[] = { ++ { 220, 1 }, // WPS button (active low) ++ { 231, 0 }, // reset button +}; + +static unsigned short input_keymap[] = { -+ KEY_ESC, ++ KEY_F2, ++ KEY_F3, +}; + +struct buttons_dev { + struct input_polled_dev *poll_dev; -+ unsigned short keymap[ARRAY_SIZE(input_keymap)]; + int state[ARRAY_SIZE(input_keymap)]; +}; + @@ -88,7 +94,7 @@ Index: linux-2.6.31/drivers/input/misc/boc-btns.c + // read GPIO + for (i = 0; i < ARRAY_SIZE(input_keymap); i++) + { -+ value = gpio_get_value(input_gpio[i]); ++ value = gpio_get_value(input_buttons[i].gpio) ^ input_buttons[i].active_low; + if (value != bdev->state[i]) + { + input_event(input, EV_MSC, MSC_SCAN, i); @@ -112,7 +118,7 @@ Index: linux-2.6.31/drivers/input/misc/boc-btns.c + + for (i = 0; i < ARRAY_SIZE(input_keymap); i++) + { -+ if (gpio_request(input_gpio[i], NULL) < 0) ++ if (gpio_request(input_buttons[i].gpio, NULL) < 0) + return -ENODEV; + } + @@ -126,8 +132,6 @@ Index: linux-2.6.31/drivers/input/misc/boc-btns.c + goto out_allocated; + } + -+ memcpy(bdev->keymap, input_keymap, sizeof(bdev->keymap)); -+ + poll_dev->private = bdev; + poll_dev->poll = handle_buttons; + poll_dev->poll_interval = BUTTONS_POLL_INTERVAL; @@ -138,12 +142,17 @@ Index: linux-2.6.31/drivers/input/misc/boc-btns.c + input->id.bustype = BUS_HOST; + input->dev.parent = &pdev->dev; + -+ input->keycode = bdev->keymap; -+ input->keycodemax = ARRAY_SIZE(bdev->keymap); ++ input->keycode = input_keymap; ++ input->keycodemax = ARRAY_SIZE(input_keymap); + input->keycodesize = sizeof(unsigned short); + + input_set_capability(input, EV_MSC, MSC_SCAN); + set_bit(EV_KEY, input->evbit); ++ for (i = 0; i < ARRAY_SIZE(input_keymap); i++) ++ { ++ set_bit(input_keymap[i], input->keybit); ++ bdev->state[i] = 0; ++ } + + bdev->poll_dev = poll_dev; + dev_set_drvdata(&pdev->dev, bdev); @@ -173,7 +182,7 @@ Index: linux-2.6.31/drivers/input/misc/boc-btns.c + dev_set_drvdata(dev, NULL); + + for (i = 0; i < ARRAY_SIZE(input_keymap); i++) -+ gpio_free(input_gpio[i]); ++ gpio_free(input_buttons[i].gpio); + + return 0; +} -- cgit v1.2.3 From f8cfca44d691659003e92605f2f2a2549139edb8 Mon Sep 17 00:00:00 2001 From: OE Builder Date: Fri, 30 Oct 2009 14:48:22 +0100 Subject: linux-2.6.31: fix GPIO keys for boc01 --- .../linux/linux-2.6.31/boc01/014-091030-buttons.patch | 16 +++++++++------- recipes/linux/linux-2.6.31/boc01/defconfig | 4 ++-- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/recipes/linux/linux-2.6.31/boc01/014-091030-buttons.patch b/recipes/linux/linux-2.6.31/boc01/014-091030-buttons.patch index c589a47086..6b2dba1337 100644 --- a/recipes/linux/linux-2.6.31/boc01/014-091030-buttons.patch +++ b/recipes/linux/linux-2.6.31/boc01/014-091030-buttons.patch @@ -1,7 +1,7 @@ Index: linux-2.6.31/drivers/input/misc/Kconfig =================================================================== ---- linux-2.6.31.orig/drivers/input/misc/Kconfig 2009-10-30 13:52:02.000000000 +0100 -+++ linux-2.6.31/drivers/input/misc/Kconfig 2009-10-30 13:52:02.000000000 +0100 +--- linux-2.6.31.orig/drivers/input/misc/Kconfig 2009-10-30 14:22:53.000000000 +0100 ++++ linux-2.6.31/drivers/input/misc/Kconfig 2009-10-30 14:22:53.000000000 +0100 @@ -270,6 +270,13 @@ To compile this driver as a module, choose M here: the module will be called dm355evm_keys. @@ -18,8 +18,8 @@ Index: linux-2.6.31/drivers/input/misc/Kconfig select INPUT_POLLDEV Index: linux-2.6.31/drivers/input/misc/Makefile =================================================================== ---- linux-2.6.31.orig/drivers/input/misc/Makefile 2009-10-30 13:52:02.000000000 +0100 -+++ linux-2.6.31/drivers/input/misc/Makefile 2009-10-30 13:52:02.000000000 +0100 +--- linux-2.6.31.orig/drivers/input/misc/Makefile 2009-10-30 14:22:53.000000000 +0100 ++++ linux-2.6.31/drivers/input/misc/Makefile 2009-10-30 14:22:53.000000000 +0100 @@ -26,4 +26,5 @@ obj-$(CONFIG_INPUT_UINPUT) += uinput.o obj-$(CONFIG_INPUT_WISTRON_BTNS) += wistron_btns.o @@ -29,8 +29,8 @@ Index: linux-2.6.31/drivers/input/misc/Makefile Index: linux-2.6.31/drivers/input/misc/boc-btns.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.31/drivers/input/misc/boc-btns.c 2009-10-30 13:52:26.000000000 +0100 -@@ -0,0 +1,209 @@ ++++ linux-2.6.31/drivers/input/misc/boc-btns.c 2009-10-30 14:24:42.000000000 +0100 +@@ -0,0 +1,211 @@ +/* + * Buttons for BoC + * @@ -94,7 +94,9 @@ Index: linux-2.6.31/drivers/input/misc/boc-btns.c + // read GPIO + for (i = 0; i < ARRAY_SIZE(input_keymap); i++) + { -+ value = gpio_get_value(input_buttons[i].gpio) ^ input_buttons[i].active_low; ++ value = gpio_get_value(input_buttons[i].gpio) ? 1 : 0; ++ if (input_buttons[i].active_low) ++ value = !value; + if (value != bdev->state[i]) + { + input_event(input, EV_MSC, MSC_SCAN, i); diff --git a/recipes/linux/linux-2.6.31/boc01/defconfig b/recipes/linux/linux-2.6.31/boc01/defconfig index 56e10a04a0..ae2b9b510e 100644 --- a/recipes/linux/linux-2.6.31/boc01/defconfig +++ b/recipes/linux/linux-2.6.31/boc01/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.31.3 -# Wed Oct 28 11:48:05 2009 +# Fri Oct 30 14:31:19 2009 # # CONFIG_PPC64 is not set @@ -1061,7 +1061,7 @@ CONFIG_INPUT_POLLDEV=y # CONFIG_INPUT_MOUSEDEV is not set # CONFIG_INPUT_JOYDEV is not set CONFIG_INPUT_EVDEV=y -CONFIG_INPUT_EVBUG=y +# CONFIG_INPUT_EVBUG is not set # # Input Device Drivers -- cgit v1.2.3 From 19c643967399ff50d4bc48f603b219794e920d39 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 30 Oct 2009 15:23:10 +0100 Subject: revert sane-srcrevs: add webkit-efl|gtk: webkit gtk srcrev was moved to recipe in b34f0987f71bbefaf914415cce6bad418a3e3d06 and bumped as well. Since the autofoo files in OE are tied to the SRCREV care needs to be taken when bumping it, this commit actually makes it go backward. Maybe we should ban people that have recently gained commit access from poking at conf/distro for the first few weeks to avoid fuckups like this. http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=b34f0987f71bbefaf914415cce6bad418a3e3d06 --- conf/distro/include/sane-srcrevs.inc | 1 - 1 file changed, 1 deletion(-) diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 78b6453ff3..715416798d 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -233,7 +233,6 @@ SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19" SRCREV_pn-usbpath ?= "3172" SRCREV_pn-usbpath-native ?= "3172" SRCREV_pn-webkit-efl ?= "3a5ee77664c898ed51a2b2d5759822f8c0a06472" -SRCREV_pn-webkit-gtk ?= "48579" SRCREV_pn-wlan-ng-modules ?= "1859" SRCREV_pn-wlan-ng-utils ?= "1859" SRCREV_pn-wmiconfig ?= "5394" -- cgit v1.2.3 From 94588289475beb1d044eafbf787bfa1180c4670f Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 30 Oct 2009 13:00:14 -0700 Subject: eglibc: Backport IO-acquire-lock-fix.patch * Move the svn recipe to latest git revision. Signed-off-by: Khem Raj --- recipes/eglibc/eglibc_2.10.bb | 3 ++- recipes/eglibc/eglibc_2.9.bb | 3 ++- recipes/eglibc/eglibc_svn.bb | 3 ++- recipes/eglibc/files/IO-acquire-lock-fix.patch | 15 +++++++++++++++ 4 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 recipes/eglibc/files/IO-acquire-lock-fix.patch diff --git a/recipes/eglibc/eglibc_2.10.bb b/recipes/eglibc/eglibc_2.10.bb index 1bd3d6e5da..d143b0ad0c 100644 --- a/recipes/eglibc/eglibc_2.10.bb +++ b/recipes/eglibc/eglibc_2.10.bb @@ -3,12 +3,13 @@ require eglibc.inc DEPENDS += "gperf-native" FILESPATHPKG =. "eglibc-svn:" PV = "2.10" -PR = "${INC_PR}.3" +PR = "${INC_PR}.4" SVN_REV="9124" EGLIBC_BRANCH="eglibc-2_10" SRC_URI = "svn://svn.eglibc.org/branches;module=eglibc-2_10;rev=${SVN_REV};proto=svn \ file://eglibc-svn-arm-lowlevellock-include-tls.patch;patch=1 \ file://armv4t-interworking.patch;patch=1 \ + file://IO-acquire-lock-fix.patch;patch=1 \ file://etc/ld.so.conf \ file://generate-supported.mk" S = "${WORKDIR}/${EGLIBC_BRANCH}/libc" diff --git a/recipes/eglibc/eglibc_2.9.bb b/recipes/eglibc/eglibc_2.9.bb index 6b27745f65..3efcb36d37 100644 --- a/recipes/eglibc/eglibc_2.9.bb +++ b/recipes/eglibc/eglibc_2.9.bb @@ -3,12 +3,13 @@ require eglibc.inc DEPENDS += "gperf-native" FILESPATHPKG =. "eglibc-svn:" PV = "2.9" -PR = "${INC_PR}.4" +PR = "${INC_PR}.5" SVN_REV="8690" EGLIBC_BRANCH="eglibc-2_9" SRC_URI = "svn://svn.eglibc.org/branches;module=eglibc-2_9;rev=${SVN_REV};proto=svn \ file://eglibc-svn-arm-lowlevellock-include-tls.patch;patch=1 \ file://armv4t-interworking.patch;patch=1 \ + file://IO-acquire-lock-fix.patch;patch=1 \ file://etc/ld.so.conf \ file://generate-supported.mk" S = "${WORKDIR}/${EGLIBC_BRANCH}/libc" diff --git a/recipes/eglibc/eglibc_svn.bb b/recipes/eglibc/eglibc_svn.bb index 1988350e6b..1a91af88d8 100644 --- a/recipes/eglibc/eglibc_svn.bb +++ b/recipes/eglibc/eglibc_svn.bb @@ -1,7 +1,7 @@ require eglibc.inc DEPENDS += "gperf-native" -SRCREV = "9123" +SRCREV = "9170" DEFAULT_PREFERENCE = "-1" FILESPATHPKG =. "eglibc-svn:" PV = "2.10+svnr${SRCREV}" @@ -10,6 +10,7 @@ EGLIBC_BRANCH="trunk" SRC_URI = "svn://svn.eglibc.org;module=trunk \ file://eglibc-svn-arm-lowlevellock-include-tls.patch;patch=1 \ file://armv4t-interworking.patch;patch=1 \ + file://IO-acquire-lock-fix.patch;patch=1 \ file://etc/ld.so.conf \ file://generate-supported.mk" S = "${WORKDIR}/${EGLIBC_BRANCH}/libc" diff --git a/recipes/eglibc/files/IO-acquire-lock-fix.patch b/recipes/eglibc/files/IO-acquire-lock-fix.patch new file mode 100644 index 0000000000..4d3e0613b1 --- /dev/null +++ b/recipes/eglibc/files/IO-acquire-lock-fix.patch @@ -0,0 +1,15 @@ +import http://sourceware.org/ml/libc-ports/2007-12/msg00000.html + +Index: libc/bits/stdio-lock.h +=================================================================== +--- libc.orig/bits/stdio-lock.h 2009-10-28 14:34:19.000000000 -0700 ++++ libc/bits/stdio-lock.h 2009-10-28 14:34:54.000000000 -0700 +@@ -50,6 +50,8 @@ __libc_lock_define_recursive (typedef, _ + _IO_cleanup_region_start ((void (*) (void *)) _IO_funlockfile, (_fp)); \ + _IO_flockfile (_fp) + ++# define _IO_acquire_lock_clear_flags2(_fp) _IO_acquire_lock (_fp) ++ + # define _IO_release_lock(_fp) \ + _IO_funlockfile (_fp); \ + _IO_cleanup_region_end (0) -- cgit v1.2.3 From 2ec047c78aea8d59e538d826d0c0187ca54e214d Mon Sep 17 00:00:00 2001 From: Thomas Kunze Date: Fri, 30 Oct 2009 21:01:34 +0100 Subject: tune-strongarm.inc: remove setting of oabi. With gcc 4.4 we can use eabi. Distros can reset this if they want. --- conf/machine/include/tune-strongarm.inc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/conf/machine/include/tune-strongarm.inc b/conf/machine/include/tune-strongarm.inc index 2a583fe6e4..fc4737999d 100644 --- a/conf/machine/include/tune-strongarm.inc +++ b/conf/machine/include/tune-strongarm.inc @@ -2,8 +2,6 @@ # gcc does not differentiate between the different Strongarm versions, so neither do we # http://lists.linuxtogo.org/pipermail/openembedded-devel/2008-January/004031.html -ARM_ABI = "oabi" TARGET_CC_ARCH = "-march=armv4 -mtune=strongarm" -FEED_ARCH = "arm-oabi" -PACKAGE_BASE_ARCH = "armv4" -PACKAGE_EXTRA_ARCHS += "armv4 " +FEED_ARCH = "armv4" +BASE_PACKAGE_ARCH = "armv4" -- cgit v1.2.3 From 9fd25648fc72adbfa4bc8b419c9a50aba9994f4b Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Sat, 31 Oct 2009 13:44:29 +0100 Subject: linux-kirkwood: updated defconfigs (more modules, more filesystems in kernel) --- conf/machine/include/kirkwood.inc | 2 +- recipes/linux/linux-kirkwood/openrd-base/defconfig | 1372 +++++++++++++++----- .../linux/linux-kirkwood/openrd-client/defconfig | 413 ++++-- recipes/linux/linux-kirkwood/sheevaplug/defconfig | 413 ++++-- 4 files changed, 1624 insertions(+), 576 deletions(-) diff --git a/conf/machine/include/kirkwood.inc b/conf/machine/include/kirkwood.inc index 20f53bf643..f91607cf76 100644 --- a/conf/machine/include/kirkwood.inc +++ b/conf/machine/include/kirkwood.inc @@ -11,7 +11,7 @@ USE_DEVFS = "0" PREFERRED_PROVIDER_virtual/bootloader = "" PREFERRED_PROVIDER_virtual/kernel = "linux-kirkwood" -MACHINE_KERNEL_PR = "r11" +MACHINE_KERNEL_PR = "r12" IMAGE_FSTYPES += "tar.gz ubi" SERIAL_CONSOLE = "ttyS0 115200" diff --git a/recipes/linux/linux-kirkwood/openrd-base/defconfig b/recipes/linux/linux-kirkwood/openrd-base/defconfig index 1271b90cd9..8e56415e92 100644 --- a/recipes/linux/linux-kirkwood/openrd-base/defconfig +++ b/recipes/linux/linux-kirkwood/openrd-base/defconfig @@ -1,14 +1,13 @@ -# leon was here +# # Automatically generated make config: don't edit -# Linux kernel version: 2.6.31-rc9 -# Mon Sep 14 00:31:10 2009 +# Linux kernel version: 2.6.32-rc4 +# Fri Oct 30 11:17:30 2009 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y CONFIG_GENERIC_GPIO=y CONFIG_GENERIC_TIME=y CONFIG_GENERIC_CLOCKEVENTS=y -CONFIG_MMU=y CONFIG_GENERIC_HARDIRQS=y CONFIG_STACKTRACE_SUPPORT=y CONFIG_HAVE_LATENCYTOP_SUPPORT=y @@ -32,7 +31,7 @@ CONFIG_BROKEN_ON_SMP=y CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" -CONFIG_LOCALVERSION_AUTO=y +# CONFIG_LOCALVERSION_AUTO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y @@ -44,32 +43,32 @@ CONFIG_SYSVIPC_SYSCTL=y # # RCU Subsystem # -CONFIG_CLASSIC_RCU=y -# CONFIG_TREE_RCU is not set -# CONFIG_PREEMPT_RCU is not set +CONFIG_TREE_RCU=y +# CONFIG_TREE_PREEMPT_RCU is not set +# CONFIG_RCU_TRACE is not set +CONFIG_RCU_FANOUT=32 +# CONFIG_RCU_FANOUT_EXACT is not set # CONFIG_TREE_RCU_TRACE is not set -# CONFIG_PREEMPT_RCU_TRACE is not set -# CONFIG_IKCONFIG is not set +CONFIG_IKCONFIG=m +CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=19 # CONFIG_GROUP_SCHED is not set # CONFIG_CGROUPS is not set # CONFIG_SYSFS_DEPRECATED_V2 is not set # CONFIG_RELAY is not set -CONFIG_NAMESPACES=y -# CONFIG_UTS_NS is not set -# CONFIG_IPC_NS is not set -# CONFIG_USER_NS is not set -# CONFIG_PID_NS is not set -# CONFIG_NET_NS is not set -# CONFIG_BLK_DEV_INITRD is not set +# CONFIG_NAMESPACES is not set +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_RD_GZIP=y +# CONFIG_RD_BZIP2 is not set +# CONFIG_RD_LZMA is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y CONFIG_ANON_INODES=y -# CONFIG_EMBEDDED is not set +CONFIG_EMBEDDED=y CONFIG_UID16=y CONFIG_SYSCTL_SYSCALL=y CONFIG_KALLSYMS=y -CONFIG_KALLSYMS_ALL=y # CONFIG_KALLSYMS_EXTRA_PASS is not set CONFIG_HOTPLUG=y CONFIG_PRINTK=y @@ -85,33 +84,26 @@ CONFIG_SHMEM=y CONFIG_AIO=y # -# Performance Counters +# Kernel Performance Events And Counters # CONFIG_VM_EVENT_COUNTERS=y CONFIG_PCI_QUIRKS=y -CONFIG_SLUB_DEBUG=y -# CONFIG_STRIP_ASM_SYMS is not set +# CONFIG_SLUB_DEBUG is not set CONFIG_COMPAT_BRK=y # CONFIG_SLAB is not set CONFIG_SLUB=y # CONFIG_SLOB is not set -CONFIG_PROFILING=y -CONFIG_TRACEPOINTS=y -CONFIG_MARKERS=y -CONFIG_OPROFILE=y +# CONFIG_PROFILING is not set CONFIG_HAVE_OPROFILE=y -CONFIG_KPROBES=y -CONFIG_KRETPROBES=y +# CONFIG_KPROBES is not set CONFIG_HAVE_KPROBES=y CONFIG_HAVE_KRETPROBES=y # # GCOV-based kernel profiling # -# CONFIG_GCOV_KERNEL is not set -# CONFIG_SLOW_WORK is not set +CONFIG_SLOW_WORK=y CONFIG_HAVE_GENERIC_DMA_COHERENT=y -CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y CONFIG_BASE_SMALL=0 CONFIG_MODULES=y @@ -122,7 +114,7 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_SRCVERSION_ALL is not set CONFIG_BLOCK=y CONFIG_LBDAF=y -# CONFIG_BLK_DEV_BSG is not set +CONFIG_BLK_DEV_BSG=y # CONFIG_BLK_DEV_INTEGRITY is not set # @@ -142,6 +134,7 @@ CONFIG_DEFAULT_IOSCHED="cfq" # # System Type # +CONFIG_MMU=y # CONFIG_ARCH_AAEC2000 is not set # CONFIG_ARCH_INTEGRATOR is not set # CONFIG_ARCH_REALVIEW is not set @@ -156,6 +149,7 @@ CONFIG_DEFAULT_IOSCHED="cfq" # CONFIG_ARCH_STMP3XXX is not set # CONFIG_ARCH_NETX is not set # CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_NOMADIK is not set # CONFIG_ARCH_IOP13XX is not set # CONFIG_ARCH_IOP32X is not set # CONFIG_ARCH_IOP33X is not set @@ -178,22 +172,25 @@ CONFIG_ARCH_KIRKWOOD=y # CONFIG_ARCH_SA1100 is not set # CONFIG_ARCH_S3C2410 is not set # CONFIG_ARCH_S3C64XX is not set +# CONFIG_ARCH_S5PC1XX is not set # CONFIG_ARCH_SHARK is not set # CONFIG_ARCH_LH7A40X is not set # CONFIG_ARCH_U300 is not set # CONFIG_ARCH_DAVINCI is not set # CONFIG_ARCH_OMAP is not set +# CONFIG_ARCH_BCMRING is not set # # Marvell Kirkwood Implementations # -# CONFIG_MACH_DB88F6281_BP is not set -# CONFIG_MACH_RD88F6192_NAS is not set -# CONFIG_MACH_RD88F6281 is not set -# CONFIG_MACH_MV88F6281GTW_GE is not set -# CONFIG_MACH_SHEEVAPLUG is not set -# CONFIG_MACH_TS219 is not set +CONFIG_MACH_DB88F6281_BP=y +CONFIG_MACH_RD88F6192_NAS=y +CONFIG_MACH_RD88F6281=y +CONFIG_MACH_MV88F6281GTW_GE=y +CONFIG_MACH_SHEEVAPLUG=y +CONFIG_MACH_TS219=y CONFIG_MACH_OPENRD_BASE=y +CONFIG_MACH_OPENRD_CLIENT=y CONFIG_PLAT_ORION=y # @@ -204,7 +201,7 @@ CONFIG_CPU_FEROCEON=y # CONFIG_CPU_FEROCEON_OLD_ID is not set CONFIG_CPU_32v5=y CONFIG_CPU_ABRT_EV5T=y -CONFIG_CPU_PABRT_NOIFAR=y +CONFIG_CPU_PABRT_LEGACY=y CONFIG_CPU_CACHE_VIVT=y CONFIG_CPU_COPY_FEROCEON=y CONFIG_CPU_TLB_FEROCEON=y @@ -220,6 +217,7 @@ CONFIG_ARM_THUMB=y CONFIG_OUTER_CACHE=y CONFIG_CACHE_FEROCEON_L2=y # CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set +CONFIG_ARM_L1_CACHE_SHIFT=5 # # Bus support @@ -228,7 +226,6 @@ CONFIG_PCI=y CONFIG_PCI_SYSCALL=y # CONFIG_ARCH_SUPPORTS_MSI is not set CONFIG_PCI_LEGACY=y -CONFIG_PCI_DEBUG=y # CONFIG_PCI_STUB is not set # CONFIG_PCI_IOV is not set # CONFIG_PCCARD is not set @@ -244,6 +241,8 @@ CONFIG_VMSPLIT_3G=y # CONFIG_VMSPLIT_2G is not set # CONFIG_VMSPLIT_1G is not set CONFIG_PAGE_OFFSET=0xC0000000 +# CONFIG_PREEMPT_NONE is not set +# CONFIG_PREEMPT_VOLUNTARY is not set CONFIG_PREEMPT=y CONFIG_HZ=100 CONFIG_AEABI=y @@ -264,6 +263,7 @@ CONFIG_ZONE_DMA_FLAG=0 CONFIG_VIRT_TO_BUS=y CONFIG_HAVE_MLOCK=y CONFIG_HAVE_MLOCKED_PAGE_BIT=y +# CONFIG_KSM is not set CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 CONFIG_ALIGNMENT_TRAP=y CONFIG_UACCESS_WITH_MEMCPY=y @@ -273,9 +273,10 @@ CONFIG_UACCESS_WITH_MEMCPY=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="" +CONFIG_CMDLINE=" debug " # CONFIG_XIP_KERNEL is not set -# CONFIG_KEXEC is not set +CONFIG_KEXEC=y +CONFIG_ATAGS_PROC=y # # CPU Power Management @@ -323,40 +324,210 @@ CONFIG_XFRM=y # CONFIG_NET_KEY is not set CONFIG_INET=y CONFIG_IP_MULTICAST=y -# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_ASK_IP_FIB_HASH=y +# CONFIG_IP_FIB_TRIE is not set CONFIG_IP_FIB_HASH=y +# CONFIG_IP_MULTIPLE_TABLES is not set +# CONFIG_IP_ROUTE_MULTIPATH is not set +# CONFIG_IP_ROUTE_VERBOSE is not set CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y # CONFIG_IP_PNP_RARP is not set -# CONFIG_NET_IPIP is not set -# CONFIG_NET_IPGRE is not set -# CONFIG_IP_MROUTE is not set +CONFIG_NET_IPIP=m +CONFIG_NET_IPGRE=m +CONFIG_NET_IPGRE_BROADCAST=y +CONFIG_IP_MROUTE=y +# CONFIG_IP_PIMSM_V1 is not set +# CONFIG_IP_PIMSM_V2 is not set # CONFIG_ARPD is not set -# CONFIG_SYN_COOKIES is not set +CONFIG_SYN_COOKIES=y # CONFIG_INET_AH is not set # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set # CONFIG_INET_XFRM_TUNNEL is not set -# CONFIG_INET_TUNNEL is not set +CONFIG_INET_TUNNEL=m CONFIG_INET_XFRM_MODE_TRANSPORT=y CONFIG_INET_XFRM_MODE_TUNNEL=y CONFIG_INET_XFRM_MODE_BEET=y CONFIG_INET_LRO=y CONFIG_INET_DIAG=y CONFIG_INET_TCP_DIAG=y -# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_ADVANCED=y +CONFIG_TCP_CONG_BIC=m CONFIG_TCP_CONG_CUBIC=y +CONFIG_TCP_CONG_WESTWOOD=m +CONFIG_TCP_CONG_HTCP=m +# CONFIG_TCP_CONG_HSTCP is not set +# CONFIG_TCP_CONG_HYBLA is not set +# CONFIG_TCP_CONG_VEGAS is not set +# CONFIG_TCP_CONG_SCALABLE is not set +# CONFIG_TCP_CONG_LP is not set +# CONFIG_TCP_CONG_VENO is not set +# CONFIG_TCP_CONG_YEAH is not set +# CONFIG_TCP_CONG_ILLINOIS is not set +# CONFIG_DEFAULT_BIC is not set +CONFIG_DEFAULT_CUBIC=y +# CONFIG_DEFAULT_HTCP is not set +# CONFIG_DEFAULT_VEGAS is not set +# CONFIG_DEFAULT_WESTWOOD is not set +# CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_TCP_MD5SIG is not set # CONFIG_IPV6 is not set # CONFIG_NETWORK_SECMARK is not set -# CONFIG_NETFILTER is not set -# CONFIG_IP_DCCP is not set -# CONFIG_IP_SCTP is not set -# CONFIG_TIPC is not set +CONFIG_NETFILTER=y +CONFIG_NETFILTER_DEBUG=y +CONFIG_NETFILTER_ADVANCED=y +CONFIG_BRIDGE_NETFILTER=y + +# +# Core Netfilter Configuration +# +CONFIG_NETFILTER_NETLINK=m +CONFIG_NETFILTER_NETLINK_QUEUE=m +CONFIG_NETFILTER_NETLINK_LOG=m +CONFIG_NF_CONNTRACK=m +CONFIG_NF_CT_ACCT=y +CONFIG_NF_CONNTRACK_MARK=y +# CONFIG_NF_CONNTRACK_EVENTS is not set +CONFIG_NF_CT_PROTO_DCCP=m +CONFIG_NF_CT_PROTO_GRE=m +CONFIG_NF_CT_PROTO_SCTP=m +# CONFIG_NF_CT_PROTO_UDPLITE is not set +CONFIG_NF_CONNTRACK_AMANDA=m +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_H323=m +CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_PPTP=m +CONFIG_NF_CONNTRACK_SANE=m +CONFIG_NF_CONNTRACK_SIP=m +CONFIG_NF_CONNTRACK_TFTP=m +CONFIG_NF_CT_NETLINK=m +CONFIG_NETFILTER_TPROXY=m +CONFIG_NETFILTER_XTABLES=m +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m +CONFIG_NETFILTER_XT_TARGET_CONNMARK=m +CONFIG_NETFILTER_XT_TARGET_DSCP=m +CONFIG_NETFILTER_XT_TARGET_HL=m +CONFIG_NETFILTER_XT_TARGET_LED=m +CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_NFLOG=m +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m +CONFIG_NETFILTER_XT_TARGET_NOTRACK=m +CONFIG_NETFILTER_XT_TARGET_RATEEST=m +# CONFIG_NETFILTER_XT_TARGET_TPROXY is not set +CONFIG_NETFILTER_XT_TARGET_TRACE=m +CONFIG_NETFILTER_XT_TARGET_TCPMSS=m +CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m +CONFIG_NETFILTER_XT_MATCH_CLUSTER=m +CONFIG_NETFILTER_XT_MATCH_COMMENT=m +CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m +CONFIG_NETFILTER_XT_MATCH_CONNMARK=m +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m +CONFIG_NETFILTER_XT_MATCH_DCCP=m +CONFIG_NETFILTER_XT_MATCH_DSCP=m +CONFIG_NETFILTER_XT_MATCH_ESP=m +CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m +CONFIG_NETFILTER_XT_MATCH_HELPER=m +CONFIG_NETFILTER_XT_MATCH_HL=m +CONFIG_NETFILTER_XT_MATCH_IPRANGE=m +CONFIG_NETFILTER_XT_MATCH_LENGTH=m +CONFIG_NETFILTER_XT_MATCH_LIMIT=m +CONFIG_NETFILTER_XT_MATCH_MAC=m +CONFIG_NETFILTER_XT_MATCH_MARK=m +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m +CONFIG_NETFILTER_XT_MATCH_OWNER=m +CONFIG_NETFILTER_XT_MATCH_POLICY=m +# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m +CONFIG_NETFILTER_XT_MATCH_QUOTA=m +CONFIG_NETFILTER_XT_MATCH_RATEEST=m +CONFIG_NETFILTER_XT_MATCH_REALM=m +CONFIG_NETFILTER_XT_MATCH_RECENT=m +# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set +CONFIG_NETFILTER_XT_MATCH_SCTP=m +# CONFIG_NETFILTER_XT_MATCH_SOCKET is not set +CONFIG_NETFILTER_XT_MATCH_STATE=m +CONFIG_NETFILTER_XT_MATCH_STATISTIC=m +CONFIG_NETFILTER_XT_MATCH_STRING=m +CONFIG_NETFILTER_XT_MATCH_TCPMSS=m +CONFIG_NETFILTER_XT_MATCH_TIME=m +CONFIG_NETFILTER_XT_MATCH_U32=m +CONFIG_NETFILTER_XT_MATCH_OSF=m +# CONFIG_IP_VS is not set + +# +# IP: Netfilter Configuration +# +CONFIG_NF_DEFRAG_IPV4=m +CONFIG_NF_CONNTRACK_IPV4=m +CONFIG_NF_CONNTRACK_PROC_COMPAT=y +# CONFIG_IP_NF_QUEUE is not set +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_ADDRTYPE=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m +CONFIG_IP_NF_TARGET_LOG=m +CONFIG_IP_NF_TARGET_ULOG=m +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y