From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Thu, 2 Sep 2010 21:20:24 +0000 (+0200)
Subject: Merge branch 'imx' into org.openembedded.dev
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=261676fed0818a60a6f5b4dc781235cc6c49ba86;p=openembedded.git

Merge branch 'imx' into org.openembedded.dev
---

261676fed0818a60a6f5b4dc781235cc6c49ba86
diff --cc recipes/linux/linux_2.6.31.bb
index 5c1562c088,a8fa74ce1f..be8baf05d5
--- a/recipes/linux/linux_2.6.31.bb
+++ b/recipes/linux/linux_2.6.31.bb
@@@ -13,18 -13,19 +13,19 @@@ DEFAULT_PREFERENCE_qemumips = "1
  DEFAULT_PREFERENCE_qemux86 = "1"
  DEFAULT_PREFERENCE_iei-nanogx-466 = "1"
  DEFAULT_PREFERENCE_cm-x300 = "1"
+ DEFAULT_PREFERENCE_babbage = "1"
  
  SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2;name=kernel \
 -           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.12.bz2;patch=1;name=stablepatch \
 +           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.12.bz2;apply=yes;name=stablepatch \
             file://defconfig"
  
 -SRC_URI += "file://0001-Squashfs-move-zlib-decompression-wrapper-code-into.patch;patch=1 \
 -            file://0002-Squashfs-Factor-out-remaining-zlib-dependencies-int.patch;patch=1 \
 -            file://0003-Squashfs-add-a-decompressor-framework.patch;patch=1 \
 -            file://0004-Squashfs-add-decompressor-entries-for-lzma-and-lzo.patch;patch=1 \
 -            file://0005-Squashfs-add-an-extra-parameter-to-the-decompressor.patch;patch=1 \
 -            file://0006-Squashfs-add-LZMA-compression.patch;patch=1 \
 -            file://0007-Squashfs-Make-unlzma-available-to-non-initramfs-ini.patch;patch=1 \
 +SRC_URI += "file://0001-Squashfs-move-zlib-decompression-wrapper-code-into.patch \
 +            file://0002-Squashfs-Factor-out-remaining-zlib-dependencies-int.patch \
 +            file://0003-Squashfs-add-a-decompressor-framework.patch \
 +            file://0004-Squashfs-add-decompressor-entries-for-lzma-and-lzo.patch \
 +            file://0005-Squashfs-add-an-extra-parameter-to-the-decompressor.patch \
 +            file://0006-Squashfs-add-LZMA-compression.patch \
 +            file://0007-Squashfs-Make-unlzma-available-to-non-initramfs-ini.patch \
             "
  
  SRC_URI_append_db1200 ="\
@@@ -68,9 -69,15 +69,15 @@@ SRC_URI_append_ep93xx = " 
             "
  
  SRC_URI_append_cm-x300 = "\
 -           file://linux-2.6.31-cm-x300.patch;patch=1 \
 +           file://linux-2.6.31-cm-x300.patch \
             "
  
+ SRC_URI_append_babbage = " \
+            http://download.berlios.de/mx25patches/linux-2.6.31.12-imx-09.12.00.patch.bz2;patch=1;name=patchbabbage \
+ 	   file://0001-Revert-ENGR00119267-revert-to-gcc-4.1.2-toolchain.patch;patch=1 \
+            file://defconfig \
+            "
+ 
  do_devicetree_image_append_boc01() {
  	dtc -I dts -O dtb ${KERNEL_DEVICETREE_FLAGS} -o devicetree.v1 ${KERNEL_DEVICETREE}.v1
  	install -m 0644 devicetree.v1 ${D}/boot/devicetree-${KERNEL_VERSION}.v1
diff --cc recipes/u-boot/u-boot_2009.08.bb
index 32037f2e9e,2d6bded170..506a0cb2c5
--- a/recipes/u-boot/u-boot_2009.08.bb
+++ b/recipes/u-boot/u-boot_2009.08.bb
@@@ -9,9 -10,15 +10,15 @@@ DEFAULT_PREFERENCE_babbage  = "1
  SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 "
  
  SRC_URI_append_igep0020 = " \
 -	file://update-mach-types.patch;patch=1 \
 -	file://add-board-support-for-IGEP-v2-series-rev-B.patch;patch=1 \
 +	file://update-mach-types.patch \
 +	file://add-board-support-for-IGEP-v2-series-rev-B.patch \
  "
+ SRC_URI_append_babbage ="\
+            http://download.berlios.de/mx25patches/u-boot-v2009.08-imx-09.12.00.patch.bz2;patch=1;name=ubootbabbage \
+            "
+ 
+ SRC_URI[ubootbabbage.md5sum] = "b7bc4870b647de422b983ea3acc367a5"
+ SRC_URI[ubootbabbage.sha256sum] = "c65baf791f987126251dfcb5fa100ffef6cf6b668b71d57c2ca4e1128870ff9b"
  
  TARGET_LDFLAGS = ""