#
-# CONFIG_MTD_UBI_DEBUG is not set
+CONFIG_MTD_UBI_DEBUG=y
-+CONFIG_MTD_UBI_DEBUG_MSG=y
++# CONFIG_MTD_UBI_DEBUG_MSG is not set
+# CONFIG_MTD_UBI_DEBUG_PARANOID is not set
-+# CONFIG_MTD_UBI_DEBUG_DISABLE_BGT is not set
++CONFIG_MTD_UBI_DEBUG_DISABLE_BGT=y
+# CONFIG_MTD_UBI_DEBUG_EMULATE_BITFLIPS is not set
+# CONFIG_MTD_UBI_DEBUG_EMULATE_WRITE_FAILURES is not set
+# CONFIG_MTD_UBI_DEBUG_EMULATE_ERASE_FAILURES is not set
+#
+# Additional UBI debugging messages
+#
-+CONFIG_MTD_UBI_DEBUG_MSG_BLD=y
-+CONFIG_MTD_UBI_DEBUG_MSG_EBA=y
-+CONFIG_MTD_UBI_DEBUG_MSG_WL=y
-+CONFIG_MTD_UBI_DEBUG_MSG_IO=y
++# CONFIG_MTD_UBI_DEBUG_MSG_BLD is not set
++# CONFIG_MTD_UBI_DEBUG_MSG_EBA is not set
++# CONFIG_MTD_UBI_DEBUG_MSG_WL is not set
++# CONFIG_MTD_UBI_DEBUG_MSG_IO is not set
# CONFIG_PARPORT is not set
CONFIG_BLK_DEV=y
# CONFIG_BLK_DEV_COW_COMMON is not set
OEV = "oe1"
PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCREV}"
-PR = "r5"
+PR = "r6"
SRC_URI = "\
git://git.openmoko.org/git/kernel.git;protocol=git;branch=om-2.6.31 \
# UBI debugging options
#
CONFIG_MTD_UBI_DEBUG=y
-CONFIG_MTD_UBI_DEBUG_MSG=y
-CONFIG_MTD_UBI_DEBUG_PARANOID=y
+# CONFIG_MTD_UBI_DEBUG_MSG is not set
+# CONFIG_MTD_UBI_DEBUG_PARANOID is not set
CONFIG_MTD_UBI_DEBUG_DISABLE_BGT=y
-CONFIG_MTD_UBI_DEBUG_EMULATE_BITFLIPS=y
-CONFIG_MTD_UBI_DEBUG_EMULATE_WRITE_FAILURES=y
-CONFIG_MTD_UBI_DEBUG_EMULATE_ERASE_FAILURES=y
+# CONFIG_MTD_UBI_DEBUG_EMULATE_BITFLIPS is not set
+# CONFIG_MTD_UBI_DEBUG_EMULATE_WRITE_FAILURES is not set
+# CONFIG_MTD_UBI_DEBUG_EMULATE_ERASE_FAILURES is not set
#
# Additional UBI debugging messages
#
-CONFIG_MTD_UBI_DEBUG_MSG_BLD=y
-CONFIG_MTD_UBI_DEBUG_MSG_EBA=y
-CONFIG_MTD_UBI_DEBUG_MSG_WL=y
-CONFIG_MTD_UBI_DEBUG_MSG_IO=y
+# CONFIG_MTD_UBI_DEBUG_MSG_BLD is not set
+# CONFIG_MTD_UBI_DEBUG_MSG_EBA is not set
+# CONFIG_MTD_UBI_DEBUG_MSG_WL is not set
+# CONFIG_MTD_UBI_DEBUG_MSG_IO is not set
# CONFIG_PARPORT is not set
CONFIG_BLK_DEV=y
# CONFIG_BLK_DEV_COW_COMMON is not set
require linux.inc
require linux-openmoko.inc
-DESCRIPTION_${PN} = "Linux ${KERNEL_VERSION} kernel for the Openmoko Neo GSM Smartphones"
+DESCRIPTION_${PN} = "Linux ${KERNEL_RELEASE} kernel for the Openmoko Neo GSM Smartphones"
-KERNEL_RELEASE = "2.6.32"
-KERNEL_VERSION = "${KERNEL_RELEASE}"
+KERNEL_RELEASE="2.6.32"
OEV = "oe1"
PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCREV}"
-PR = "r2"
+PR = "r4"
SRC_URI = "\
git://git.openmoko.org/git/kernel.git;protocol=git;branch=om-gta02-2.6.32 \
+# UBI debugging options
+#
+CONFIG_MTD_UBI_DEBUG=y
-+CONFIG_MTD_UBI_DEBUG_MSG=y
++# CONFIG_MTD_UBI_DEBUG_MSG is not set
+# CONFIG_MTD_UBI_DEBUG_PARANOID is not set
-+# CONFIG_MTD_UBI_DEBUG_DISABLE_BGT is not set
++CONFIG_MTD_UBI_DEBUG_DISABLE_BGT=y
+# CONFIG_MTD_UBI_DEBUG_USERSPACE_IO is not set
+# CONFIG_MTD_UBI_DEBUG_EMULATE_BITFLIPS is not set
+# CONFIG_MTD_UBI_DEBUG_EMULATE_WRITE_FAILURES is not set
+#
+# Additional UBI debugging messages
+#
-+CONFIG_MTD_UBI_DEBUG_MSG_BLD=y
-+CONFIG_MTD_UBI_DEBUG_MSG_EBA=y
-+CONFIG_MTD_UBI_DEBUG_MSG_WL=y
-+CONFIG_MTD_UBI_DEBUG_MSG_IO=y
++# CONFIG_MTD_UBI_DEBUG_MSG_BLD is not set
++# CONFIG_MTD_UBI_DEBUG_MSG_EBA is not set
++# CONFIG_MTD_UBI_DEBUG_MSG_WL is not set
++# CONFIG_MTD_UBI_DEBUG_MSG_IO is not set
# CONFIG_PARPORT is not set
CONFIG_BLK_DEV=y
# CONFIG_BLK_DEV_COW_COMMON is not set
OMV = "oe11"
PV = "${KERNEL_RELEASE}-${OMV}+gitr${SRCREV}"
-PR = "r6"
+PR = "r7"
SRC_URI = "\
git://git.openmoko.org/git/kernel.git;protocol=git;branch=andy-tracking \
index e17ddc3..7506963 100644
--- a/arch/arm/configs/gta02_drm_defconfig
+++ b/arch/arm/configs/gta02_drm_defconfig
-@@ -1,7 +1,7 @@
- #
- # Automatically generated make config: don't edit
- # Linux kernel version: 2.6.29-rc3
--# Sun Nov 8 10:53:31 2009
-+# Sun Nov 8 10:57:36 2009
- #
- CONFIG_ARM=y
- CONFIG_HAVE_PWM=y
@@ -806,7 +806,30 @@ CONFIG_MTD_NAND_S3C2410_HWECC=y
#
# UBI - Unsorted block images
+# UBI debugging options
+#
+CONFIG_MTD_UBI_DEBUG=y
-+CONFIG_MTD_UBI_DEBUG_MSG=y
++# CONFIG_MTD_UBI_DEBUG_MSG is not set
+# CONFIG_MTD_UBI_DEBUG_PARANOID is not set
-+# CONFIG_MTD_UBI_DEBUG_DISABLE_BGT is not set
++CONFIG_MTD_UBI_DEBUG_DISABLE_BGT=y
+# CONFIG_MTD_UBI_DEBUG_USERSPACE_IO is not set
+# CONFIG_MTD_UBI_DEBUG_EMULATE_BITFLIPS is not set
+# CONFIG_MTD_UBI_DEBUG_EMULATE_WRITE_FAILURES is not set
+#
+# Additional UBI debugging messages
+#
-+CONFIG_MTD_UBI_DEBUG_MSG_BLD=y
-+CONFIG_MTD_UBI_DEBUG_MSG_EBA=y
-+CONFIG_MTD_UBI_DEBUG_MSG_WL=y
-+CONFIG_MTD_UBI_DEBUG_MSG_IO=y
++# CONFIG_MTD_UBI_DEBUG_MSG_BLD is not set
++# CONFIG_MTD_UBI_DEBUG_MSG_EBA is not set
++# CONFIG_MTD_UBI_DEBUG_MSG_WL is not set
++# CONFIG_MTD_UBI_DEBUG_MSG_IO is not set
# CONFIG_PARPORT is not set
CONFIG_BLK_DEV=y
# CONFIG_BLK_DEV_COW_COMMON is not set
OMV = "oe15"
PV = "${KERNEL_RELEASE}-drm-${OMV}+gitr${SRCREV}"
-PR = "r4"
+PR = "r5"
SRC_URI = "\
git://git.openmoko.org/git/kernel.git;protocol=git;branch=drm-tracking \