[oe-commits] org.oe.dev linux-openmoko.inc: sync with openmoko so package upgrade doesn't &*$(*@$(@ erase my kernel partition again

[koen commit]

linux-openmoko.inc: sync with openmoko so package upgrade doesn't &*$(*@$(@ erase my kernel partition again

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 003d5589c32126d84385935351087e649339386a
ViewMTN: http://monotone.openembedded.org/revision/info/003d5589c32126d84385935351087e649339386a
Files:
1
packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig
packages/linux/linux-openmoko.inc
Diffs:

#
# mt diff -re5d51ef06db323f64e81b4277041a3eb479eda1b -r003d5589c32126d84385935351087e649339386a
#
#
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig"
#  from [971e7cc0b77f0096a7e40064c28bba3037c67293]
#    to [1f59bd0f16dc22cca1e7db406de551e2c776b891]
# 
# patch "packages/linux/linux-openmoko.inc"
#  from [d0d5a324f355c7fe27eb595ec61b2d6c790e7ead]
#    to [10db4c43150df38c73aa0bf5130a81a8f395991a]
#
============================================================
--- packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig	971e7cc0b77f0096a7e40064c28bba3037c67293
+++ packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig	1f59bd0f16dc22cca1e7db406de551e2c776b891
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.21-hh20
-# Fri Feb 15 01:08:07 2008
+# Thu Aug  7 19:32:15 2008
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -938,7 +938,11 @@ CONFIG_HW_CONSOLE=y
 #
 # Serial drivers
 #
-# CONFIG_SERIAL_8250 is not set
+CONFIG_SERIAL_8250=m
+CONFIG_SERIAL_8250_CS=m
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
 
 #
 # Non-8250 serial port support
============================================================
--- packages/linux/linux-openmoko.inc	d0d5a324f355c7fe27eb595ec61b2d6c790e7ead
+++ packages/linux/linux-openmoko.inc	10db4c43150df38c73aa0bf5130a81a8f395991a
@@ -4,12 +4,12 @@ UBOOT_ENTRYPOINT = "30008000"
 KERNEL_IMAGETYPE = "uImage"
 UBOOT_ENTRYPOINT = "30008000"
 
-FILES_kernel-image = ""
-ALLOW_EMPTY = "1"
-
 COMPATIBLE_HOST = "arm.*-linux"
 COMPATIBLE_MACHINE = 'om-gta01|om-gta02'
 
+CONFIG_NAME_om-gta01 = "gta01"
+CONFIG_NAME_om-gta02 = "gta02"
+
 CMDLINE = "unused -- bootloader passes ATAG list"
 
 ###############################################################
@@ -66,6 +66,10 @@ else
 			exit 1
 		fi
 
+		if [ ! -f /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-${KERNEL_VERSION} ] ; then
+			exit 1
+		fi
+
 		${bindir}/flash_eraseall $MTD_KERNEL_PARTITION
 		${bindir}/nandwrite -p $MTD_KERNEL_PARTITION /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-${KERNEL_VERSION}
 	else