merge of 'b873786ee35b1f62b5c333fe362ee5964ac4b2db'

     and 'd21d59c6a78079e1c4a6449b93e9afdf358e7a6c'

4 files changed, 55 insertions, 3 deletions

diff --git a/packages/linux/linux-openmoko-devel_git.bb b/packages/linux/linux-openmoko-devel_git.bb
index 6b563a012a..e84ee67199 100644
--- a/packages/linux/linux-openmoko-devel_git.bb
+++ b/packages/linux/linux-openmoko-devel_git.bb
@@ -1,7 +1,7 @@
 require linux.inc
 require linux-openmoko.inc
 
-DESCRIPTION = "Linux 2.6.x (development) kernel for FIC SmartPhones shipping w/ OpenMoko"
+DESCRIPTION = "Linux 2.6.x (development) kernel for FIC SmartPhones shipping w/ Openmoko"
 DEFAULT_PREFERENCE = "-1"
 
 KERNEL_RELEASE = "2.6.24-rc8"
diff --git a/packages/linux/linux-openmoko_2.6.22.5.bb b/packages/linux/linux-openmoko_2.6.22.5.bb
index 126221ad6d..e099e7db95 100644
--- a/packages/linux/linux-openmoko_2.6.22.5.bb
+++ b/packages/linux/linux-openmoko_2.6.22.5.bb
@@ -1,7 +1,7 @@
 require linux.inc
 require linux-openmoko.inc
 
-DESCRIPTION = "Linux 2.6.x kernel for FIC SmartPhones shipping w/ OpenMoko"
+DESCRIPTION = "Linux 2.6.x kernel for FIC SmartPhones shipping w/ Openmoko"
 VANILLA_VERSION = "2.6.22"
 KERNEL_RELEASE = "2.6.22.5"
 
diff --git a/packages/linux/linux-openmoko_2.6.24+git.bb b/packages/linux/linux-openmoko_2.6.24+git.bb
new file mode 100644
index 0000000000..6397a5c67c
--- /dev/null
+++ b/packages/linux/linux-openmoko_2.6.24+git.bb
@@ -0,0 +1,52 @@
+require linux.inc
+require linux-openmoko.inc
+
+DESCRIPTION = "Linux 2.6.x (development) kernel for FIC SmartPhones shipping w/ Openmoko"
+
+PE = "1"
+PV = "${KERNEL_RELEASE}+git${SRCDATE}"
+PR = "r0"
+
+SRC_URI = "git://git.openmoko.org/git/kernel.git;protocol=git;branch=stable"
+
+S = "${WORKDIR}/git"
+
+do_configure_prepend() {
+        cp -f ${S}/defconfig-${CONFIG_NAME} ${WORKDIR}/defconfig
+}
+
+##############################################################
+# kernel image resides on a seperate flash partition (for now)
+#
+ALLOW_EMPTY = "1"
+
+CMDLINE = "unused -- bootloader passes ATAG list"
+
+COMPATIBLE_HOST = "arm.*-linux"
+COMPATIBLE_MACHINE = "om-gta01|om-gta02"
+DEFAULT_PREFERENCE = "1"
+
+KERNEL_IMAGETYPE = "uImage"
+KERNEL_RELEASE = "2.6.24"
+KERNEL_VERSION = "${KERNEL_RELEASE}"
+
+CONFIG_NAME_om-gta01 = "gta01"
+CONFIG_NAME_om-gta02 = "gta02"
+
+UBOOT_ENTRYPOINT = "30008000"
+
+###############################################################
+# 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"
+# audio
+module_autoload_snd-soc-neo1973-wm8753 = "snd-soc-neo1973-wm8753"
+module_autoload_snd-soc-neo1973-gta02-wm8753 = "snd-soc-neo1973-gta02-wm8753"
+module_autoload_snd-pcm-oss = "snd-pcm-oss"
+module_autoload_snd-mixer-oss = "snd-mixer-oss"
+# sd/mmc
+module_autoload_s3cmci = "s3cmci"
diff --git a/packages/linux/linux-openmoko_2.6.24.bb b/packages/linux/linux-openmoko_2.6.24.bb
index f87e6b68d8..37ab8351f2 100644
--- a/packages/linux/linux-openmoko_2.6.24.bb
+++ b/packages/linux/linux-openmoko_2.6.24.bb
@@ -1,7 +1,7 @@
 require linux.inc
 require linux-openmoko.inc
 
-DESCRIPTION = "Linux 2.6.x (development) kernel for FIC SmartPhones shipping w/ OpenMoko"
+DESCRIPTION = "Linux 2.6.x (development) kernel for FIC SmartPhones shipping w/ Openmoko"
 VANILLA_VERSION = "2.6.24"
 KERNEL_RELEASE = "2.6.24"