summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/linux/linux-gta01.inc10
-rw-r--r--packages/linux/linux-gta01/defconfig-2.6.21.3-fic-gta014
-rw-r--r--packages/linux/linux-gta01/defconfig-2.6.21.5-fic-gta014
-rw-r--r--packages/linux/linux-gta01_2.6.21.5.bb2
4 files changed, 11 insertions, 9 deletions
diff --git a/packages/linux/linux-gta01.inc b/packages/linux/linux-gta01.inc
index 8554d2413c..11729553ab 100644
--- a/packages/linux/linux-gta01.inc
+++ b/packages/linux/linux-gta01.inc
@@ -13,7 +13,8 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-gta01"
# source and patches
#
SRC_URI = "http://ftp.de.kernel.org/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \
- file://defconfig-${VANILLA_VERSION}-${MACHINE}"
+ file://defconfig-${VANILLA_VERSION}-${MACHINE} \
+ file://logo_linux_clut224.ppm"
S = "${WORKDIR}/linux-${VANILLA_VERSION}"
##############################################################
@@ -49,12 +50,13 @@ module_autoload_snd-soc-neo1973-wm8753 = "snd-soc-neo1973-wm8753"
module_autoload_s3cmci = "s3cmci"
do_prepatch() {
- mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av
- rm -Rf patches .pc
+ mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av
+ mv patches patches.old
+ mv .pc .pc.old
}
do_configure() {
- #install -m 0644 ${WORKDIR}/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm
+ install -m 0644 ${WORKDIR}/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm
if [ ! -e ${WORKDIR}/defconfig-${VANILLA_VERSION}-${MACHINE} ]; then
die "No default configuration for ${MACHINE} available."
diff --git a/packages/linux/linux-gta01/defconfig-2.6.21.3-fic-gta01 b/packages/linux/linux-gta01/defconfig-2.6.21.3-fic-gta01
index 16b2ac1dab..a8a4dc6aa7 100644
--- a/packages/linux/linux-gta01/defconfig-2.6.21.3-fic-gta01
+++ b/packages/linux/linux-gta01/defconfig-2.6.21.3-fic-gta01
@@ -1205,10 +1205,10 @@ CONFIG_FONT_6x11=y
#
# Logo configuration
#
-CONFIG_LOGO=y
+# CONFIG_LOGO is not set
# CONFIG_LOGO_LINUX_MONO is not set
# CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_LOGO_LINUX_CLUT224=y
+# CONFIG_LOGO_LINUX_CLUT224 is not set
#
# Sound
diff --git a/packages/linux/linux-gta01/defconfig-2.6.21.5-fic-gta01 b/packages/linux/linux-gta01/defconfig-2.6.21.5-fic-gta01
index 90fc136986..a21b757a94 100644
--- a/packages/linux/linux-gta01/defconfig-2.6.21.5-fic-gta01
+++ b/packages/linux/linux-gta01/defconfig-2.6.21.5-fic-gta01
@@ -1205,10 +1205,10 @@ CONFIG_FONT_6x11=y
#
# Logo configuration
#
-CONFIG_LOGO=y
+# CONFIG_LOGO is not set
# CONFIG_LOGO_LINUX_MONO is not set
# CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_LOGO_LINUX_CLUT224=y
+# CONFIG_LOGO_LINUX_CLUT224 is not set
#
# Sound
diff --git a/packages/linux/linux-gta01_2.6.21.5.bb b/packages/linux/linux-gta01_2.6.21.5.bb
index 9463138cf0..a88076d152 100644
--- a/packages/linux/linux-gta01_2.6.21.5.bb
+++ b/packages/linux/linux-gta01_2.6.21.5.bb
@@ -4,7 +4,7 @@ SRC_URI += "svn://svn.openmoko.org/trunk/src/target/kernel;module=patches;proto=
SRC_URI += "file://fix-EVIOCGRAB-semantics.patch;patch=1"
MOKOR = "moko10"
-PR = "r2"
+PR = "r3"
VANILLA_VERSION = "2.6.21.5"