summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2008-08-08 20:45:58 +0000
committerKoen Kooi <koen@openembedded.org>2008-08-08 20:45:58 +0000
commit19d7a70af1f98b1e498930d522c31910b0662799 (patch)
treebfad39e9139e53d4907c51facf2fc00a6d4e23df
parentda481e02805d3a9ec6e4cd70b6cbeb76d0af6fdb (diff)
linux-openmoko.inc: sync with openmoko so package upgrade doesn't &*$(*@$(@ erase my kernel partition again
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig8
-rw-r--r--packages/linux/linux-openmoko.inc10
2 files changed, 13 insertions, 5 deletions
diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig
index 7c8e756060..e5d3cd1a07 100644
--- a/packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig
@@ -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
diff --git a/packages/linux/linux-openmoko.inc b/packages/linux/linux-openmoko.inc
index b4863ca0c8..3a6589791e 100644
--- a/packages/linux/linux-openmoko.inc
+++ b/packages/linux/linux-openmoko.inc
@@ -4,12 +4,12 @@
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