From 40e3fb133a467addff6f63b712d3d3d680334e98 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 28 May 2009 10:07:09 +0200 Subject: linux(-rp).inc: Quirk for udev greater or equal 141 * opt-in, distros can set UDEV_GE_141 = 1 to get the quirks applied * currently unsets CONFIG_SYSFS_DEPRECATED* per udev README --- recipes/linux/linux-rp.inc | 19 +++++++++++++++++++ recipes/linux/linux.inc | 17 +++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/recipes/linux/linux-rp.inc b/recipes/linux/linux-rp.inc index bd08a6f3eb..bdeb9f364a 100644 --- a/recipes/linux/linux-rp.inc +++ b/recipes/linux/linux-rp.inc @@ -20,6 +20,9 @@ COMPATIBLE_MACHINE = '(collie|poodle|c7x0|akita|spitz|tosa|hx2000|qemuarm|qemux8 # Enable OABI compat for people stuck with obsolete userspace ARM_KEEP_OABI ?= "1" +# Quirk for udev greater or equal 141 +UDEV_GE_141 ?= "0" + KERNEL_DEFCONFIG ?= "defconfig-${MACHINE}" CMDLINE_CON = "console=ttyS0,115200n8 console=tty1 noinitrd" @@ -145,5 +148,21 @@ do_configure() { -e '/CONFIG_LOGO_OZ640_CLUT224=/d' \ '${WORKDIR}/${KERNEL_DEFCONFIG}' >>'${S}/.config' + echo 'CONFIG_LOCALVERSION=""' >>${S}/.config + echo '# CONFIG_LOCALVERSION_AUTO is not set' >>${S}/.config + + # + # Udev quirks + # + + # Newer versions of udev mandate that sysfs doesn't have deprecated entries + if [ "${UDEV_GE_141}" = "1" ] ; then + sed -e /CONFIG_SYSFS_DEPRECATED/d \ + -e /CONFIG_SYSFS_DEPRECATED_V2/d \ + -i '${S}/.config' + echo '# CONFIG_SYSFS_DEPRECATED is not set' >> ${S}/.config + echo '# CONFIG_SYSFS_DEPRECATED_V2 is not set' >> ${S}/.config + fi + yes '' | oe_runmake oldconfig } diff --git a/recipes/linux/linux.inc b/recipes/linux/linux.inc index 5a4a11fecf..42fb56a22b 100644 --- a/recipes/linux/linux.inc +++ b/recipes/linux/linux.inc @@ -9,6 +9,9 @@ RPSRC = "http://www.rpsys.net/openzaurus/patches/archive" # Enable OABI compat for people stuck with obsolete userspace ARM_KEEP_OABI ?= "1" +# Quirk for udev greater or equal 141 +UDEV_GE_141 ?= "0" + # Specify the commandline for your device # Boot from mmc @@ -103,6 +106,20 @@ do_configure_prepend() { echo 'CONFIG_LOCALVERSION=""' >>${S}/.config echo '# CONFIG_LOCALVERSION_AUTO is not set' >>${S}/.config + + # + # Udev quirks + # + + # Newer versions of udev mandate that sysfs doesn't have deprecated entries + if [ "${UDEV_GE_141}" = "1" ] ; then + sed -e /CONFIG_SYSFS_DEPRECATED/d \ + -e /CONFIG_SYSFS_DEPRECATED_V2/d \ + -i '${S}/.config' + echo '# CONFIG_SYSFS_DEPRECATED is not set' >> ${S}/.config + echo '# CONFIG_SYSFS_DEPRECATED_V2 is not set' >> ${S}/.config + fi + # # root-over-nfs-over-usb-eth support. Limited, but should cover some cases. # Enable this by setting a proper CMDLINE_NFSROOT_USB. -- cgit v1.2.3 From 45c663e9f63076e021581ec4e882c3db1865baae Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 28 May 2009 10:10:07 +0200 Subject: angstrom 2009.X: some more preferred versions --- conf/distro/include/angstrom-2008-preferred-versions.inc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index a7c7f4cd58..f05c3a1362 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -19,13 +19,18 @@ PREFERRED_VERSION_libtool = "2.2.4" PREFERRED_VERSION_libtool-native = "2.2.4" PREFERRED_VERSION_libtool-cross = "2.2.4" PREFERRED_VERSION_libtool-sdk = "2.2.4" +PREFERRED_VERSION_libx11 = "1.2" +PREFERRED_VERSION_mesa = "7.2" PREFERRED_VERSION_pango = "1.22.0" PREFERRED_VERSION_pixman = "0.13.2" PREFERRED_VERSION_pkgconfig = "0.23" PREFERRED_VERSION_pkgconfig-native = "0.23" PREFERRED_VERSION_pulseaudio = "0.9.10" PREFERRED_VERSION_tiff = "3.8.2+4.0.0beta2" + PREFERRED_VERSION_udev = "141" +UDEV_GE_141 = "1" + PREFERRED_VERSION_util-macros-native = "1.2.1" PREFERRED_VERSION_util-macros = "1.2.1" PREFERRED_VERSION_wpa-supplicant = "0.6.7" -- cgit v1.2.3 From e2883ac3ce220ddffb20f9e8aeb6f9eb034b8b12 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 28 May 2009 10:10:47 +0200 Subject: devicekit: add 003 --- recipes/devicekit/devicekit_003.bb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 recipes/devicekit/devicekit_003.bb diff --git a/recipes/devicekit/devicekit_003.bb b/recipes/devicekit/devicekit_003.bb new file mode 100644 index 0000000000..a57ca88675 --- /dev/null +++ b/recipes/devicekit/devicekit_003.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "DeviceKit is a simple system service that a) can enumerate devices; b) emits signals when devices are added removed; c) provides a way to merge device information / quirks onto devices." +LICENSE = "GPLv2" +DEPENDS = "udev dbus-glib glib-2.0" + +SRC_URI = "http://hal.freedesktop.org/releases/DeviceKit-${PV}.tar.gz" +S = "${WORKDIR}/DeviceKit-${PV}" + +inherit autotools_stage +AUTOTOOLS_STAGE_PKGCONFIG = "1" + +FILES_${PN} += "${datadir}/dbus-1/" + + + -- cgit v1.2.3 From 194567e13a7ab7b1f2a4849f14ab2f26ed220ac6 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 28 May 2009 10:53:36 +0200 Subject: xproto-native 7.0.15: depends on util-macros-native --- recipes/xorg-proto/xproto-native_7.0.15.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/xorg-proto/xproto-native_7.0.15.bb b/recipes/xorg-proto/xproto-native_7.0.15.bb index 5dde8a7d4a..baecb29fc8 100644 --- a/recipes/xorg-proto/xproto-native_7.0.15.bb +++ b/recipes/xorg-proto/xproto-native_7.0.15.bb @@ -1,3 +1,5 @@ require xproto_${PV}.bb inherit native + +DEPENDS += "util-macros-native" -- cgit v1.2.3 From b6cc6c1814e607558b74c72d58423cf0b5f155b0 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Thu, 28 May 2009 13:23:39 +0000 Subject: man-pages: Update to version 3.21. --- conf/checksums.ini | 4 ++++ recipes/man-pages/man-pages_3.21.bb | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 recipes/man-pages/man-pages_3.21.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index 29f535c6ab..19192bae18 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -15994,6 +15994,10 @@ sha256=bc9e3fe06a550d6eb48fd84eaf58415c78fbc29ba042e4a074adb62736f50760 md5=1775f4ab1529db175a95f83bacc562b0 sha256=e88295f9d6fe792784ea7dd546a12b0e7bb96b023d4248e728a43eb6ad885135 +[http://kernel.org/pub/linux/docs/man-pages/Archive/man-pages-3.21.tar.bz2] +md5=14b3f971348f4d59ae8b8362d8eb15ff +sha256=272ac90813e4301873d46229b216622bb7bc6a0b3adb15577b20b5083f92a169 + [http://www.maradns.org/download/1.0/maradns-1.0.39.tar.bz2] md5=5ac39978f55ecaf6e887cd5be027b1c3 sha256=4ac5940d25a9b5a52d0ff1f8223bb85462f9cfcceb4ac547e3ca9b6690aad394 diff --git a/recipes/man-pages/man-pages_3.21.bb b/recipes/man-pages/man-pages_3.21.bb new file mode 100644 index 0000000000..c7d94f0911 --- /dev/null +++ b/recipes/man-pages/man-pages_3.21.bb @@ -0,0 +1,19 @@ +SECTION = "base" +DESCRIPTION = "base set of man pages" +LICENSE = "GPL" +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/docs/man-pages/Archive/man-pages-${PV}.tar.bz2" +PR = "r1" +RRECOMMENDS = "man" +PACKAGE_ARCH = "all" + +EXTRA_OEMAKE = "" +do_compile () { + : +} + +do_install () { + oe_runmake 'DESTDIR=${D}' install +} + +FILES_${PN} = "*" +FILES_${PN}-doc = "" -- cgit v1.2.3 From e4cf294ccda61af03749e1c54050c88b76fbb7c5 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Thu, 28 May 2009 14:36:19 +0000 Subject: gpe-login: Do not depends on kernel with CONFIG_SYSFS_DEPRECATED*=y. --- recipes/gpe-login/files/no-deprecated-sysfs.patch | 17 +++++++++++++++++ recipes/gpe-login/gpe-login_0.95.bb | 3 ++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 recipes/gpe-login/files/no-deprecated-sysfs.patch diff --git a/recipes/gpe-login/files/no-deprecated-sysfs.patch b/recipes/gpe-login/files/no-deprecated-sysfs.patch new file mode 100644 index 0000000000..ed5a6b2362 --- /dev/null +++ b/recipes/gpe-login/files/no-deprecated-sysfs.patch @@ -0,0 +1,17 @@ +Do not depends on kernel with CONFIG_SYSFS_DEPRECATED*=y. +With the new sysfs layout, /sys/class/backlight/* contains only symlinks. +chown -R skips symlinks, keeping device accessible only for root. + +Index: gpe-login-0.95/X11/gpe-login.pre-session +=================================================================== +--- gpe-login-0.95.orig/X11/gpe-login.pre-session 2008-08-06 21:23:40.000000000 +0000 ++++ gpe-login-0.95/X11/gpe-login.pre-session 2009-05-28 13:28:37.000000000 +0000 +@@ -57,7 +57,7 @@ + # screen light control # + + if [ -d /sys/class/backlight ]; then +-chown -R $USER /sys/class/backlight/* ++chown -R $USER /sys/class/backlight/*/* + chmod u+rw /sys/class/backlight/*/* + fi + diff --git a/recipes/gpe-login/gpe-login_0.95.bb b/recipes/gpe-login/gpe-login_0.95.bb index 0b3f480e6e..48371b53a9 100644 --- a/recipes/gpe-login/gpe-login_0.95.bb +++ b/recipes/gpe-login/gpe-login_0.95.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd" RDEPENDS = "xkbd gpe-theme-clearlooks" RPROVIDES_${PN} = "gpe-session-starter" -PR = "r0" +PR = "r1" SRC_URI_OVERRIDES_PACKAGE_ARCH = "1" @@ -17,6 +17,7 @@ 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 += " file://no-deprecated-sysfs.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" -- cgit v1.2.3 From 6de1fd8368e46fca71e208f856473966917bb0be Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Thu, 28 May 2009 14:38:54 +0000 Subject: man-pages: Removed man-pages_2.79.bb. --- recipes/man-pages/man-pages_2.79.bb | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 recipes/man-pages/man-pages_2.79.bb diff --git a/recipes/man-pages/man-pages_2.79.bb b/recipes/man-pages/man-pages_2.79.bb deleted file mode 100644 index ab7da8c965..0000000000 --- a/recipes/man-pages/man-pages_2.79.bb +++ /dev/null @@ -1,19 +0,0 @@ -SECTION = "base" -DESCRIPTION = "base set of man pages." -LICENSE = "GPL" -SRC_URI = "${KERNELORG_MIRROR}/pub/linux/docs/man-pages/Archive/man-pages-${PV}.tar.bz2" -PR = "r1" -RRECOMMENDS = "man" -PACKAGE_ARCH = "all" - -EXTRA_OEMAKE = "" -do_compile () { - : -} - -do_install () { - oe_runmake 'DESTDIR=${D}' install -} - -FILES_${PN} = "*" -FILES_${PN}-doc = "" -- cgit v1.2.3 From 19741f0075f94aecdc06da9dff8f00013bcba792 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Thu, 28 May 2009 16:56:46 +0000 Subject: libx11-1.1.4: Prevent crash of makekeys (backport from 1.1.5). --- recipes/xorg-lib/libx11_1.1.4.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/xorg-lib/libx11_1.1.4.bb b/recipes/xorg-lib/libx11_1.1.4.bb index 7ab3a7bb94..d238c70714 100644 --- a/recipes/xorg-lib/libx11_1.1.4.bb +++ b/recipes/xorg-lib/libx11_1.1.4.bb @@ -19,6 +19,7 @@ do_compile() { unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS cd src/util; mv makekeys.c.orig makekeys.c || true + sed -i -e 's:MIN_REHASH 15:MIN_REHASH 16:g' makekeys.c touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} makekeys.c -o makekeys # mv to stop it getting rebuilt mv makekeys.c makekeys.c.orig -- cgit v1.2.3 From 17677085dea0a9584cba1f2a1866c9cdfe4521ef Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 29 May 2009 11:30:17 +0200 Subject: usbutils: update to 0.82 --- conf/checksums.ini | 4 ++++ recipes/usbutils/usbutils_0.82.bb | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 recipes/usbutils/usbutils_0.82.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index 19192bae18..b7d712468a 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -23626,6 +23626,10 @@ sha256=00385353242173b878413e0423c1dddcbbb50a3cadc3bb9d0a6adcf335794423 md5=88978b4ad891f610620b1b8e5e0f43eb sha256=2edc7cc98fd217f6980d8ba0b3792beed4695d4e8429a11c7237faab04ab47f4 +[http://downloads.sourceforge.net/linux-usb/usbutils-0.82.tar.gz] +md5=6e393cc7423b5d228fa3d34c21481ae4 +sha256=9876b0e45a1bd3899222b916ab1d423e9efa3ad9374d55a6a301d5716f2d8a2f + [http://www.kroah.com/linux-usb/usbview-1.0.tar.gz] md5=2ac1bdae03a858b965e895b211a75ad7 sha256=7a7add52242142f37a7d220c76dfe77090f6592eacdf796e3d07fa61415340fd diff --git a/recipes/usbutils/usbutils_0.82.bb b/recipes/usbutils/usbutils_0.82.bb new file mode 100644 index 0000000000..c921a4a75e --- /dev/null +++ b/recipes/usbutils/usbutils_0.82.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Host side USB console utilities." +SECTION = "base" +DEPENDS += "libusb-compat" +LICENSE = "GPL" +PRIORITY = "optional" + +SRC_URI = "${SOURCEFORGE_MIRROR}/linux-usb/usbutils-${PV}.tar.gz \ + " +inherit autotools + +EXTRA_OECONF = "--program-prefix=" +sbindir = "/sbin" +bindir = "/bin" + +FILES_${PN} += "${datadir}/usb*" + +do_configure_prepend() { + rm -rf ${S}/libusb +} -- cgit v1.2.3 From 1a6cc611325082e5203a7e4eef4857a1c2c56ea0 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Fri, 22 May 2009 16:57:35 +0200 Subject: task-sdk-extra: Replace some oldstyle X bits with new components. This helps to keep toolchain and filesystem in sync and avoids messing up staging. --- recipes/tasks/task-sdk-extra.bb | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/recipes/tasks/task-sdk-extra.bb b/recipes/tasks/task-sdk-extra.bb index c4414dbcf8..c894940176 100644 --- a/recipes/tasks/task-sdk-extra.bb +++ b/recipes/tasks/task-sdk-extra.bb @@ -1,5 +1,5 @@ DESCRIPTION = "SDK packages" -PR = "r8" +PR = "r9" LICENSE = "MIT" ALLOW_EMPTY = "1" @@ -25,17 +25,14 @@ RDEPENDS_task-sdk-x11-ext = "\ libxcursor-dev \ libxdmcp-dev \ libxft-dev \ - libxrandr-dev \ - libxrender-dev \ libxsettings-client-dev \ randrproto-dev \ libxau-dev \ - xcalibrateext-dev \ - libxcomposite-dev \ - libxdamage-dev \ - libxext-dev \ + calibrateproto-dev \ + compositeproto-dev \ + damageproto-dev \ xextproto-dev \ - libxfont-dev \ + fontsproto-dev \ libxpm-dev \ xproto-dev \ libxt-dev \ -- cgit v1.2.3 From fc6e562fcc0d74e4b425cfa9fc6918c9591fa51e Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Fri, 29 May 2009 12:18:21 +0200 Subject: xserver-kdrive: patch for supporting 800x480 video modes. --- recipes/xorg-xserver/xserver-kdrive-common.inc | 1 + .../xserver-kdrive/kmode-800_480.patch | 24 ++++++++++++++++++++++ recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb | 2 +- 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 recipes/xorg-xserver/xserver-kdrive/kmode-800_480.patch diff --git a/recipes/xorg-xserver/xserver-kdrive-common.inc b/recipes/xorg-xserver/xserver-kdrive-common.inc index dadfbbb5e7..bcd3d684eb 100644 --- a/recipes/xorg-xserver/xserver-kdrive-common.inc +++ b/recipes/xorg-xserver/xserver-kdrive-common.inc @@ -73,6 +73,7 @@ SRC_URI ?= "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES}" KDRIVE_COMMON_PATCHES = " \ file://kmode.patch;patch=1 \ + file://kmode-800_480.patch;patch=1 \ file://disable-apm.patch;patch=1 \ file://no-serial-probing.patch;patch=1 \ file://fbdev-not-fix.patch;patch=1 \ diff --git a/recipes/xorg-xserver/xserver-kdrive/kmode-800_480.patch b/recipes/xorg-xserver/xserver-kdrive/kmode-800_480.patch new file mode 100644 index 0000000000..61c2ec4afc --- /dev/null +++ b/recipes/xorg-xserver/xserver-kdrive/kmode-800_480.patch @@ -0,0 +1,24 @@ +--- a/hw/kdrive/src/kmode.c~ 2009-05-28 16:30:24.000000000 +0200 ++++ b/hw/kdrive/src/kmode.c 2009-05-28 16:30:24.000000000 +0200 +@@ -112,10 +112,18 @@ + }, + + +- { 480, 640, 60, 0, /* VESA */ +- 0, 0, 0, KdSyncNegative, /* 31.469 */ ++ { 480, 640, 60, 0, /* VESA */ ++ 0, 0, 0, KdSyncNegative, /* 31.469 */ + 0, 0, 0, KdSyncNegative, /* 59.940 */ +- }, ++ }, ++ { 800, 480, 51, 0, ++ 0, 0, 0, KdSyncNegative, ++ 0, 0, 0, KdSyncNegative, ++ }, ++ { 480, 800, 51, 0, ++ 0, 0, 0, KdSyncNegative, ++ 0, 0, 0, KdSyncNegative, ++ }, + + + /* 800x600 modes */ diff --git a/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb b/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb index 70503d749c..fe0335d2cd 100644 --- a/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb +++ b/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb @@ -4,7 +4,7 @@ DEPENDS += "hal libxkbfile libxcalibrate pixman" RDEPENDS += "hal" PE = "1" -PR = "r5" +PR = "r6" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ -- cgit v1.2.3 From dda5c9e5e323cf9bbe40abb02de0b61b762e4e0c Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Fri, 29 May 2009 12:37:16 +0200 Subject: task-sdk-extra: pull in missing libxi --- recipes/tasks/task-sdk-extra.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/tasks/task-sdk-extra.bb b/recipes/tasks/task-sdk-extra.bb index c894940176..98234cea1c 100644 --- a/recipes/tasks/task-sdk-extra.bb +++ b/recipes/tasks/task-sdk-extra.bb @@ -1,5 +1,5 @@ DESCRIPTION = "SDK packages" -PR = "r9" +PR = "r10" LICENSE = "MIT" ALLOW_EMPTY = "1" @@ -49,5 +49,5 @@ RDEPENDS_task-sdk-gpe = "\ libgpelaunch-dev \ libgpewidget-dev \ libhandoff-dev \ + libxi-dev \ gconf-dbus-dev" - -- cgit v1.2.3 From 0965caed84104fc5dab48dcab867d503112d2142 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= Date: Fri, 29 May 2009 14:49:22 +0200 Subject: libx11: fix libtool invocation on x86/ppc --- recipes/xorg-lib/libx11_1.2.bb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/recipes/xorg-lib/libx11_1.2.bb b/recipes/xorg-lib/libx11_1.2.bb index a3d000f030..e9665bcc2f 100644 --- a/recipes/xorg-lib/libx11_1.2.bb +++ b/recipes/xorg-lib/libx11_1.2.bb @@ -13,6 +13,11 @@ SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \ EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h" +# Dolt gets used on x86 and ppc and hardcodes 'libtool' +do_configure_append() { + cp ${TARGET_PREFIX}libtool libtool || true +} + do_compile() { ( unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS -- cgit v1.2.3 From 6d67f5983695987e98f35328c5b2737f2664346c Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 29 May 2009 15:03:08 +0200 Subject: usb-gadget-mode: add support for all linux gadgets and make g_cdc the default for beagleboard --- recipes/usb-gadget-mode/files/beagleboard/usb-gadget.conf | 3 +++ recipes/usb-gadget-mode/files/usb-gadget | 6 ++++++ recipes/usb-gadget-mode/usb-gadget-mode.bb | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 recipes/usb-gadget-mode/files/beagleboard/usb-gadget.conf diff --git a/recipes/usb-gadget-mode/files/beagleboard/usb-gadget.conf b/recipes/usb-gadget-mode/files/beagleboard/usb-gadget.conf new file mode 100644 index 0000000000..35ff0d4fa9 --- /dev/null +++ b/recipes/usb-gadget-mode/files/beagleboard/usb-gadget.conf @@ -0,0 +1,3 @@ +USB_MODE="composite" +MODULE_OPTIONS="" + diff --git a/recipes/usb-gadget-mode/files/usb-gadget b/recipes/usb-gadget-mode/files/usb-gadget index 6f957fd263..c9ff2f0485 100755 --- a/recipes/usb-gadget-mode/files/usb-gadget +++ b/recipes/usb-gadget-mode/files/usb-gadget @@ -10,6 +10,7 @@ # # 20070606 - v0.0.1 - Initial release # 20070630 - v0.0.2 - Add forgotten host mode +# 20090529 - add support for all gadgets in 2.6.29 (koen) CONF_FILE="/etc/default/usb-gadget" @@ -23,6 +24,11 @@ go() { case "$USB_MODE" in networking) setup_usb g_ether "$MODULE_OPTIONS" ;; + zero) setup_usb g_zero "$MODULE_OPTIONS" ;; + midi) setup_usb g_midi "$MODULE_OPTIONS" ;; + printer setup_usb g_printer "$MODULE_OPTIONS" ;; + gadgetfs) setup_usb gadgetfs "$MODULE_OPTIONS" ;; + composite) setup_usb g_cdc "$MODULE_OPTIONS" ;; storage) setup_usb g_file_storage "$MODULE_OPTIONS" ;; hostmode) unload_usb_gadgets setup_usb ohci_hcd "$MODULE_OPTIONS" ;; diff --git a/recipes/usb-gadget-mode/usb-gadget-mode.bb b/recipes/usb-gadget-mode/usb-gadget-mode.bb index daf7cfbe37..cc00a887fa 100644 --- a/recipes/usb-gadget-mode/usb-gadget-mode.bb +++ b/recipes/usb-gadget-mode/usb-gadget-mode.bb @@ -9,7 +9,7 @@ DESCRIPTION = "Manage the default USB gadget mode" SECTION = "console/network" LICENSE = "GPL" PV = "0.0.2" -PR = "r1" +PR = "r2" SRC_URI = "\ file://usb-gadget.conf \ -- cgit v1.2.3 From 6d524f9beed79eb6b6b7486f59ba19729bb28a45 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 29 May 2009 15:03:45 +0200 Subject: linux-omap 2.6.29: update defconfig * more filesystems * more ethernet adapters builtin * usb gadgets are modules now --- conf/machine/include/omap3.inc | 2 +- .../linux/linux-omap-2.6.29/beagleboard/defconfig | 274 ++++++++++++--------- 2 files changed, 165 insertions(+), 111 deletions(-) diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc index 1b47888ab7..1249837ddb 100644 --- a/conf/machine/include/omap3.inc +++ b/conf/machine/include/omap3.inc @@ -1,7 +1,7 @@ require conf/machine/include/tune-cortexa8.inc PREFERRED_PROVIDER_virtual/kernel = "linux-omap" # Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r35" +MACHINE_KERNEL_PR = "r36" KERNEL_IMAGETYPE = "uImage" diff --git a/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig b/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig index d939aa6b42..1aa7cf57ac 100644 --- a/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig +++ b/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.29-omap1 -# Mon May 11 13:05:20 2009 +# Fri May 29 14:47:52 2009 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -64,8 +64,7 @@ CONFIG_FAIR_GROUP_SCHED=y CONFIG_USER_SCHED=y # CONFIG_CGROUP_SCHED is not set # CONFIG_CGROUPS is not set -CONFIG_SYSFS_DEPRECATED=y -CONFIG_SYSFS_DEPRECATED_V2=y +# CONFIG_SYSFS_DEPRECATED_V2 is not set # CONFIG_RELAY is not set # CONFIG_NAMESPACES is not set CONFIG_BLK_DEV_INITRD=y @@ -786,7 +785,9 @@ CONFIG_BT_HCIBFUSB=y # CONFIG_BT_HCIBRF6150 is not set # CONFIG_BT_HCIH4P is not set # CONFIG_BT_HCIVHCI is not set -# CONFIG_AF_RXRPC is not set +CONFIG_AF_RXRPC=m +# CONFIG_AF_RXRPC_DEBUG is not set +# CONFIG_RXKAD is not set # CONFIG_PHONET is not set CONFIG_FIB_RULES=y CONFIG_WIRELESS=y @@ -1095,7 +1096,7 @@ CONFIG_USB_NET_SMSC95XX=y CONFIG_USB_NET_GL620A=y CONFIG_USB_NET_NET1080=y CONFIG_USB_NET_PLUSB=y -CONFIG_USB_NET_MCS7830=m +CONFIG_USB_NET_MCS7830=y CONFIG_USB_NET_RNDIS_HOST=y CONFIG_USB_NET_CDC_SUBSET=y CONFIG_USB_ALI_M5632=y @@ -1104,7 +1105,7 @@ CONFIG_USB_BELKIN=y CONFIG_USB_ARMLINUX=y CONFIG_USB_EPSON2888=y CONFIG_USB_KC2190=y -CONFIG_USB_NET_ZAURUS=m +CONFIG_USB_NET_ZAURUS=y # CONFIG_WAN is not set CONFIG_ATM_DRIVERS=y # CONFIG_ATM_DUMMY is not set @@ -2024,7 +2025,7 @@ CONFIG_USB_EMI26=m # CONFIG_USB_RIO500 is not set CONFIG_USB_LEGOTOWER=m CONFIG_USB_LCD=m -# CONFIG_USB_BERRY_CHARGE is not set +CONFIG_USB_BERRY_CHARGE=m CONFIG_USB_LED=m CONFIG_USB_CYPRESS_CY7C63=m CONFIG_USB_CYTHERM=m @@ -2038,9 +2039,9 @@ CONFIG_USB_FTDI_ELAN=m CONFIG_USB_SISUSBVGA=m CONFIG_USB_SISUSBVGA_CON=y CONFIG_USB_LD=m -# CONFIG_USB_TRANCEVIBRATOR is not set +CONFIG_USB_TRANCEVIBRATOR=m # CONFIG_USB_IOWARRIOR is not set -# CONFIG_USB_TEST is not set +CONFIG_USB_TEST=m # CONFIG_USB_ISIGHTFW is not set CONFIG_USB_VST=m CONFIG_USB_ATM=m @@ -2071,14 +2072,17 @@ CONFIG_USB_GADGET_SELECTED=y # CONFIG_USB_GADGET_GOKU is not set # CONFIG_USB_GADGET_DUMMY_HCD is not set CONFIG_USB_GADGET_DUALSPEED=y -# CONFIG_USB_ZERO is not set -# CONFIG_USB_ETH is not set -# CONFIG_USB_GADGETFS is not set -# CONFIG_USB_FILE_STORAGE is not set -# CONFIG_USB_G_SERIAL is not set -# CONFIG_USB_MIDI_GADGET is not set -# CONFIG_USB_G_PRINTER is not set -CONFIG_USB_CDC_COMPOSITE=y +CONFIG_USB_ZERO=m +CONFIG_USB_ZERO_HNPTEST=y +CONFIG_USB_ETH=m +CONFIG_USB_ETH_RNDIS=y +CONFIG_USB_GADGETFS=m +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +CONFIG_USB_G_SERIAL=m +CONFIG_USB_MIDI_GADGET=m +CONFIG_USB_G_PRINTER=m +CONFIG_USB_CDC_COMPOSITE=m # # OTG and related infrastructure @@ -2126,7 +2130,7 @@ CONFIG_LEDS_GPIO=y # LED Triggers # CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_HEARTBEAT=y CONFIG_LEDS_TRIGGER_BACKLIGHT=m CONFIG_LEDS_TRIGGER_DEFAULT_ON=m @@ -2199,7 +2203,11 @@ CONFIG_REGULATOR=y # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set # CONFIG_REGULATOR_BQ24022 is not set CONFIG_REGULATOR_TWL4030=y -# CONFIG_UIO is not set +CONFIG_UIO=m +CONFIG_UIO_PDRV=m +CONFIG_UIO_PDRV_GENIRQ=m +# CONFIG_UIO_SMX is not set +# CONFIG_UIO_SERCOS3 is not set CONFIG_STAGING=y # CONFIG_STAGING_EXCLUDE_BUILD is not set # CONFIG_MEILHAUS is not set @@ -2251,8 +2259,17 @@ CONFIG_JBD=y CONFIG_JBD2=m # CONFIG_JBD2_DEBUG is not set CONFIG_FS_MBCACHE=m -# CONFIG_REISERFS_FS is not set -# CONFIG_JFS_FS is not set +CONFIG_REISERFS_FS=m +# CONFIG_REISERFS_CHECK is not set +CONFIG_REISERFS_PROC_INFO=y +CONFIG_REISERFS_FS_XATTR=y +# CONFIG_REISERFS_FS_POSIX_ACL is not set +# CONFIG_REISERFS_FS_SECURITY is not set +CONFIG_JFS_FS=m +# CONFIG_JFS_POSIX_ACL is not set +# CONFIG_JFS_SECURITY is not set +# CONFIG_JFS_DEBUG is not set +# CONFIG_JFS_STATISTICS is not set CONFIG_FS_POSIX_ACL=y CONFIG_FILE_LOCKING=y CONFIG_XFS_FS=m @@ -2260,9 +2277,17 @@ CONFIG_XFS_FS=m # CONFIG_XFS_POSIX_ACL is not set # CONFIG_XFS_RT is not set # CONFIG_XFS_DEBUG is not set -# CONFIG_GFS2_FS is not set -# CONFIG_OCFS2_FS is not set -# CONFIG_BTRFS_FS is not set +CONFIG_GFS2_FS=m +CONFIG_GFS2_FS_LOCKING_DLM=m +CONFIG_OCFS2_FS=m +CONFIG_OCFS2_FS_O2CB=m +CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m +CONFIG_OCFS2_FS_STATS=y +CONFIG_OCFS2_DEBUG_MASKLOG=y +# CONFIG_OCFS2_DEBUG_FS is not set +# CONFIG_OCFS2_FS_POSIX_ACL is not set +CONFIG_BTRFS_FS=m +# CONFIG_BTRFS_FS_POSIX_ACL is not set CONFIG_DNOTIFY=y CONFIG_INOTIFY=y CONFIG_INOTIFY_USER=y @@ -2274,7 +2299,7 @@ CONFIG_QUOTA_TREE=y CONFIG_QFMT_V2=y CONFIG_QUOTACTL=y # CONFIG_AUTOFS_FS is not set -# CONFIG_AUTOFS4_FS is not set +CONFIG_AUTOFS4_FS=m CONFIG_FUSE_FS=m # @@ -2294,7 +2319,9 @@ CONFIG_MSDOS_FS=y CONFIG_VFAT_FS=y CONFIG_FAT_DEFAULT_CODEPAGE=437 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" -# CONFIG_NTFS_FS is not set +CONFIG_NTFS_FS=m +# CONFIG_NTFS_DEBUG is not set +CONFIG_NTFS_RW=y # # Pseudo filesystems @@ -2308,13 +2335,16 @@ CONFIG_TMPFS=y # CONFIG_HUGETLB_PAGE is not set CONFIG_CONFIGFS_FS=m CONFIG_MISC_FILESYSTEMS=y -# CONFIG_ADFS_FS is not set -# CONFIG_AFFS_FS is not set -# CONFIG_HFS_FS is not set -# CONFIG_HFSPLUS_FS is not set -# CONFIG_BEFS_FS is not set -# CONFIG_BFS_FS is not set -# CONFIG_EFS_FS is not set +CONFIG_ADFS_FS=m +# CONFIG_ADFS_FS_RW is not set +CONFIG_AFFS_FS=m +# CONFIG_ECRYPT_FS is not set +CONFIG_HFS_FS=m +CONFIG_HFSPLUS_FS=m +CONFIG_BEFS_FS=m +# CONFIG_BEFS_DEBUG is not set +CONFIG_BFS_FS=m +CONFIG_EFS_FS=m CONFIG_JFFS2_FS=y CONFIG_JFFS2_FS_DEBUG=0 CONFIG_JFFS2_FS_WRITEBUFFER=y @@ -2333,23 +2363,25 @@ CONFIG_JFFS2_RUBIN=y # CONFIG_JFFS2_CMODE_SIZE is not set CONFIG_JFFS2_CMODE_FAVOURLZO=y CONFIG_UBIFS_FS=y -# CONFIG_UBIFS_FS_XATTR is not set -# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set +CONFIG_UBIFS_FS_XATTR=y +CONFIG_UBIFS_FS_ADVANCED_COMPR=y CONFIG_UBIFS_FS_LZO=y CONFIG_UBIFS_FS_ZLIB=y # CONFIG_UBIFS_FS_DEBUG is not set -# CONFIG_CRAMFS is not set +CONFIG_CRAMFS=m CONFIG_SQUASHFS=y # CONFIG_SQUASHFS_EMBEDDED is not set CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 -# CONFIG_VXFS_FS is not set -# CONFIG_MINIX_FS is not set -# CONFIG_OMFS_FS is not set -# CONFIG_HPFS_FS is not set -# CONFIG_QNX4FS_FS is not set -# CONFIG_ROMFS_FS is not set -# CONFIG_SYSV_FS is not set -# CONFIG_UFS_FS is not set +CONFIG_VXFS_FS=m +CONFIG_MINIX_FS=m +CONFIG_OMFS_FS=m +CONFIG_HPFS_FS=m +CONFIG_QNX4FS_FS=m +CONFIG_ROMFS_FS=m +CONFIG_SYSV_FS=m +CONFIG_UFS_FS=m +# CONFIG_UFS_FS_WRITE is not set +# CONFIG_UFS_DEBUG is not set CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=y CONFIG_NFS_V3=y @@ -2371,12 +2403,30 @@ CONFIG_SUNRPC_GSS=y # CONFIG_SUNRPC_REGISTER_V4 is not set CONFIG_RPCSEC_GSS_KRB5=y # CONFIG_RPCSEC_GSS_SPKM3 is not set -# CONFIG_SMB_FS is not set -# CONFIG_CIFS is not set -# CONFIG_NCP_FS is not set -# CONFIG_CODA_FS is not set -# CONFIG_AFS_FS is not set -# CONFIG_9P_FS is not set +CONFIG_SMB_FS=m +# CONFIG_SMB_NLS_DEFAULT is not set +CONFIG_CIFS=m +CONFIG_CIFS_STATS=y +CONFIG_CIFS_STATS2=y +# CONFIG_CIFS_WEAK_PW_HASH is not set +# CONFIG_CIFS_UPCALL is not set +# CONFIG_CIFS_XATTR is not set +# CONFIG_CIFS_DEBUG2 is not set +CONFIG_CIFS_EXPERIMENTAL=y +# CONFIG_CIFS_DFS_UPCALL is not set +CONFIG_NCP_FS=m +# CONFIG_NCPFS_PACKET_SIGNING is not set +# CONFIG_NCPFS_IOCTL_LOCKING is not set +# CONFIG_NCPFS_STRONG is not set +# CONFIG_NCPFS_NFS_NS is not set +# CONFIG_NCPFS_OS2_NS is not set +# CONFIG_NCPFS_SMALLDOS is not set +# CONFIG_NCPFS_NLS is not set +# CONFIG_NCPFS_EXTRAS is not set +CONFIG_CODA_FS=m +CONFIG_AFS_FS=m +# CONFIG_AFS_DEBUG is not set +CONFIG_9P_FS=m # # Partition Types @@ -2386,60 +2436,62 @@ CONFIG_PARTITION_ADVANCED=y # CONFIG_OSF_PARTITION is not set # CONFIG_AMIGA_PARTITION is not set # CONFIG_ATARI_PARTITION is not set -# CONFIG_MAC_PARTITION is not set +CONFIG_MAC_PARTITION=y CONFIG_MSDOS_PARTITION=y -# CONFIG_BSD_DISKLABEL is not set -# CONFIG_MINIX_SUBPARTITION is not set -# CONFIG_SOLARIS_X86_PARTITION is not set -# CONFIG_UNIXWARE_DISKLABEL is not set -# CONFIG_LDM_PARTITION is not set +CONFIG_BSD_DISKLABEL=y +CONFIG_MINIX_SUBPARTITION=y +CONFIG_SOLARIS_X86_PARTITION=y +CONFIG_UNIXWARE_DISKLABEL=y +CONFIG_LDM_PARTITION=y +CONFIG_LDM_DEBUG=y # CONFIG_SGI_PARTITION is not set # CONFIG_ULTRIX_PARTITION is not set # CONFIG_SUN_PARTITION is not set # CONFIG_KARMA_PARTITION is not set -# CONFIG_EFI_PARTITION is not set +CONFIG_EFI_PARTITION=y # CONFIG_SYSV68_PARTITION is not set CONFIG_NLS=y CONFIG_NLS_DEFAULT="iso8859-1" CONFIG_NLS_CODEPAGE_437=y -# CONFIG_NLS_CODEPAGE_737 is not set -# CONFIG_NLS_CODEPAGE_775 is not set -# CONFIG_NLS_CODEPAGE_850 is not set -# CONFIG_NLS_CODEPAGE_852 is not set -# CONFIG_NLS_CODEPAGE_855 is not set -# CONFIG_NLS_CODEPAGE_857 is not set -# CONFIG_NLS_CODEPAGE_860 is not set -# CONFIG_NLS_CODEPAGE_861 is not set -# CONFIG_NLS_CODEPAGE_862 is not set -# CONFIG_NLS_CODEPAGE_863 is not set -# CONFIG_NLS_CODEPAGE_864 is not set -# CONFIG_NLS_CODEPAGE_865 is not set -# CONFIG_NLS_CODEPAGE_866 is not set -# CONFIG_NLS_CODEPAGE_869 is not set -# CONFIG_NLS_CODEPAGE_936 is not set -# CONFIG_NLS_CODEPAGE_950 is not set -# CONFIG_NLS_CODEPAGE_932 is not set -# CONFIG_NLS_CODEPAGE_949 is not set -# CONFIG_NLS_CODEPAGE_874 is not set -# CONFIG_NLS_ISO8859_8 is not set -# CONFIG_NLS_CODEPAGE_1250 is not set -# CONFIG_NLS_CODEPAGE_1251 is not set -# CONFIG_NLS_ASCII is not set -CONFIG_NLS_ISO8859_1=y -# CONFIG_NLS_ISO8859_2 is not set -# CONFIG_NLS_ISO8859_3 is not set -# CONFIG_NLS_ISO8859_4 is not set -# CONFIG_NLS_ISO8859_5 is not set -# CONFIG_NLS_ISO8859_6 is not set -# CONFIG_NLS_ISO8859_7 is not set -# CONFIG_NLS_ISO8859_9 is not set -# CONFIG_NLS_ISO8859_13 is not set -# CONFIG_NLS_ISO8859_14 is not set -# CONFIG_NLS_ISO8859_15 is not set -# CONFIG_NLS_KOI8_R is not set -# CONFIG_NLS_KOI8_U is not set -# CONFIG_NLS_UTF8 is not set -# CONFIG_DLM is not set +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_ASCII=m +CONFIG_NLS_ISO8859_1=m +CONFIG_NLS_ISO8859_2=m +CONFIG_NLS_ISO8859_3=m +CONFIG_NLS_ISO8859_4=m +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_UTF8=y +CONFIG_DLM=m +# CONFIG_DLM_DEBUG is not set # # Kernel hacking @@ -2517,7 +2569,8 @@ CONFIG_HAVE_ARCH_KGDB=y # # Security options # -# CONFIG_KEYS is not set +CONFIG_KEYS=y +# CONFIG_KEYS_DEBUG_PROC_KEYS is not set # CONFIG_SECURITY is not set # CONFIG_SECURITYFS is not set # CONFIG_SECURITY_FILE_CAPABILITIES is not set @@ -2530,7 +2583,7 @@ CONFIG_CRYPTO=y # # Crypto core or helper # -# CONFIG_CRYPTO_FIPS is not set +CONFIG_CRYPTO_FIPS=y CONFIG_CRYPTO_ALGAPI=y CONFIG_CRYPTO_ALGAPI2=y CONFIG_CRYPTO_AEAD=m @@ -2539,6 +2592,7 @@ CONFIG_CRYPTO_BLKCIPHER=y CONFIG_CRYPTO_BLKCIPHER2=y CONFIG_CRYPTO_HASH=y CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_RNG=m CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_MANAGER2=y @@ -2551,20 +2605,20 @@ CONFIG_CRYPTO_TEST=m # # Authenticated Encryption with Associated Data # -# CONFIG_CRYPTO_CCM is not set -# CONFIG_CRYPTO_GCM is not set -# CONFIG_CRYPTO_SEQIV is not set +CONFIG_CRYPTO_CCM=m +CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_SEQIV=m # # Block modes # CONFIG_CRYPTO_CBC=y -# CONFIG_CRYPTO_CTR is not set -# CONFIG_CRYPTO_CTS is not set +CONFIG_CRYPTO_CTR=m +CONFIG_CRYPTO_CTS=m CONFIG_CRYPTO_ECB=y CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_PCBC=m -# CONFIG_CRYPTO_XTS is not set +CONFIG_CRYPTO_XTS=m # # Hash modes @@ -2579,10 +2633,10 @@ CONFIG_CRYPTO_CRC32C=y CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MICHAEL_MIC=y -# CONFIG_CRYPTO_RMD128 is not set -# CONFIG_CRYPTO_RMD160 is not set -# CONFIG_CRYPTO_RMD256 is not set -# CONFIG_CRYPTO_RMD320 is not set +CONFIG_CRYPTO_RMD128=m +CONFIG_CRYPTO_RMD160=m +CONFIG_CRYPTO_RMD256=m +CONFIG_CRYPTO_RMD320=m CONFIG_CRYPTO_SHA1=m CONFIG_CRYPTO_SHA256=m CONFIG_CRYPTO_SHA512=m @@ -2602,8 +2656,8 @@ CONFIG_CRYPTO_CAST6=m CONFIG_CRYPTO_DES=y CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_KHAZAD=m -# CONFIG_CRYPTO_SALSA20 is not set -# CONFIG_CRYPTO_SEED is not set +CONFIG_CRYPTO_SALSA20=m +CONFIG_CRYPTO_SEED=m CONFIG_CRYPTO_SERPENT=m CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_TWOFISH=m @@ -2618,7 +2672,7 @@ CONFIG_CRYPTO_LZO=y # # Random Number Generation # -# CONFIG_CRYPTO_ANSI_CPRNG is not set +CONFIG_CRYPTO_ANSI_CPRNG=m CONFIG_CRYPTO_HW=y # -- cgit v1.2.3 From 85ec35caba5e29b318e3a6112b42c59c006ba584 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 29 May 2009 15:04:30 +0200 Subject: omapfbplay: bump SRCREV --- recipes/ffmpeg/omapfbplay_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/ffmpeg/omapfbplay_git.bb b/recipes/ffmpeg/omapfbplay_git.bb index 67189c5c3c..9962ec2688 100644 --- a/recipes/ffmpeg/omapfbplay_git.bb +++ b/recipes/ffmpeg/omapfbplay_git.bb @@ -2,11 +2,11 @@ DESCRIPTION = "Simple ffmpeg-based player that uses the omapfb overlays" DEPENDS = "bzip2 lame ffmpeg virtual/kernel" LICENSE = "MIT" -PR = "r15" +PR = "r16" PV = "0.0+${PR}+gitr${SRCREV}" -SRCREV = "f4765e699090872679d4fb2799e35fff5ed4c8df" +SRCREV = "26df4208b57ccb0f0ca101ae4ddb92c956a0ecc0" SRC_URI = "git://git.mansr.com/${PN};protocol=git \ file://fbplay-static.diff;patch=1 " -- cgit v1.2.3 From 78497e8028789d515acc26f2f3dbfa305d1092da Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 29 May 2009 15:05:21 +0200 Subject: libx11-native: add 1.1.5 --- recipes/xorg-lib/libx11-native_1.1.5.bb | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 recipes/xorg-lib/libx11-native_1.1.5.bb diff --git a/recipes/xorg-lib/libx11-native_1.1.5.bb b/recipes/xorg-lib/libx11-native_1.1.5.bb new file mode 100644 index 0000000000..71b45afdf4 --- /dev/null +++ b/recipes/xorg-lib/libx11-native_1.1.5.bb @@ -0,0 +1,8 @@ +require libx11_${PV}.bb + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11" + +DEPENDS = "xproto-native xextproto-native libxau-native xtrans-native libxdmcp-native xcmiscproto-native xf86bigfontproto-native kbproto-native inputproto-native bigreqsproto-native util-macros-native" +PROVIDES = "" + +inherit native -- cgit v1.2.3 From cb00e67e5936cae54278f2923c2ef09227895306 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 29 May 2009 16:36:57 +0200 Subject: ptp-gadget: add ptp gadgetfs driver --- recipes/gphoto2/ptp-gadget_git.bb | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 recipes/gphoto2/ptp-gadget_git.bb diff --git a/recipes/gphoto2/ptp-gadget_git.bb b/recipes/gphoto2/ptp-gadget_git.bb new file mode 100644 index 0000000000..edd08cdf21 --- /dev/null +++ b/recipes/gphoto2/ptp-gadget_git.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "This is a device-side implementation of the PTP (Picture Transfer Protocol)" +LICENSE = "GPLv3" + +DEPENDS = "virtual/kernel" +RDEPENDS = "imagemagick" + +PV = "1.1" +PR_append = "+gitr${SRCREV}" + +SRCREV = "ef7ef29b5cdcf8630c901362a66905b956242e0d" +SRC_URI = "git://git.denx.de/ptp-gadget.git;protocol=git" + +S = "${WORKDIR}/git" + +do_compile () { + export CPPFLAGS="${CPPFLAGS} ${CFLAGS}" + sed -i -e 's:pthread:pthread ${LDFLAGS}:' Makefile + oe_runmake KERNEL_SRC=${STAGING_KERNEL_DIR} CROSS_COMPILE=${TARGET_PREFIX} +} + +do_install () { + sed -i -e s:local/::g Makefile + # "/usr/bin" is hardcoded in the makefile + install -d ${D}/usr/bin + oe_runmake install DESTDIR="${D}" +} + +#Need specific kernel headers +PACKAGE_ARCH = "${MACHINE_ARCH}" -- cgit v1.2.3 From 644465cefaaedb2c40140c225d5e1f539931aeb1 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 29 May 2009 17:05:24 +0200 Subject: ptp-gadget: fix breakages when used with musb_hdrc controllers --- .../0001-Fix-musb_hdrc-EP_STATUS_NAME.patch | 33 ++++++++++++++++++++++ recipes/gphoto2/ptp-gadget_git.bb | 4 ++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 recipes/gphoto2/ptp-gadget/0001-Fix-musb_hdrc-EP_STATUS_NAME.patch diff --git a/recipes/gphoto2/ptp-gadget/0001-Fix-musb_hdrc-EP_STATUS_NAME.patch b/recipes/gphoto2/ptp-gadget/0001-Fix-musb_hdrc-EP_STATUS_NAME.patch new file mode 100644 index 0000000000..80ddf2c19c --- /dev/null +++ b/recipes/gphoto2/ptp-gadget/0001-Fix-musb_hdrc-EP_STATUS_NAME.patch @@ -0,0 +1,33 @@ +From b78a6fe59f5d093c8841a7c2da661af81f762018 Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Fri, 29 May 2009 16:52:10 +0200 +Subject: [ptp-gadget][PATCH 1/2] Fix musb_hdrc EP_STATUS_NAME + +There is no 'ep3', only 'epX{in,out}': +root@beagleboard:~# ls /dev/gadget/ +ep10in ep11in ep12in ep13 ep15 ep1out ep2out ep3out ep4out ep5out ep6out ep7out ep8out ep9out +ep10out ep11out ep12out ep14 ep1in ep2in ep3in ep4in ep5in ep6in ep7in ep8in ep9in musb_hdrc + +Tested on OMAP3530 based beagleboard with iPhoto as PTP application on a macbook + +Signed-off-by: Koen Kooi +--- + ptp.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/ptp.c b/ptp.c +index edb307f..ec80199 100644 +--- a/ptp.c ++++ b/ptp.c +@@ -701,7 +701,7 @@ static int autoconfig(void) + fs_status_desc.bEndpointAddress + = hs_status_desc.bEndpointAddress + = USB_DIR_IN | 3; +- EP_STATUS_NAME = "ep3"; ++ EP_STATUS_NAME = "ep3in"; + + /* Atmel AT91 processors, full speed only */ + } else if (stat(DEVNAME = "at91_udc", &statb) == 0) { +-- +1.6.1 + diff --git a/recipes/gphoto2/ptp-gadget_git.bb b/recipes/gphoto2/ptp-gadget_git.bb index edd08cdf21..376ee2120f 100644 --- a/recipes/gphoto2/ptp-gadget_git.bb +++ b/recipes/gphoto2/ptp-gadget_git.bb @@ -5,10 +5,12 @@ DEPENDS = "virtual/kernel" RDEPENDS = "imagemagick" PV = "1.1" +PR = "r1" PR_append = "+gitr${SRCREV}" SRCREV = "ef7ef29b5cdcf8630c901362a66905b956242e0d" -SRC_URI = "git://git.denx.de/ptp-gadget.git;protocol=git" +SRC_URI = "git://git.denx.de/ptp-gadget.git;protocol=git \ + file://0001-Fix-musb_hdrc-EP_STATUS_NAME.patch;patch=1" S = "${WORKDIR}/git" -- cgit v1.2.3 From 6c483c934e89d389919dfe26890081b2d515b5f8 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 29 May 2009 17:11:59 +0200 Subject: imagemagick: fix program-prefix to not include target-prefix --- recipes/imagemagick/imagemagick_6.4.4-1.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes/imagemagick/imagemagick_6.4.4-1.bb b/recipes/imagemagick/imagemagick_6.4.4-1.bb index 42bf1b8bb6..60dd6afd83 100644 --- a/recipes/imagemagick/imagemagick_6.4.4-1.bb +++ b/recipes/imagemagick/imagemagick_6.4.4-1.bb @@ -3,6 +3,8 @@ SECTION = "console/utils" LICENSE = "GPL" DEPENDS = "tiff" +PR = "r1" + SRC_URI = "ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-${PV}.tar.bz2 \ file://PerlMagic_MakePatch;patch=1 \ " @@ -14,7 +16,7 @@ S = "${WORKDIR}/ImageMagick-${IMVER}" inherit autotools binconfig pkgconfig EXTRA_AUTORECONF += "--exclude=libtoolize" -EXTRA_OECONF = "--without-x --without-freetype --without-perl --disable-openmp" +EXTRA_OECONF = "--program-prefix= --without-x --without-freetype --without-perl --disable-openmp" do_configure() { gnu-configize -- cgit v1.2.3 From 411e9f88738dae423dff7c98b3e3f3dfc712365c Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Fri, 29 May 2009 19:08:21 +0200 Subject: tx27.conf: Initial machine description for Ka-Ro TX27 board --- conf/machine/tx27.conf | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 conf/machine/tx27.conf diff --git a/conf/machine/tx27.conf b/conf/machine/tx27.conf new file mode 100644 index 0000000000..fd04a6319a --- /dev/null +++ b/conf/machine/tx27.conf @@ -0,0 +1,19 @@ +#@TYPE: Machine +#@Name: KARO TX27 +#@DESCRIPTION: Machine configuration for Freescale i.MX27 based Karo TX27 + baseboard + +TARGET_ARCH = "arm" + +MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost usbgadget screen camera" + +GUI_MACHINE_CLASS = "bigscreen" + +PREFERRED_PROVIDER_virtual/kernel = "linux" +PREFERRED_VERSION_linux = "2.6.28" + +require conf/machine/include/tune-arm926ejs.inc + +# used by sysvinit_2 +SERIAL_CONSOLE = "115200 ttymxc0" + +ROOT_FLASH_SIZE = "128" -- cgit v1.2.3 From 4e9b399fb27c7bbe8a4ed54cf6259ddc494c3df0 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Fri, 29 May 2009 19:11:19 +0200 Subject: linux: Initial support for the Ka-Ro TX27 (rev. 4) --- recipes/linux/linux-2.6.28/tx27/defconfig | 1799 + .../linux-2.6.28/tx27/linux-2.6.28-karo4.diff | 40137 +++++++++++++++++++ recipes/linux/linux_2.6.28.bb | 8 +- 3 files changed, 41943 insertions(+), 1 deletion(-) create mode 100644 recipes/linux/linux-2.6.28/tx27/defconfig create mode 100644 recipes/linux/linux-2.6.28/tx27/linux-2.6.28-karo4.diff diff --git a/recipes/linux/linux-2.6.28/tx27/defconfig b/recipes/linux/linux-2.6.28/tx27/defconfig new file mode 100644 index 0000000000..ba5a699b98 --- /dev/null +++ b/recipes/linux/linux-2.6.28/tx27/defconfig @@ -0,0 +1,1799 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.28 +# Thu Mar 12 15:05:31 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_NO_IOPORT is not set +CONFIG_GENERIC_HARDIRQS=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_ARCH_HAS_ILOG2_U32 is not set +# CONFIG_ARCH_HAS_ILOG2_U64 is not set +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ARCH_MTD_XIP=y +CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y +CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" + +# +# General setup +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_LOCK_KERNEL=y +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_LOCALVERSION="" +# CONFIG_LOCALVERSION_AUTO is not set +# CONFIG_SWAP is not set +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +CONFIG_POSIX_MQUEUE=y +# CONFIG_BSD_PROCESS_ACCT is not set +# CONFIG_TASKSTATS is not set +# CONFIG_AUDIT is not set +# CONFIG_IKCONFIG is not set +CONFIG_LOG_BUF_SHIFT=17 +# CONFIG_CGROUPS is not set +# CONFIG_GROUP_SCHED is not set +# CONFIG_SYSFS_DEPRECATED_V2 is not set +# CONFIG_RELAY is not set +# CONFIG_NAMESPACES is not set +# CONFIG_BLK_DEV_INITRD is not set +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +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 +CONFIG_BUG=y +# CONFIG_ELF_CORE is not set +CONFIG_COMPAT_BRK=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_ANON_INODES=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +# CONFIG_AIO is not set +# CONFIG_VM_EVENT_COUNTERS is not set +CONFIG_SLAB=y +# CONFIG_SLUB is not set +# CONFIG_SLOB is not set +# CONFIG_PROFILING is not set +# CONFIG_MARKERS is not set +CONFIG_HAVE_OPROFILE=y +# CONFIG_KPROBES is not set +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_SLABINFO=y +CONFIG_RT_MUTEXES=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +# CONFIG_MODULE_FORCE_LOAD is not set +CONFIG_MODULE_UNLOAD=y +# CONFIG_MODULE_FORCE_UNLOAD is not set +# CONFIG_MODVERSIONS is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_KMOD=y +CONFIG_BLOCK=y +# CONFIG_LBD is not set +# CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_LSF is not set +# CONFIG_BLK_DEV_BSG is not set +# CONFIG_BLK_DEV_INTEGRITY is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +# CONFIG_DEFAULT_AS is not set +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="cfq" +CONFIG_CLASSIC_RCU=y +CONFIG_FREEZER=y + +# +# System Type +# +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_AT91 is not set +# CONFIG_ARCH_CLPS7500 is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_EP93XX is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_IOP13XX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set +# CONFIG_ARCH_IXP23XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_KIRKWOOD is not set +# CONFIG_ARCH_KS8695 is not set +# CONFIG_ARCH_NS9XXX is not set +# CONFIG_ARCH_LOKI is not set +# CONFIG_ARCH_MV78XX0 is not set +CONFIG_ARCH_MXC=y +# CONFIG_ARCH_ORION5X is not set +# CONFIG_ARCH_PNX4008 is not set +# CONFIG_ARCH_PXA is not set +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_LH7A40X is not set +# CONFIG_ARCH_DAVINCI is not set +# CONFIG_ARCH_OMAP is not set +# CONFIG_ARCH_MSM is not set + +# +# Boot options +# + +# +# Power management +# + +# +# Freescale MXC Implementations +# +CONFIG_ARCH_MX2=y +# CONFIG_ARCH_MX3 is not set + +# +# MX2 family CPU support +# +CONFIG_MACH_MX27=y + +# +# MX2 Platforms +# +# CONFIG_MACH_MX27ADS is not set +# CONFIG_MACH_PCM038 is not set +CONFIG_MACH_TX27=y +CONFIG_BASE_CLK_26MHz=y +# CONFIG_KARO_DEBUG is not set +CONFIG_MXC_EMMA=y +# CONFIG_MXC_IRQ_PRIOR is not set +CONFIG_MXC_ULPI=y + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_ARM926T=y +CONFIG_CPU_32v5=y +CONFIG_CPU_ABRT_EV5TJ=y +CONFIG_CPU_PABRT_NOIFAR=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_COPY_V4WB=y +CONFIG_CPU_TLB_V4WBI=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y + +# +# Processor Features +# +CONFIG_ARM_THUMB=y +# CONFIG_CPU_ICACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_WRITETHROUGH is not set +# CONFIG_CPU_CACHE_ROUND_ROBIN is not set +# CONFIG_OUTER_CACHE is not set + +# +# Bus support +# +# CONFIG_PCI_SYSCALL is not set +# CONFIG_ARCH_SUPPORTS_MSI is not set +# CONFIG_PCCARD is not set + +# +# Kernel Features +# +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_VMSPLIT_3G=y +# CONFIG_VMSPLIT_2G is not set +# CONFIG_VMSPLIT_1G is not set +CONFIG_PAGE_OFFSET=0xC0000000 +CONFIG_PREEMPT=y +CONFIG_HZ=100 +CONFIG_AEABI=y +CONFIG_OABI_COMPAT=y +CONFIG_ARCH_FLATMEM_HAS_HOLES=y +# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set +# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +CONFIG_PAGEFLAGS_EXTENDED=y +CONFIG_SPLIT_PTLOCK_CPUS=4096 +# CONFIG_RESOURCES_64BIT is not set +# CONFIG_PHYS_ADDR_T_64BIT is not set +CONFIG_ZONE_DMA_FLAG=0 +CONFIG_VIRT_TO_BUS=y +CONFIG_UNEVICTABLE_LRU=y +CONFIG_ALIGNMENT_TRAP=y + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="root=/dev/mtdblock1 rootfstype=jffs2 console=ttymxc0,115200 ro panic=5" +# CONFIG_XIP_KERNEL is not set +# CONFIG_KEXEC is not set + +# +# CPU Power Management +# +# CONFIG_CPU_IDLE is not set + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +CONFIG_FPE_NWFPE=y +# CONFIG_FPE_NWFPE_XP is not set +# CONFIG_FPE_FASTFPE is not set +# CONFIG_VFP is not set + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +CONFIG_HAVE_AOUT=y +# CONFIG_BINFMT_AOUT is not set +# CONFIG_BINFMT_MISC is not set + +# +# Power management options +# +CONFIG_PM=y +# CONFIG_PM_DEBUG is not set +CONFIG_PM_SLEEP=y +CONFIG_SUSPEND=y +CONFIG_SUSPEND_FREEZER=y +CONFIG_APM_EMULATION=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_NET=y + +# +# Networking options +# +CONFIG_PACKET=y +CONFIG_PACKET_MMAP=y +CONFIG_UNIX=y +# CONFIG_NET_KEY is not set +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +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_ARPD is not set +# CONFIG_SYN_COOKIES is not set +# 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_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_BEET is not set +# CONFIG_INET_LRO is not set +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_CUBIC=y +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_ATM is not set +# CONFIG_BRIDGE is not set +# CONFIG_NET_DSA is not set +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set +# CONFIG_NET_SCHED is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +# CONFIG_CAN is not set +# CONFIG_IRDA is not set +# CONFIG_BT is not set +# CONFIG_AF_RXRPC is not set +# CONFIG_PHONET is not set +CONFIG_WIRELESS=y +CONFIG_CFG80211=m +CONFIG_NL80211=y +CONFIG_WIRELESS_OLD_REGULATORY=y +CONFIG_WIRELESS_EXT=y +CONFIG_WIRELESS_EXT_SYSFS=y +CONFIG_MAC80211=m + +# +# Rate control algorithm selection +# +CONFIG_MAC80211_RC_PID=y +# CONFIG_MAC80211_RC_MINSTREL is not set +CONFIG_MAC80211_RC_DEFAULT_PID=y +# CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set +CONFIG_MAC80211_RC_DEFAULT="pid" +# CONFIG_MAC80211_MESH is not set +# CONFIG_MAC80211_LEDS is not set +# CONFIG_MAC80211_DEBUG_MENU is not set +CONFIG_IEEE80211=m +# CONFIG_IEEE80211_DEBUG is not set +CONFIG_IEEE80211_CRYPT_WEP=m +CONFIG_IEEE80211_CRYPT_CCMP=m +CONFIG_IEEE80211_CRYPT_TKIP=m +# CONFIG_RFKILL is not set +# CONFIG_NET_9P is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=m +CONFIG_FIRMWARE_IN_KERNEL=y +CONFIG_EXTRA_FIRMWARE="" +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +# CONFIG_SYS_HYPERVISOR is not set +CONFIG_CONNECTOR=y +CONFIG_PROC_EVENTS=y +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +# CONFIG_MTD_CONCAT is not set +CONFIG_MTD_PARTITIONS=y +CONFIG_MTD_REDBOOT_PARTS=y +CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-5 +CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y +CONFIG_MTD_REDBOOT_PARTS_READONLY=y +CONFIG_MTD_CMDLINE_PARTS=y +# CONFIG_MTD_AFS_PARTS is not set +# CONFIG_MTD_AR7_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLKDEVS=y +CONFIG_MTD_BLOCK=y +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set +# CONFIG_SSFDC is not set +# CONFIG_MTD_OOPS is not set + +# +# RAM/ROM/Flash chip drivers +# +# CONFIG_MTD_CFI is not set +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_DATAFLASH is not set +# CONFIG_MTD_M25P80 is not set +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set +CONFIG_MTD_NAND=y +# CONFIG_MTD_NAND_VERIFY_WRITE is not set +# CONFIG_MTD_NAND_ECC_SMC is not set +# CONFIG_MTD_NAND_MUSEUM_IDS is not set +# CONFIG_MTD_NAND_GPIO is not set +CONFIG_MTD_NAND_IDS=y +# CONFIG_MTD_NAND_DISKONCHIP is not set +CONFIG_MTD_NAND_MXC_FLASH_BBT=y +# CONFIG_MTD_NAND_NANDSIM is not set +# CONFIG_MTD_NAND_PLATFORM is not set +# CONFIG_MTD_ALAUDA is not set +CONFIG_MTD_NAND_MXC=y +# CONFIG_MTD_ONENAND is not set + +# +# UBI - Unsorted block images +# +# CONFIG_MTD_UBI is not set +# CONFIG_PARPORT is not set +CONFIG_BLK_DEV=y +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=y +# CONFIG_BLK_DEV_CRYPTOLOOP is not set +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_UB is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=16384 +# 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_ICS932S401 is not set +# CONFIG_ENCLOSURE_SERVICES is not set +# CONFIG_C2PORT is not set +CONFIG_HAVE_IDE=y +# CONFIG_IDE is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +CONFIG_SCSI=m +CONFIG_SCSI_DMA=y +# CONFIG_SCSI_TGT is not set +# CONFIG_SCSI_NETLINK is not set +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=m +# CONFIG_CHR_DEV_ST is not set +# CONFIG_CHR_DEV_OSST is not set +# CONFIG_BLK_DEV_SR is not set +# CONFIG_CHR_DEV_SG is not set +# CONFIG_CHR_DEV_SCH is not set + +# +# Some SCSI devices (e.g. CD jukebox) support multiple LUNs +# +CONFIG_SCSI_MULTI_LUN=y +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set +# CONFIG_SCSI_SCAN_ASYNC is not set +CONFIG_SCSI_WAIT_SCAN=m + +# +# SCSI Transports +# +# CONFIG_SCSI_SPI_ATTRS is not set +# CONFIG_SCSI_FC_ATTRS is not set +# CONFIG_SCSI_ISCSI_ATTRS is not set +# CONFIG_SCSI_SAS_LIBSAS is not set +# CONFIG_SCSI_SRP_ATTRS is not set +CONFIG_SCSI_LOWLEVEL=y +# CONFIG_ISCSI_TCP is not set +# CONFIG_SCSI_DEBUG is not set +# CONFIG_SCSI_DH is not set +# CONFIG_ATA is not set +# CONFIG_MD is not set +CONFIG_NETDEVICES=y +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_MACVLAN is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set +# CONFIG_VETH is not set +CONFIG_PHYLIB=y + +# +# MII PHY device drivers +# +# CONFIG_MARVELL_PHY is not set +# CONFIG_DAVICOM_PHY is not set +# CONFIG_QSEMI_PHY is not set +# CONFIG_LXT_PHY is not set +# CONFIG_CICADA_PHY is not set +# CONFIG_VITESSE_PHY is not set +CONFIG_SMSC_PHY=y +# CONFIG_BROADCOM_PHY is not set +# CONFIG_ICPLUS_PHY is not set +# CONFIG_REALTEK_PHY is not set +# CONFIG_FIXED_PHY is not set +# CONFIG_MDIO_BITBANG is not set +CONFIG_NET_ETHERNET=y +CONFIG_MII=y +# CONFIG_AX88796 is not set +# CONFIG_SMC91X is not set +# CONFIG_DM9000 is not set +# CONFIG_ENC28J60 is not set +# CONFIG_SMC911X is not set +# CONFIG_IBM_NEW_EMAC_ZMII is not set +# CONFIG_IBM_NEW_EMAC_RGMII is not set +# CONFIG_IBM_NEW_EMAC_TAH is not set +# CONFIG_IBM_NEW_EMAC_EMAC4 is not set +# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set +# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set +# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set +# CONFIG_B44 is not set +CONFIG_FEC=y +# CONFIG_FEC2 is not set +# CONFIG_NETDEV_1000 is not set +# CONFIG_NETDEV_10000 is not set + +# +# Wireless LAN +# +# CONFIG_WLAN_PRE80211 is not set +CONFIG_WLAN_80211=y +CONFIG_LIBERTAS=m +CONFIG_LIBERTAS_USB=m +# CONFIG_LIBERTAS_SDIO is not set +# CONFIG_LIBERTAS_DEBUG is not set +# CONFIG_LIBERTAS_THINFIRM is not set +# CONFIG_USB_ZD1201 is not set +# CONFIG_USB_NET_RNDIS_WLAN is not set +# CONFIG_RTL8187 is not set +# CONFIG_MAC80211_HWSIM is not set +# CONFIG_P54_COMMON is not set +# CONFIG_IWLWIFI_LEDS is not set +# CONFIG_HOSTAP is not set +# CONFIG_B43 is not set +# CONFIG_B43LEGACY is not set +# CONFIG_ZD1211RW is not set +# CONFIG_RT2X00 is not set + +# +# USB Network Adapters +# +# CONFIG_USB_CATC is not set +# CONFIG_USB_KAWETH is not set +# CONFIG_USB_PEGASUS is not set +# CONFIG_USB_RTL8150 is not set +CONFIG_USB_USBNET=m +# CONFIG_USB_NET_AX8817X is not set +CONFIG_USB_NET_CDCETHER=m +# CONFIG_USB_NET_DM9601 is not set +# CONFIG_USB_NET_SMSC95XX is not set +# CONFIG_USB_NET_GL620A is not set +# CONFIG_USB_NET_NET1080 is not set +# CONFIG_USB_NET_PLUSB is not set +# CONFIG_USB_NET_MCS7830 is not set +CONFIG_USB_NET_RNDIS_HOST=m +CONFIG_USB_NET_CDC_SUBSET=m +# CONFIG_USB_ALI_M5632 is not set +# CONFIG_USB_AN2720 is not set +# CONFIG_USB_BELKIN is not set +CONFIG_USB_ARMLINUX=y +# CONFIG_USB_EPSON2888 is not set +# CONFIG_USB_KC2190 is not set +# CONFIG_USB_NET_ZAURUS is not set +# CONFIG_WAN is not set +# CONFIG_PPP is not set +# CONFIG_SLIP is not set +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set +# CONFIG_ISDN is not set + +# +# Input device support +# +CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set +# CONFIG_INPUT_POLLDEV is not set + +# +# Userland interfaces +# +# CONFIG_INPUT_MOUSEDEV is not set +# CONFIG_INPUT_JOYDEV is not set +CONFIG_INPUT_EVDEV=y +CONFIG_INPUT_EVBUG=m +# CONFIG_INPUT_APMPOWER is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +# CONFIG_KEYBOARD_ATKBD is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_STOWAWAY is not set +CONFIG_KEYBOARD_GPIO=m +# CONFIG_INPUT_MOUSE is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TABLET is not set +CONFIG_INPUT_TOUCHSCREEN=y +# CONFIG_TOUCHSCREEN_ADS7846 is not set +# CONFIG_TOUCHSCREEN_FUJITSU is not set +# CONFIG_TOUCHSCREEN_GUNZE is not set +# CONFIG_TOUCHSCREEN_ELO is not set +# CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_INEXIO is not set +# CONFIG_TOUCHSCREEN_MK712 is not set +# CONFIG_TOUCHSCREEN_PENMOUNT is not set +# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set +# CONFIG_TOUCHSCREEN_TOUCHWIN is not set +CONFIG_TOUCHSCREEN_USB_COMPOSITE=m +CONFIG_TOUCHSCREEN_USB_EGALAX=y +# CONFIG_TOUCHSCREEN_USB_PANJIT is not set +# CONFIG_TOUCHSCREEN_USB_3M is not set +# CONFIG_TOUCHSCREEN_USB_ITM is not set +# CONFIG_TOUCHSCREEN_USB_ETURBO is not set +# CONFIG_TOUCHSCREEN_USB_GUNZE is not set +# CONFIG_TOUCHSCREEN_USB_DMC_TSC10 is not set +CONFIG_TOUCHSCREEN_USB_IRTOUCH=y +CONFIG_TOUCHSCREEN_USB_IDEALTEK=y +CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y +CONFIG_TOUCHSCREEN_USB_GOTOP=y +# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set +# CONFIG_INPUT_MISC is not set + +# +# Hardware I/O ports +# +# CONFIG_SERIO is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +# CONFIG_CONSOLE_TRANSLATIONS is not set +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +CONFIG_VT_HW_CONSOLE_BINDING=y +# CONFIG_DEVKMEM is not set +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +# CONFIG_SERIAL_8250 is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_IMX=y +CONFIG_SERIAL_IMX_CONSOLE=y +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_UNIX98_PTYS=y +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=16 +# CONFIG_IPMI_HANDLER is not set +# CONFIG_HW_RANDOM is not set +# CONFIG_NVRAM is not set +# CONFIG_R3964 is not set +# CONFIG_RAW_DRIVER is not set +# CONFIG_TCG_TPM is not set +CONFIG_I2C=y +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_CHARDEV=m +CONFIG_I2C_HELPER_AUTO=y +CONFIG_I2C_ALGOBIT=m + +# +# I2C Hardware Bus support +# + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +CONFIG_I2C_GPIO=m +CONFIG_I2C_MXC=y +# CONFIG_I2C_OCORES is not set +# CONFIG_I2C_SIMTEC is not set + +# +# External I2C/SMBus adapter drivers +# +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_TAOS_EVM is not set +# CONFIG_I2C_TINY_USB is not set + +# +# Other I2C/SMBus bus drivers +# +# CONFIG_I2C_PCA_PLATFORM is not set +# CONFIG_I2C_STUB is not set + +# +# Miscellaneous I2C Chip support +# +# CONFIG_DS1682 is not set +CONFIG_AT24=m +# CONFIG_SENSORS_EEPROM is not set +# CONFIG_SENSORS_PCF8574 is not set +# CONFIG_PCF8575 is not set +# CONFIG_SENSORS_PCA9539 is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_TPS65010 is not set +# CONFIG_SENSORS_MAX6875 is not set +# CONFIG_SENSORS_TSL2550 is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# CONFIG_I2C_DEBUG_CHIP is not set +CONFIG_SPI=y +# CONFIG_SPI_DEBUG is not set +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +CONFIG_SPI_BITBANG=m +CONFIG_SPI_MXC=m +# CONFIG_SPI_MXC_TEST_LOOPBACK is not set +CONFIG_SPI_MXC_SELECT1=y +# CONFIG_SPI_MXC_SELECT2 is not set +# CONFIG_SPI_MXC_SELECT3 is not set +CONFIG_SPI_MXC_REV0=y +# CONFIG_SPI_MXC_REV4 is not set +# CONFIG_SPI_MXC_REV5 is not set +# CONFIG_SPI_MXC_REV7 is not set + +# +# SPI Protocol Masters +# +CONFIG_SPI_AT25=m +CONFIG_SPI_SPIDEV=m +# CONFIG_SPI_TLE62X0 is not set +CONFIG_ARCH_REQUIRE_GPIOLIB=y +CONFIG_GPIOLIB=y +# CONFIG_DEBUG_GPIO is not set +CONFIG_GPIO_SYSFS=y + +# +# Memory mapped GPIO expanders: +# + +# +# I2C GPIO expanders: +# +# CONFIG_GPIO_MAX732X is not set +# CO