[oe-commits] org.oe.dev merge of '68843ccbc1303f0acf6b974257c646058b1a731a'

[jeremy_laine commit]

merge of '68843ccbc1303f0acf6b974257c646058b1a731a'
     and '7255c9706337fa8c7170d867233d05ae2dd0c459'

Author: jeremy_laine at openembedded.org
Branch: org.openembedded.dev
Revision: 0ad35e389f09a922b10c36c96396701c2d57f4b5
ViewMTN: http://monotone.openembedded.org/revision/info/0ad35e389f09a922b10c36c96396701c2d57f4b5
Files:
1
MAINTAINERS
packages/linux/linux-openmoko-devel_git.bb
Diffs:

#
# mt diff -r68843ccbc1303f0acf6b974257c646058b1a731a -r0ad35e389f09a922b10c36c96396701c2d57f4b5
#
# 
# 
# patch "MAINTAINERS"
#  from [155ffaa8b1c7c3d0b95f6e30e55feaa7f3530a0f]
#    to [b8e3c72c3bb3bde8d00aff12f6ba2abeeb57ed02]
# 
============================================================
--- MAINTAINERS	155ffaa8b1c7c3d0b95f6e30e55feaa7f3530a0f
+++ MAINTAINERS	b8e3c72c3bb3bde8d00aff12f6ba2abeeb57ed02
@@ -92,6 +92,12 @@ Recipes:    chumby-*, initramfs-chumby
 Machines:   chumby
 Recipes:    chumby-*, initramfs-chumby
 
+Person:     Jeremy Lainé
+Mail:       jeremy.laine at bolloretelecom.eu
+Website:    http://www.jerryweb.org/
+Machines:   mpc8313e-rdb
+Recipes:    libexosip2, python-cheetah, python-django, python-pyopenssl
+
 Person:     Joaquim Duran
 Mail:       joaquinduran at adtelecom.es
 Recipes:    gtk+, gtkmm


#
# mt diff -r7255c9706337fa8c7170d867233d05ae2dd0c459 -r0ad35e389f09a922b10c36c96396701c2d57f4b5
#
# 
# 
# add_file "packages/linux/linux-openmoko-devel_git.bb"
#  content [e866bcbb4f9ba5cefb2629e3194179eb317ece60]
# 
============================================================
--- packages/linux/linux-openmoko-devel_git.bb	e866bcbb4f9ba5cefb2629e3194179eb317ece60
+++ packages/linux/linux-openmoko-devel_git.bb	e866bcbb4f9ba5cefb2629e3194179eb317ece60
@@ -0,0 +1,46 @@
+require linux.inc
+require linux-openmoko.inc
+
+DESCRIPTION = "Linux 2.6.x (development) kernel for FIC SmartPhones shipping w/ OpenMoko"
+DEFAULT_PREFERENCE = "-1"
+
+KERNEL_RELEASE = "2.6.24-rc8"
+KERNEL_VERSION = "${KERNEL_RELEASE}"
+
+# If you use a rc, you will need to use this:
+PV = "${KERNEL_RELEASE}+git${SRCREV}"
+PR = "r0"
+
+KERNEL_IMAGETYPE = "uImage"
+UBOOT_ENTRYPOINT = "30008000"
+
+SRC_URI = "git://git.openmoko.org/git/kernel.git;protocol=git;branch=andy"
+S = "${WORKDIR}/git"
+
+##############################################################
+# kernel image resides on a seperate flash partition (for now)
+#
+FILES_kernel-image = ""
+ALLOW_EMPTY = "1"
+
+COMPATIBLE_HOST = "arm.*-linux"
+COMPATIBLE_MACHINE = 'fic-gta01|fic-gta02'
+
+CMDLINE = "unused -- bootloader passes ATAG list"
+
+###############################################################
+# 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"
+# sd/mmc
+module_autoload_s3cmci = "s3cmci"
+
+do_configure_prepend() {
+        mv defconfig-2.6.24 ${WORKDIR}/defconfig
+}