linux-gta01: disable kernel logo completely (for now)

diff --git a/packages/linux/linux-gta01.inc b/packages/linux/linux-gta01.inc
index 8554d24..1172955 100644 (file)
--- 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 16b2ac1..a8a4dc6 100644 (file)
--- 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 90fc136..a21b757 100644 (file)
--- 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 9463138..a88076d 100644 (file)
--- 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"