cleanup

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3144 311d38ba-8fff-0310-9ca6-ca027cbcb966

1 files changed, 1 insertions, 91 deletions

diff --git a/meta-extras/packages/linux/linux-android-goldfish_2.6.23-rc20.bb b/meta-extras/packages/linux/linux-android-goldfish_2.6.23-rc20.bb
index a4512eeaca..9ee1ae4469 100644
--- a/meta-extras/packages/linux/linux-android-goldfish_2.6.23-rc20.bb
+++ b/meta-extras/packages/linux/linux-android-goldfish_2.6.23-rc20.bb
@@ -14,12 +14,7 @@ S = "${WORKDIR}/kernel"
 
 RPROVIDES_kernel-base += "hostap-modules"
 
-DOSRC = "http://www.do13.de/openzaurus/patches"
 RPSRC = "http://www.rpsys.net/openzaurus/patches/archive"
-JLSRC = "http://www.cs.wisc.edu/~lenz/zaurus/files"
-BASRC = "http://www.orca.cx/zaurus/patches"
-CHSRC = "http://oz.drigon.com/patches"
-TKSRC = "http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches"
 
 COMPATIBLE_HOST = "arm.*-linux"
 COMPATIBLE_MACHINE = 'android'
@@ -29,63 +24,15 @@ KERNEL_DEPLOY_NAME ?= "${KERNEL_IMAGETYPE}-${PV}-${KERNEL_CUSTOM_NAME}${MACHINE}
 KERNEL_SYMLINK_NAME ?=  "${KERNEL_IMAGETYPE}-${KERNEL_CUSTOM_NAME}${MACHINE}.bin"
 KERNEL_DEFCONFIG ?= "defconfig-${MACHINE}"
 
