diff options
| -rw-r--r-- | packages/linux/linux-openmoko/defconfig-2.6.22.5 | 4 | ||||
| -rw-r--r-- | packages/linux/linux-openmoko_2.6.22.5.bb | 3 | ||||
| -rw-r--r-- | packages/xorg-xserver/xserver-kdrive-common.inc | 4 | ||||
| -rw-r--r-- | packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb | 4 |
4 files changed, 11 insertions, 4 deletions
diff --git a/packages/linux/linux-openmoko/defconfig-2.6.22.5 b/packages/linux/linux-openmoko/defconfig-2.6.22.5 index 5c0396199f..62a61935f6 100644 --- a/packages/linux/linux-openmoko/defconfig-2.6.22.5 +++ b/packages/linux/linux-openmoko/defconfig-2.6.22.5 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.22.5 -# Mon Nov 12 08:23:42 2007 +# Wed Nov 21 11:45:19 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1257,7 +1257,7 @@ CONFIG_SND_SOC=m CONFIG_SND_S3C24XX_SOC=m CONFIG_SND_S3C24XX_SOC_I2S=m CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753=m -# CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753 is not set +CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753=m # # SoC Audio support for SuperH diff --git a/packages/linux/linux-openmoko_2.6.22.5.bb b/packages/linux/linux-openmoko_2.6.22.5.bb index 00664ad448..1af9ed58a7 100644 --- a/packages/linux/linux-openmoko_2.6.22.5.bb +++ b/packages/linux/linux-openmoko_2.6.22.5.bb @@ -9,7 +9,7 @@ KERNEL_RELEASE = "2.6.22.5" #PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}-moko11+svnr${SRCREV}" PV = "${KERNEL_RELEASE}-moko11+svnr${SRCREV}" -PR = "r8" +PR = "r9" KERNEL_IMAGETYPE = "uImage" UBOOT_ENTRYPOINT = "30008000" @@ -29,6 +29,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.ta file://iis-suspend.patch;patch=1 \ file://s3c24xx-pcm-suspend.patch;patch=1 \ file://gta-vibro-pwm-suspend.patch;patch=1 \ + file://glamo-report-vram-size-to-userspace.patch;patch=1 \ file://defconfig-${KERNEL_RELEASE}" S = "${WORKDIR}/linux-${VANILLA_VERSION}" diff --git a/packages/xorg-xserver/xserver-kdrive-common.inc b/packages/xorg-xserver/xserver-kdrive-common.inc index b0d5e39813..6ea9c8439f 100644 --- a/packages/xorg-xserver/xserver-kdrive-common.inc +++ b/packages/xorg-xserver/xserver-kdrive-common.inc @@ -9,6 +9,7 @@ PACKAGES =+ "xserver-kdrive-fbdev \ xserver-kdrive-xephyr \ xserver-kdrive-epson \ xserver-kdrive-ati \ + xserver-kdrive-glamo \ xserver-kdrive-chips \ xserver-kdrive-i810 \ xserver-kdrive-mach64 \ @@ -32,6 +33,7 @@ DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Ep DESCRIPTION_xserver-kdrive-sdl = "X server from freedesktop.org, SDL version" DESCRIPTION_xserver-kdrive-w100 = "X server from freedesktop.org, supporting the ATI imageon w100 chipset" DESCRIPTION_xserver-kdrive-ati = "X server from freedesktop.org, supporting ATI devices" +DESCRIPTION_xserver-kdrive-glamo = "X server from freedesktop.org, supporting Smedia Glamo chipset" DESCRIPTION_xserver-kdrive-chips = "X server from freedesktop.org, supporting Chips chipsets" DESCRIPTION_xserver-kdrive-i810 = "X server from freedesktop.org, supporting Intel chipsets" DESCRIPTION_xserver-kdrive-imageon = "X server from freedesktop.org, supporting the ATI imageon 100 chipset" @@ -54,6 +56,7 @@ FILES_xserver-kdrive-epson = "${bindir}/Xepson" FILES_xserver-kdrive-sdl = "${bindir}/Xsdl" FILES_xserver-kdrive-w100 = "${bindir}/Xw100" FILES_xserver-kdrive-ati = "${bindir}/Xati" +FILES_xserver-kdrive-glamo = "${bindir}/Xglamo" FILES_xserver-kdrive-chips = "${bindir}/Xchips" FILES_xserver-kdrive-i810 = "${bindir}/Xi810" FILES_xserver-kdrive-imageon = "${bindir}/Ximageon" @@ -74,6 +77,7 @@ RDEPENDS_xserver-kdrive-epson = "${PN}" RDEPENDS_xserver-kdrive-sdl = "${PN}" RDEPENDS_xserver-kdrive-w100 = "${PN}" RDEPENDS_xserver-kdrive-ati = "${PN}" +RDEPENDS_xserver-kdrive-glamo = "${PN}" RDEPENDS_xserver-kdrive-chips = "${PN}" RDEPENDS_xserver-kdrive-i810 = "${PN}" RDEPENDS_xserver-kdrive-mach64 = "${PN}" diff --git a/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb b/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb index 3cc67078a0..7c60fb391e 100644 --- a/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb +++ b/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb @@ -3,7 +3,7 @@ require xserver-kdrive-common.inc DEPENDS += "libxkbfile libxcalibrate" PE = "1" -PR = "r19" +PR = "r20" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ @@ -21,6 +21,8 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ file://w100-fix-offscreen-bmp.patch;patch=1 \ file://kdrive-1.3-18bpp.patch;patch=1 \ file://gumstix-kmode.patch;patch=1 \ + file://smedia-glamo.patch;patch=1 \ + file://build-glamo.patch;patch=1 \ " S = "${WORKDIR}/xorg-server-${PV}" |