diff --git a/recipes/u-boot/u-boot_git.bb b/recipes/u-boot/u-boot_git.bb
index b34b8d1..7c48785 100644
--- a/recipes/u-boot/u-boot_git.bb
+++ b/recipes/u-boot/u-boot_git.bb
@@ -1,5 +1,5 @@
 require u-boot.inc
-PR ="r38"
+PR ="r39"
 
 FILESPATHPKG =. "u-boot-git:"
 
@@ -28,9 +28,128 @@ file://dss.patch;patch=1 \
 SRCREV_beagleboard = "a5cf522a91ba479d459f8221135bdb3e9ae97479"
 PV_beagleboard = "2009.11-rc1+${PR}+gitr${SRCREV}"
 
-SRCREV_calamari = "f67066b6b0740b826ed862615c5ab022aaf4779a"
+SRCREV_calamari = "cd77dd109c4a439519a78c32eddc42bdebc7a61f"
+
 PV_calamari = "2009.08+${PR}+gitr${SRCREV}"
-SRC_URI_append_calamari = " file://buggy-gcc-really-no-spe.patch;patch=1"
+SRC_URI_calamari = " \
+        git://git.denx.de/u-boot-mpc85xx.git;protocol=git \
+        file://buggy-gcc-really-no-spe.patch;patch=1 \
+"
+
+SRC_URI_calamari += "http://www.bitshrine.org/gpp/u-boot-200910-cd77dd10-8536ds-don-t-expand-eSDHC-data-int.patch;name=dontexpandeSDHCdataintpatch"
+SRC_URI[dontexpandeSDHCdataintpatch.md5sum] = "401c59e34d10668d00a376c57b39ebbf"
+SRC_URI[dontexpandeSDHCdataintpatch.sha256sum] = "3bace2367a8cf0df289fc13798b47b57b8d0340a87b5282316c96e5bd12f2b61"
+
+SRC_URI_calamari += "http://www.bitshrine.org/gpp/u-boot-200910-cd77dd10-85xx-make-boot-from-NAND-full-reloc.patch;name=makebootfromNANDfullrelocpatch"
+SRC_URI[makebootfromNANDfullrelocpatch.md5sum] = "631fb50822c95995d2480d1ad0474a3e"
+SRC_URI[makebootfromNANDfullrelocpatch.sha256sum] = "8f74627025521bb66af0a69edd5cf4c5dade26b7be085baac1574928926865dc"
+
+SRC_URI_calamari += "http://www.bitshrine.org/gpp/u-boot-200910-cd77dd10-85xx-pci-fsl_pci_init-pcie-agent.patch;name=pcifslpciinitpcieagentpatch"
+SRC_URI[pcifslpciinitpcieagentpatch.md5sum] = "fa1e24838d5a537d2f43d641d413b1d3"
+SRC_URI[pcifslpciinitpcieagentpatch.sha256sum] = "71d9a31b3f90ccf3ddbf7dacc893257a020764acc35400268cb9c7b91d0c47bb"
+
+SRC_URI_calamari += "http://www.bitshrine.org/gpp/u-boot-200910-cd77dd10-8xxx-relocate-cpu-pointer-in-global.patch;name=relocatecpupointeringlobalpatch"
+SRC_URI[relocatecpupointeringlobalpatch.md5sum] = "eeedb2fe4024b6e1570271e2dafd0371"
+SRC_URI[relocatecpupointeringlobalpatch.sha256sum] = "ce30001bcc847dbcf7158af2a4cc493a1af1215992639ec47528a017ddcd830d"
+
+SRC_URI_calamari += "http://www.bitshrine.org/gpp/u-boot-200910-cd77dd10-Add-support-for-save-env-to-MMC-SD.patch;name=AddsupportforsaveenvtoMMCSDpatch"
+SRC_URI[AddsupportforsaveenvtoMMCSDpatch.md5sum] = "00764cc2a5e1dcd20081784d75e79574"
+SRC_URI[AddsupportforsaveenvtoMMCSDpatch.sha256sum] = "3eac3281da7f8c8451991a973d4505353d81f02a4be0346f4f1d0778691ef9bd"
+
+SRC_URI_calamari += "http://www.bitshrine.org/gpp/u-boot-200910-cd77dd10-Clean-up-mpc8536DS-PCI-setup-code.patch;name=Cleanupmpc8536DSPCIsetupcodepatch"
+SRC_URI[Cleanupmpc8536DSPCIsetupcodepatch.md5sum] = "bb5733a6c8096cb3f80f5d2630aac559"
+SRC_URI[Cleanupmpc8536DSPCIsetupcodepatch.sha256sum] = "f11444c4294696ee40e2dce702966444d90a15f1bb4769276cacc987d2c1e510"
+
+SRC_URI_calamari += "http://www.bitshrine.org/gpp/u-boot-200910-cd77dd10-eSPI-add-eSPI-controller-support.patch;name=eSPIaddeSPIcontrollersupportpatch"
+SRC_URI[eSPIaddeSPIcontrollersupportpatch.md5sum] = "d468987371b9d0c7772fd908c1043f2e"
+SRC_URI[eSPIaddeSPIcontrollersupportpatch.sha256sum] = "dda75ab94f922147878cae3a213b962b111778bce733a127253f2389740457c5"
+
+SRC_URI_calamari += "http://www.bitshrine.org/gpp/u-boot-200910-cd77dd10-fsl_elbc_nand-remove-the-bbt-desc.patch;name=fslelbcnandremovethebbtdescpatch"
+SRC_URI[fslelbcnandremovethebbtdescpatch.md5sum] = "3477f333846a3a48b005b76161d9e95a"
+SRC_URI[fslelbcnandremovethebbtdescpatch.sha256sum] = "5b1b000f21d72b1d96950f0044401b793d8aa6b8b811c5226013e0357fc2d638"
+
+SRC_URI_calamari += "http://www.bitshrine.org/gpp/u-boot-200910-cd77dd10-General-Freescale-CW-debug-support.patch;name=GeneralFreescaleCWdebugsupportpatch"
+SRC_URI[GeneralFreescaleCWdebugsupportpatch.md5sum] = "47295e8dce88127df8239520ae9dffae"
+SRC_URI[GeneralFreescaleCWdebugsupportpatch.sha256sum] = "a0658fc8158d3871fd72f515f25276a452a1274c18bbce7e92010cac8b47b196"
+
+SRC_URI_calamari += "http://www.bitshrine.org/gpp/u-boot-200910-cd77dd10-Get-the-address-of-env-on-the-SD.patch;name=GettheaddressofenvontheSDpatch"
+SRC_URI[GettheaddressofenvontheSDpatch.md5sum] = "c3a1a748ef35abffbede9c045937589b"
+SRC_URI[GettheaddressofenvontheSDpatch.sha256sum] = "276e1a1de6f065478ac22dd3df9b53f1ceea2e644c9add732f05085ec807da39"
+
+SRC_URI_calamari += "http://www.bitshrine.org/gpp/u-boot-2009.10-cd77dd10-Leave-x86emu-op-code-tables.patch;name=Leavex86emuopcodetablespatch"
+SRC_URI[Leavex86emuopcodetablespatch.md5sum] = "a25fdcbb6c0c469ebf836573197895d4"
+SRC_URI[Leavex86emuopcodetablespatch.sha256sum] = "a3ab38679c3e64a42eab99ccb67ad1af68638e075661a5da0124b37f21cb5e47"
+
+SRC_URI_calamari += "http://www.bitshrine.org/gpp/u-boot-200910-cd77dd10-Make-mmc-init-come-before-env_reloc.patch;name=Makemmcinitcomebeforeenvrelocpatch"
+SRC_URI[Makemmcinitcomebeforeenvrelocpatch.md5sum] = "07ab10944bb2c1a3e72a6852c0061b99"
+SRC_URI[Makemmcinitcomebeforeenvrelocpatch.sha256sum] = "85fc4fac03147cf5942523b2deccae7dda9724052f72fd7262b6119c731d3067"
+
+SRC_URI_calamari += "http://www.bitshrine.org/gpp/u-boot-200910-cd77dd10-mpc8536ds-Invert-SDHC_WP-pin-polar.patch;name=mpc8536dsInvertSDHCWPpinpolarpatch"
+SRC_URI[mpc8536dsInvertSDHCWPpinpolarpatch.md5sum] = "fe53dedba94b15186de0c96df87bcec6"
+SRC_URI[mpc8536dsInvertSDHCWPpinpolarpatch.sha256sum] = "aedc402ec1cd7c4104a8994cf9162396e6cb0027044325543d420af0ff9ca68c"
+
+SRC_URI_calamari += "http://www.bitshrine.org/gpp/u-boot-200910-cd77dd10-save-the-env-var-to-SDcard-and-SPI.patch;name=savetheenvvartoSDcardandSPIpatch"
+SRC_URI[savetheenvvartoSDcardandSPIpatch.md5sum] = "77cec9a311031cadee68b007abc21b2e"
+SRC_URI[savetheenvvartoSDcardandSPIpatch.sha256sum] = "2c5bf155c5f6dbad52caaa3d028938890eb562146fbd1949f5fcced2d2d7e48b"
+
+SRC_URI_calamari += "http://www.bitshrine.org/gpp/u-boot-200910-cd77dd10-8536ds-don-t-expand-eSDHC-data-int.patch;name=dontexpandeSDHCdataintpatch"
+SRC_URI[dontexpandeSDHCdataintpatch.md5sum] = "401c59e34d10668d00a376c57b39ebbf"
+SRC_URI[dontexpandeSDHCdataintpatch.sha256sum] = "3bace2367a8cf0df289fc13798b47b57b8d0340a87b5282316c96e5bd12f2b61"
+
+SRC_URI_calamari += "http://www.bitshrine.org/gpp/u-boot-200910-cd77dd10-85xx-make-boot-from-NAND-full-reloc.patch;name=makebootfromNANDfullrelocpatch"
+SRC_URI[makebootfromNANDfullrelocpatch.md5sum] = "631fb50822c95995d2480d1ad0474a3e"
+SRC_URI[makebootfromNANDfullrelocpatch.sha256sum] = "8f74627025521bb66af0a69edd5cf4c5dade26b7be085baac1574928926865dc"
+
+SRC_URI_calamari += "http://www.bitshrine.org/gpp/u-boot-200910-cd77dd10-85xx-pci-fsl_pci_init-pcie-agent.patch;name=pcifslpciinitpcieagentpatch"
+SRC_URI[pcifslpciinitpcieagentpatch.md5sum] = "fa1e24838d5a537d2f43d641d413b1d3"
+SRC_URI[pcifslpciinitpcieagentpatch.sha256sum] = "71d9a31b3f90ccf3ddbf7dacc893257a020764acc35400268cb9c7b91d0c47bb"
+
+SRC_URI_calamari += "http://www.bitshrine.org/gpp/u-boot-200910-cd77dd10-8xxx-relocate-cpu-pointer-in-global.patch;name=relocatecpupointeringlobalpatch"
+SRC_URI[relocatecpupointeringlobalpatch.md5sum] = "eeedb2fe4024b6e1570271e2dafd0371"
+SRC_URI[relocatecpupointeringlobalpatch.sha256sum] = "ce30001bcc847dbcf7158af2a4cc493a1af1215992639ec47528a017ddcd830d"
+
+SRC_URI_calamari += "http://www.bitshrine.org/gpp/u-boot-200910-cd77dd10-Add-support-for-save-env-to-MMC-SD.patch;name=AddsupportforsaveenvtoMMCSDpatch"
+SRC_URI[AddsupportforsaveenvtoMMCSDpatch.md5sum] = "00764cc2a5e1dcd20081784d75e79574"
+SRC_URI[AddsupportforsaveenvtoMMCSDpatch.sha256sum] = "3eac3281da7f8c8451991a973d4505353d81f02a4be0346f4f1d0778691ef9bd"
+
+SRC_URI_calamari += "http://www.bitshrine.org/gpp/u-boot-200910-cd77dd10-Clean-up-mpc8536DS-PCI-setup-code.patch;name=Cleanupmpc8536DSPCIsetupcodepatch"
+SRC_URI[Cleanupmpc8536DSPCIsetupcodepatch.md5sum] = "bb5733a6c8096cb3f80f5d2630aac559"
+SRC_URI[Cleanupmpc8536DSPCIsetupcodepatch.sha256sum] = "f11444c4294696ee40e2dce702966444d90a15f1bb4769276cacc987d2c1e510"
+
+SRC_URI_calamari += "http://www.bitshrine.org/gpp/u-boot-200910-cd77dd10-eSPI-add-eSPI-controller-support.patch;name=eSPIaddeSPIcontrollersupportpatch"
+SRC_URI[eSPIaddeSPIcontrollersupportpatch.md5sum] = "d468987371b9d0c7772fd908c1043f2e"
+SRC_URI[eSPIaddeSPIcontrollersupportpatch.sha256sum] = "dda75ab94f922147878cae3a213b962b111778bce733a127253f2389740457c5"
+
+SRC_URI_calamari += "http://www.bitshrine.org/gpp/u-boot-200910-cd77dd10-fsl_elbc_nand-remove-the-bbt-desc.patch;name=fslelbcnandremovethebbtdescpatch"
+SRC_URI[fslelbcnandremovethebbtdescpatch.md5sum] = "3477f333846a3a48b005b76161d9e95a"
+SRC_URI[fslelbcnandremovethebbtdescpatch.sha256sum] = "5b1b000f21d72b1d96950f0044401b793d8aa6b8b811c5226013e0357fc2d638"
+
+SRC_URI_calamari += "http://www.bitshrine.org/gpp/u-boot-200910-cd77dd10-General-Freescale-CW-debug-support.patch;name=GeneralFreescaleCWdebugsupportpatch"
+SRC_URI[GeneralFreescaleCWdebugsupportpatch.md5sum] = "47295e8dce88127df8239520ae9dffae"
+SRC_URI[GeneralFreescaleCWdebugsupportpatch.sha256sum] = "a0658fc8158d3871fd72f515f25276a452a1274c18bbce7e92010cac8b47b196"
+
+SRC_URI_calamari += "http://www.bitshrine.org/gpp/u-boot-200910-cd77dd10-Get-the-address-of-env-on-the-SD.patch;name=GettheaddressofenvontheSDpatch"
+SRC_URI[GettheaddressofenvontheSDpatch.md5sum] = "c3a1a748ef35abffbede9c045937589b"
+SRC_URI[GettheaddressofenvontheSDpatch.sha256sum] = "276e1a1de6f065478ac22dd3df9b53f1ceea2e644c9add732f05085ec807da39"
+
+SRC_URI_calamari += "http://www.bitshrine.org/gpp/u-boot-2009.10-cd77dd10-Leave-x86emu-op-code-tables.patch;name=Leavex86emuopcodetablespatch"
+SRC_URI[Leavex86emuopcodetablespatch.md5sum] = "a25fdcbb6c0c469ebf836573197895d4"
+SRC_URI[Leavex86emuopcodetablespatch.sha256sum] = "a3ab38679c3e64a42eab99ccb67ad1af68638e075661a5da0124b37f21cb5e47"
+
+SRC_URI_calamari += "http://www.bitshrine.org/gpp/u-boot-200910-cd77dd10-Make-mmc-init-come-before-env_reloc.patch;name=Makemmcinitcomebeforeenvrelocpatch"
+SRC_URI[Makemmcinitcomebeforeenvrelocpatch.md5sum] = "07ab10944bb2c1a3e72a6852c0061b99"
+SRC_URI[Makemmcinitcomebeforeenvrelocpatch.sha256sum] = "85fc4fac03147cf5942523b2deccae7dda9724052f72fd7262b6119c731d3067"
+
+SRC_URI_calamari += "http://www.bitshrine.org/gpp/u-boot-200910-cd77dd10-mpc8536ds-Invert-SDHC_WP-pin-polar.patch;name=InvertSDHCWPpinpolarpatch"
+SRC_URI[InvertSDHCWPpinpolarpatch.md5sum] = "fe53dedba94b15186de0c96df87bcec6"
+SRC_URI[InvertSDHCWPpinpolarpatch.sha256sum] = "aedc402ec1cd7c4104a8994cf9162396e6cb0027044325543d420af0ff9ca68c"
+
+SRC_URI_calamari += "http://www.bitshrine.org/gpp/u-boot-200910-cd77dd10-save-the-env-var-to-SDcard-and-SPI.patch;name=savetheenvvartoSDcardandSPIpatch"
+SRC_URI[savetheenvvartoSDcardandSPIpatch.md5sum] = "77cec9a311031cadee68b007abc21b2e"
+SRC_URI[savetheenvvartoSDcardandSPIpatch.sha256sum] = "2c5bf155c5f6dbad52caaa3d028938890eb562146fbd1949f5fcced2d2d7e48b"
+
+#UBOOT_MACHINE_calamari = "MPC8536DS_SDCARD_config"
+UBOOT_MACHINE_calamari = "MPC8536DS_config"
 
 SRC_URI_omap3-touchbook = "git://gitorious.org/u-boot-omap3/mainline.git;branch=omap3-dev;protocol=git \
                  file://fw_env.config \