[oe-commits] org.oe.dev linux-gta01: update .inc

[mickeyl commit]

linux-gta01: update .inc

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 090ae6ced13cea1936f2f3fd3ec1364f9a1bc2d1
ViewMTN: http://monotone.openembedded.org/revision.psp?id=090ae6ced13cea1936f2f3fd3ec1364f9a1bc2d1
Files:
1
packages/linux/linux-gta01.inc
Diffs:

#
# mt diff -rab84cd18778c0e10bd5235beddef39c93fc8ad53 -r090ae6ced13cea1936f2f3fd3ec1364f9a1bc2d1
#
# 
# 
# patch "packages/linux/linux-gta01.inc"
#  from [a905e1e7ffd865b4f347500527281bf7ebcf0c5d]
#    to [7f71764471bd651438dce3f94f56a85f1e3e345d]
# 
============================================================
--- packages/linux/linux-gta01.inc	a905e1e7ffd865b4f347500527281bf7ebcf0c5d
+++ packages/linux/linux-gta01.inc	7f71764471bd651438dce3f94f56a85f1e3e345d
@@ -1,9 +1,9 @@ LICENSE = "GPL"
 DESCRIPTION = "2.6 Linux Development Kernel for FIC Neo1973 (GTA01)"
 SECTION = "kernel"
 AUTHOR = "Harald Welte <laforge at openmoko.org>"
 HOMEPAGE = "N/A"
 LICENSE = "GPL"
-DEPENDS += "u-boot-mkimage-gta01-native"
+DEPENDS += "quilt-native uboot-gta01"
 
 inherit kernel
 
@@ -12,7 +12,7 @@ FILESDIR = "${@os.path.dirname(bb.data.g
 ##############################################################
 # source and patches
 #
-SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \
+SRC_URI = "http://ftp.de.kernel.org/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \
            file://defconfig-${VANILLA_VERSION}-${MACHINE}"
 S = "${WORKDIR}/linux-${VANILLA_VERSION}"
 
@@ -22,9 +22,10 @@ ALLOW_EMPTY = "1"
 FILES_kernel-image = ""
 ALLOW_EMPTY = "1"
 
+COMPATIBLE_HOST = "arm.*-linux"
 COMPATIBLE_MACHINE = 'fic-gta01'
 
-CMDLINE_CON = ""
+CMDLINE_CON = "console=ttySAC0,115200n8"
 #CMDLINE_ROOT = "root=/dev/mmcblk0p1 rootfstype=ext3 rootdelay=5"
 # uncomment if you want to boot over NFS
 #CMDLINE_ROOT = "root=/dev/nfs nfsroot=192.168.1.10:/export/opie-image rootdelay=5 3"
@@ -37,10 +38,15 @@ CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT
 ###############################################################
 # module configs specific to this kernel
 #
+
+# usb
 module_autoload_ohci-hcd = "ohci-hcd"
+module_autoload_hci_usb = "hci_usb"
 module_autoload_g_ether = "g_ether"
-#module_autoload_snd-pcm-oss = "snd-pcm-oss"
-#module_autoload_snd-soc-corgi_c7x0 = "snd-soc-s3c24xx"
+# audio
+module_autoload_snd-soc-neo1973-wm8753 = "snd-soc-neo1973-wm8753"
+# sd/mmc
+module_autoload_s3cmci = "s3cmci"
 
 do_prepatch() {
         mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av
@@ -48,6 +54,8 @@ do_configure() {
 }
 
 do_configure() {
+	#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."
 	fi
@@ -79,12 +87,12 @@ do_deploy() {
 #
 do_deploy() {
 	install -d ${DEPLOY_DIR_IMAGE}
-	install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}-${DATETIME}.bin
+	install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}.bin
 	tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${PR}-${MACHINE}.tgz -C ${D} lib
-	${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin
+	arm-linux-objcopy -O binary -R .note -R .comment -S vmlinux linux.bin
 	rm -f linux.bin.gz
 	gzip -9 linux.bin
-	uboot-mkimage -A arm -O linux -T kernel -C gzip -a 30008000 -e 30008000 -n "OpenMoko Kernel Image Neo1973(GTA01)" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin
+	${STAGING_BINDIR_NATIVE}/uboot-mkimage -A arm -O linux -T kernel -C gzip -a 30008000 -e 30008000 -n "OpenMoko Kernel Image Neo1973(GTA01)" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin
 	rm -f linux.bin.gz
 }