-CMDLINE_CON = "console=ttyS0,115200n8 console=tty1 noinitrd"
-CMDLINE_CON_collie = "console=ttySA0,115200n8 console=tty1 noinitrd"
-CMDLINE_CON_qemuarm = "console=ttyAMA0,115200n8 console=tty1 noinitrd"
-CMDLINE_CON_zylonite = "console=ttyS0,38400"
-CMDLINE_ROOT ?= "root=/dev/mtdblock2 rootfstype=jffs2"
-CMDLINE_ROOT_spitz ?= "root=/dev/hda1 rootfstype=ext3 rootdelay=1 rw"
-#CMDLINE_ROOT_spitz = "root=/dev/mmcblk0p2 rootfstype=ext2 rootdelay=3 rw"
-CMDLINE_OTHER = "dyntick=enable"
-CMDLINE_DEBUG = '${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "quiet", d)}'
-
-##############################################################
-# Configure memory/ramdisk split for collie
-#
-export mem = '${@bb.data.getVar("COLLIE_MEMORY_SIZE",d,1) or "32"}'
-export rd  = '${@bb.data.getVar("COLLIE_RAMDISK_SIZE",d,1) or "32"}'
-
-CMDLINE_MEM_collie = "mem=${mem}M"
-CMDLINE_MEM_zylonite = "mem=64M"
-CMDLINE_ROTATE_spitz = "fbcon=rotate:1"
-CMDLINE_ROTATE_akita = "fbcon=rotate:1"
-CMDLINE_ROTATE_collie = "fbcon=rotate:1"
-CMDLINE_ROTATE_poodle = "fbcon=rotate:1"
-CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_MEM} ${CMDLINE_ROTATE} ${CMDLINE_OTHER} ${CMDLINE_DEBUG}"
-
+CMDLINE = ""
 
 do_configure() {
 	rm -f ${S}/.config
 
-	if [ "${MACHINE}" = "tosa" ]; then
-		gcc_version=`${KERNEL_CC} -dumpversion`		
-		if [ "${gcc_version}" = "4.0.1" ] || [ "${gcc_version}" = "4.0.2" ]; then
-			die "tosa kernel wont work with gcc 4.0.x"
-		fi
-	fi
-
 	if [ ! -e ${WORKDIR}/${KERNEL_DEFCONFIG} ]; then
 		die "No default configuration for ${MACHINE} available."
 	fi
 
-	if [ "${MACHINE}" = "collie" ]; then
-		mempos=`echo "obase=16; $mem * 1024 * 1024" | bc`
-		rdsize=`echo "$rd * 1024" | bc`
-		total=`expr $mem + $rd`
-		addr=`echo "obase=16; ibase=16; C0000000 + $mempos" | bc`
-	 	if [ "$rd" = "0" ]
-	 	then
-		    echo "No RAMDISK"
-			echo "# CONFIG_MTD_MTDRAM_SA1100 is not set" >> ${S}/.config
-		else
-		    echo "RAMDIR = $rdsize on $addr"
-			echo "CONFIG_MTD_MTDRAM_SA1100=y"           >> ${S}/.config
-			echo "CONFIG_MTDRAM_TOTAL_SIZE=$rdsize"     >> ${S}/.config
-			echo "CONFIG_MTDRAM_ERASE_SIZE=1"           >> ${S}/.config
-			echo "CONFIG_MTDRAM_ABS_POS=$addr"          >> ${S}/.config
-		fi
-	fi
-
 	echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config
 
 	if [ "${TARGET_OS}" = "linux-gnueabi" -o "${TARGET_OS}" = "linux-uclibcgnueabi" ]; then
@@ -99,17 +46,11 @@ do_configure() {
 	if [ "${DISTRO}" = "poky" -a "${MACHINE}" != "collie" ]; then
 		echo "CONFIG_LOGO=y"                          >> ${S}/.config
 		echo "CONFIG_LOGO_OHAND_CLUT224=y"            >> ${S}/.config
-		echo "# CONFIG_LOGO_OZ240_CLUT224 is not set" >> ${S}/.config
-		echo "# CONFIG_LOGO_OZ480_CLUT224 is not set" >> ${S}/.config
-		echo "# CONFIG_LOGO_OZ640_CLUT224 is not set" >> ${S}/.config
 		echo "# CONFIG_LOGO_LINUX_CLUT224 is not set" >> ${S}/.config
 	else 
 		echo "# CONFIG_LOGO is not set"               >> ${S}/.config
 		echo "# CONFIG_LOGO_OHAND_CLUT224 is not set" >> ${S}/.config
 		echo "# CONFIG_LOGO_LINUX_CLUT224 is not set" >> ${S}/.config
-		echo "# CONFIG_LOGO_OZ240_CLUT224 is not set" >> ${S}/.config
-		echo "# CONFIG_LOGO_OZ480_CLUT224 is not set" >> ${S}/.config
-		echo "# CONFIG_LOGO_OZ640_CLUT224 is not set" >> ${S}/.config
 	fi
 
 	sed -e '/CONFIG_AEABI/d' \
@@ -122,38 +63,11 @@ do_configure() {
 	    -e '/CONFIG_LOGO=/d' \
 	    -e '/CONFIG_LOGO_LINUX_CLUT224=/d' \
 	    -e '/CONFIG_LOGO_OHAND_CLUT224=/d' \
-	    -e '/CONFIG_LOGO_OZ240_CLUT224=/d' \
-	    -e '/CONFIG_LOGO_OZ480_CLUT224=/d' \
-	    -e '/CONFIG_LOGO_OZ640_CLUT224=/d' \
 	    '${WORKDIR}/${KERNEL_DEFCONFIG}' >>'${S}/.config'
 
 	yes '' | oe_runmake oldconfig
 }
 
-# Check the kernel is below the 1264*1024 byte limit for the PXA Zaurii
-do_compile_append() {
-	case ${MACHINE} in
-		c7x0 | akita | poodle | spitz | tosa )
-			size=`ls -l arch/${ARCH}/boot/${KERNEL_IMAGETYPE} | awk '{ print $5}'`
-			if [ $size -ge 1294336 ]; then	
-				rm arch/${ARCH}/boot/${KERNEL_IMAGETYPE}
-				echo "Size is $size"
-				die "This kernel is too big for your PXA Zaurus and will destroy data if you flash it. Please reduce the size of the kernel by making more of it modular."
-			fi
-			;;
-		collie )
-			size=`ls -l arch/${ARCH}/boot/${KERNEL_IMAGETYPE} | awk '{ print $5}'`
-			if [ $size -ge 1048576 ]; then	
-				rm arch/${ARCH}/boot/${KERNEL_IMAGETYPE}
-				echo "Size is $size"
-				die "This kernel is too big for your Collie and will not be flashed. Please reduce the size of the kernel by making more of it modular."
-			fi
-			;;
-        	*)
-			;;
-	esac
-}
-
 do_deploy() {
 	install -d ${DEPLOY_DIR_IMAGE}
 	install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_DEPLOY_NAME}
@@ -165,7 +79,3 @@ do_deploy() {
 do_deploy[dirs] = "${S}"
 
 addtask deploy before do_package after do_install
-
-# wlan-ng stuff need compiled kernel sources
-do_rm_work() {
-}