linux-openmoko-devel: update to 2.6.23.1

2 files changed, 18 insertions, 13 deletions

diff --git a/packages/linux/linux-openmoko-devel/defconfig-2.6.23-rc9 b/packages/linux/linux-openmoko-devel/defconfig-2.6.23.1
index c2b7151295..2419f90981 100644
--- a/packages/linux/linux-openmoko-devel/defconfig-2.6.23-rc9
+++ b/packages/linux/linux-openmoko-devel/defconfig-2.6.23.1
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.23-rc9
-# Sun Oct  7 15:39:12 2007
+# Tue Oct  9 15:27:11 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -199,6 +199,7 @@ CONFIG_ARCH_S3C2440=y
 CONFIG_SMDK2440_CPU2440=y
 CONFIG_MACH_HXD8=y
 CONFIG_MACH_NEO1973_GTA02=y
+CONFIG_CPU_S3C2442=y
 
 #
 # S3C2442 Machines
@@ -1735,8 +1736,8 @@ CONFIG_FORCED_INLINING=y
 CONFIG_DEBUG_ERRORS=y
 CONFIG_DEBUG_LL=y
 # CONFIG_DEBUG_ICEDCC is not set
-# CONFIG_DEBUG_S3C_PORT is not set
-CONFIG_DEBUG_S3C_UART=0
+CONFIG_DEBUG_S3C_PORT=y
+CONFIG_DEBUG_S3C_UART=2
 
 #
 # Security options
diff --git a/packages/linux/linux-openmoko-devel_svn+2.6.23-rc9.bb b/packages/linux/linux-openmoko-devel_svn+2.6.23.1.bb
index 004a3db9c7..f116fd1143 100644
--- a/packages/linux/linux-openmoko-devel_svn+2.6.23-rc9.bb
+++ b/packages/linux/linux-openmoko-devel_svn+2.6.23.1.bb
@@ -1,11 +1,14 @@
 require linux.inc
 
 DESCRIPTION = "Linux 2.6.x (development) kernel for FIC SmartPhones shipping w/ OpenMoko"
-VANILLA_VERSION = "2.6.22"
-KERNEL_VERSION = "2.6.23-rc9"
-KERNEL_RELEASE = "2.6.23-rc9"
-PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}-moko11+svnr${SRCREV}"
-PR = "r3"
+VANILLA_VERSION = "2.6.23.1"
+#KERNEL_VERSION = "2.6.23-rc9"
+#KERNEL_RELEASE = "2.6.23-rc9"
+#PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}-moko11+svnr${SRCREV}"
+KERNEL_VERSION = "${VANILLA_VERSION}"
+KERNEL_RELEASE = "${VANILLA_VERSION}"
+PV = "${VANILLA_VERSION}+svnr${SRCREV}"
+PR = "r1"
 
 KERNEL_IMAGETYPE = "uImage"
 UBOOT_ENTRYPOINT = "30008000"
@@ -14,15 +17,16 @@ UBOOT_ENTRYPOINT = "30008000"
 # source and patches
 #
 SRCREV_FORMAT = "patches"
-SRCREV = "3101"
+SRCREV = "3140"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-${KERNEL_VERSION}.bz2 \
+#           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-${KERNEL_VERSION}.bz2 \
            svn://svn.openmoko.org/branches/src/target/kernel/2.6.23.x;module=patches;proto=http;name=patches \
            file://squashfs-2.6.23.patch;patch=1 \
            file://fix-EVIOCGRAB-semantics-2.6.22.5.patch;patch=1 \
-#           file://printascii.patch;patch=1 \
-           file://defconfig-2.6.23-rc9 \
+#           file://printascii-2.6.23.patch;patch=1 \
+           file://hack-gta02-cpu.patch;patch=1 \
+           file://defconfig-2.6.23.1 \
            file://logo_linux_clut224.ppm"
 S = "${WORKDIR}/linux-${VANILLA_VERSION}"
 
@@ -51,7 +55,7 @@ module_autoload_snd-soc-neo1973-wm8753 = "snd-soc-neo1973-wm8753"
 module_autoload_s3cmci = "s3cmci"
 
 do_prepatch() {
-        cd ${S} && patch -p1 < ${WORKDIR}/patch-${KERNEL_VERSION}
+#        cd ${S} && patch -p1 < ${WORKDIR}/patch-${KERNEL_VERSION}
         mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av
         mv patches patches.openmoko
         mv .pc .pc.old