[oe-commits] Andrea Adami : linux-kexecboot: update 2.6.37 defconfig for ben-nanonote. Bump INC_PR.
git version control
git at git.openembedded.org
Tue Mar 1 23:43:29 UTC 2011
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 2479922601524bc1fbab31e3b7048ba4d59a3410
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=2479922601524bc1fbab31e3b7048ba4d59a3410
Author: Andrea Adami <andrea.adami at gmail.com>
Date: Wed Mar 2 00:41:07 2011 +0100
linux-kexecboot: update 2.6.37 defconfig for ben-nanonote. Bump INC_PR.
Signed-off-by: Andrea Adami <andrea.adami at gmail.com>
---
.../linux-kexecboot-2.6.37/ben-nanonote/defconfig | 22 +++++++++++--------
.../ben-nanonote/jz4740-udc.patch | 13 +++++------
recipes/linux/linux-kexecboot_2.6.37.bb | 4 +-
3 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/recipes/linux/linux-kexecboot-2.6.37/ben-nanonote/defconfig b/recipes/linux/linux-kexecboot-2.6.37/ben-nanonote/defconfig
index 361569e..4524e4e 100644
--- a/recipes/linux/linux-kexecboot-2.6.37/ben-nanonote/defconfig
+++ b/recipes/linux/linux-kexecboot-2.6.37/ben-nanonote/defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux/mips 2.6.37 Kernel Configuration
-# Tue Mar 1 02:56:10 2011
+# Wed Mar 2 00:39:13 2011
#
CONFIG_MIPS=y
@@ -181,17 +181,18 @@ CONFIG_LOG_BUF_SHIFT=14
# CONFIG_SYSFS_DEPRECATED is not set
# CONFIG_RELAY is not set
CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE="initramfs.cpio.lzma"
+CONFIG_INITRAMFS_SOURCE="initramfs.cpio.gz"
CONFIG_INITRAMFS_ROOT_UID=0
CONFIG_INITRAMFS_ROOT_GID=0
CONFIG_RD_GZIP=y
# CONFIG_RD_BZIP2 is not set
-# CONFIG_RD_LZMA is not set
-# CONFIG_RD_LZO is not set
+CONFIG_RD_LZMA=y
+CONFIG_RD_LZO=y
# CONFIG_INITRAMFS_COMPRESSION_NONE is not set
CONFIG_INITRAMFS_COMPRESSION_GZIP=y
# CONFIG_INITRAMFS_COMPRESSION_LZMA is not set
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+# CONFIG_INITRAMFS_COMPRESSION_LZO is not set
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_SYSCTL=y
CONFIG_ANON_INODES=y
CONFIG_EMBEDDED=y
@@ -441,7 +442,7 @@ CONFIG_MTD=y
# CONFIG_MTD_CONCAT is not set
CONFIG_MTD_PARTITIONS=y
# CONFIG_MTD_REDBOOT_PARTS is not set
-# CONFIG_MTD_CMDLINE_PARTS is not set
+CONFIG_MTD_CMDLINE_PARTS=y
# CONFIG_MTD_AR7_PARTS is not set
#
@@ -906,8 +907,9 @@ CONFIG_USB_GADGET=y
# CONFIG_USB_GADGET_DEBUG_FS is not set
CONFIG_USB_GADGET_VBUS_DRAW=2
CONFIG_USB_GADGET_SELECTED=y
-CONFIG_USB_GADGET_R8A66597=y
-CONFIG_USB_R8A66597=y
+CONFIG_USB_GADGET_JZ4740=y
+CONFIG_USB_JZ4740=y
+# CONFIG_USB_GADGET_R8A66597 is not set
# CONFIG_USB_GADGET_M66592 is not set
CONFIG_USB_GADGET_DUALSPEED=y
# CONFIG_USB_ZERO is not set
@@ -1210,7 +1212,7 @@ CONFIG_TRACING_SUPPORT=y
CONFIG_HAVE_ARCH_KGDB=y
CONFIG_EARLY_PRINTK=y
CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE=""
+CONFIG_CMDLINE="console=tty0 console=ttyS0,57600n8 mem=32M"
# CONFIG_CMDLINE_OVERRIDE is not set
# CONFIG_SPINLOCK_TEST is not set
@@ -1332,6 +1334,8 @@ CONFIG_ZLIB_DEFLATE=y
CONFIG_LZO_COMPRESS=y
CONFIG_LZO_DECOMPRESS=y
CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_LZO=y
CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT=y
CONFIG_HAS_DMA=y
diff --git a/recipes/linux/linux-kexecboot-2.6.37/ben-nanonote/jz4740-udc.patch b/recipes/linux/linux-kexecboot-2.6.37/ben-nanonote/jz4740-udc.patch
index 67dca33..09a4dd5 100644
--- a/recipes/linux/linux-kexecboot-2.6.37/ben-nanonote/jz4740-udc.patch
+++ b/recipes/linux/linux-kexecboot-2.6.37/ben-nanonote/jz4740-udc.patch
@@ -72,7 +72,7 @@ new file mode 100644
index 0000000..68e511a
--- /dev/null
+++ b/drivers/usb/gadget/jz4740_udc.c
-@@ -0,0 +1,2377 @@
+@@ -0,0 +1,2378 @@
+/*
+ * linux/drivers/usb/gadget/jz4740_udc.c
+ *
@@ -504,12 +504,13 @@ index 0000000..68e511a
+ * Register entry point for the peripheral controller driver.
+ */
+
-+int usb_gadget_register_driver(struct usb_gadget_driver *driver)
++int usb_gadget_probe_driver(struct usb_gadget_driver *driver,
++ int (*bind)(struct usb_gadget *))
+{
+ struct jz4740_udc *dev = &jz4740_udc_controller;
+ int retval;
+
-+ if (!driver || !driver->bind)
++ if (!driver || !bind)
+ return -EINVAL;
+
+ if (!dev)
@@ -522,7 +523,7 @@ index 0000000..68e511a
+ dev->driver = driver;
+ dev->gadget.dev.driver = &driver->driver;
+
-+ retval = driver->bind(&dev->gadget);
++ retval = bind(&dev->gadget);
+ if (retval) {
+ DEBUG("%s: bind to driver %s --> error %d\n", dev->gadget.name,
+ driver->driver.name, retval);
@@ -540,7 +541,7 @@ index 0000000..68e511a
+
+ return 0;
+}
-+EXPORT_SYMBOL(usb_gadget_register_driver);
++EXPORT_SYMBOL(usb_gadget_probe_driver);
+
+static void stop_activity(struct jz4740_udc *dev,
+ struct usb_gadget_driver *driver)
@@ -2557,5 +2558,3 @@ index 0000000..53fd1da
+}
+
+#endif /* __USB_GADGET_JZ4740_H__ */
-
-
diff --git a/recipes/linux/linux-kexecboot_2.6.37.bb b/recipes/linux/linux-kexecboot_2.6.37.bb
index 1925488..d3946dc 100644
--- a/recipes/linux/linux-kexecboot_2.6.37.bb
+++ b/recipes/linux/linux-kexecboot_2.6.37.bb
@@ -1,6 +1,6 @@
require linux-kexecboot.inc
-PR = "${INC_PR}.3"
+PR = "${INC_PR}.4"
S = "${WORKDIR}/linux-${PV}"
@@ -17,7 +17,7 @@ SRC_URI_append_collie = " file://collie-locomo-kb.patch;status=upstream "
SRC_URI_append_ben-nanonote = "file://modifier-keys.patch \
file://defconfig \
-# file://jz4740-udc.patch \
+ file://jz4740-udc.patch \
"
SRC_URI[kernel.md5sum] = "c8ee37b4fdccdb651e0603d35350b434"
More information about the Openembedded-commits
mailing list