diff options
| -rw-r--r-- | conf/checksums.ini | 12 | ||||
| -rw-r--r-- | packages/gstreamer/gst-plugins.inc | 2 | ||||
| -rw-r--r-- | packages/linux/linux-openmoko-devel/defconfig-2.6.23.1 (renamed from packages/linux/linux-openmoko-devel/defconfig-2.6.23-rc9) | 7 | ||||
| -rw-r--r-- | packages/linux/linux-openmoko-devel_svn+2.6.23.1.bb (renamed from packages/linux/linux-openmoko-devel_svn+2.6.23-rc9.bb) | 24 |
4 files changed, 31 insertions, 14 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index 2f5e67c762..7b6427e18c 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -6162,6 +6162,18 @@ sha256=c2fd6bcd2b7c1b3d37d64e4d1825703792a75474830a3db7d2dc603a8d392d58 md5=34b0f354819217e6a345f48ebbd8f13e sha256=2c14ada1ac7d272e03b430d3a530d60fc9ec69cc8252382aa049afba7d2b8558 +[http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.22.tar.bz2] +md5=2e230d005c002fb3d38a3ca07c0200d0 +sha256=73c10604c53f1a6ee65ef805293d23903696f8cef864f42d7de9506f0d2ba4c7 + +[http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2] +md5=2cc2fd4d521dc5d7cfce0d8a9d1b3472 +sha256=d4e67c0935ffb2a4158234bff92cc791b83177866009fc9b2214104e0038dbdb + +[http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.23.1.tar.bz2] +md5=518d57e08fdacd88907166a3bfe383b7 +sha256=35bcba56edf2a24f5d38bac0e530b2ce0e06eb094ba083b4a679c903077a671c + [http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.9.tar.bz2] md5=e921200f074ca97184e150ef5a4af825 sha256=f5dba6366e87e91234d1b0069cfea655b0a4cb37ea97f899226f16998e6ab9f1 diff --git a/packages/gstreamer/gst-plugins.inc b/packages/gstreamer/gst-plugins.inc index 48f33ff539..8e8fd0f1ca 100644 --- a/packages/gstreamer/gst-plugins.inc +++ b/packages/gstreamer/gst-plugins.inc @@ -6,7 +6,7 @@ PACKAGES_DYNAMIC = "gst-plugin-*" SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2" -EXTRA_OECONF = "--disable-aalib --disable-shout2 --disable-sdl -disable-cdaudio --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR} " +EXTRA_OECONF = "--disable-aalib --disable-shout2 --disable-sdl --disable-cdaudio --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR} " acpaths = "-I ${S}/common/m4 -I ${S}/m4" 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 |