Make the do_patch apply=yes param implicit if extension is .diff/.patch

For .diff/.patch you need to apply manually, you can specify apply=no.

Signed-off-by: Chris Larson <chris_larson@mentor.com>
Acked-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Khem Raj <raj.khem@gmail.com>

16 files changed, 266 insertions, 266 deletions

diff --git a/recipes/u-boot/u-boot-mkimage-openmoko-native_oe.bb b/recipes/u-boot/u-boot-mkimage-openmoko-native_oe.bb
index b86282a34b..0256ef318c 100644
--- a/recipes/u-boot/u-boot-mkimage-openmoko-native_oe.bb
+++ b/recipes/u-boot/u-boot-mkimage-openmoko-native_oe.bb
@@ -6,59 +6,59 @@ PV = "1.2.0+git9912121f7ed804ea58fd62f3f230b5dcfc357d88svn2238"
 PR = "r1"
 
 SRC_URI = "git://git.denx.de/u-boot.git;protocol=git;tag=9912121f7ed804ea58fd62f3f230b5dcfc357d88 \
-file://uboot-machtypes.patch;apply=yes \
-file://ext2load_hex.patch;apply=yes \
-file://uboot-s3c2410-warnings-fix.patch;apply=yes \
-file://uboot-strtoul.patch;apply=yes \
-file://uboot-cramfs_but_no_jffs2.patch;apply=yes \
-file://nand-read_write_oob.patch;apply=yes \
-file://uboot-arm920t-gd_in_irq.patch;apply=yes \
-file://uboot-arm920_s3c2410_irq_demux.patch;apply=yes \
-file://uboot-s3c2410-nand.patch;apply=yes \
-file://uboot-cmd_s3c2410.patch;apply=yes \
-file://uboot-s3c2410-mmc.patch;apply=yes \
-file://env_nand_oob.patch;apply=yes \
-file://dynenv-harden.patch;apply=yes \
-file://uboot-s3c2410_fb.patch;apply=yes \
-file://uboot-20061030-qt2410.patch;apply=yes \
-file://uboot-20061030-neo1973.patch;apply=yes \
-file://uboot-s3c2410-misccr-definitions.patch;apply=yes \
-file://boot-from-ram-reloc.patch;apply=yes \
-file://boot-from-ram-and-nand.patch;apply=yes \
-file://wakeup-reason-nand-only.patch;apply=yes \
-file://uboot-neo1973-resume.patch;apply=yes \
-file://nand-dynamic_partitions.patch;apply=yes \
-file://uboot-s3c2410-norelocate_irqvec_cpy.patch;apply=yes \
-file://uboot-usbtty-acm.patch;apply=yes \
-file://uboot-s3c2410_udc.patch;apply=yes \
-file://bbt-create-optional.patch;apply=yes \
-file://nand-createbbt.patch;apply=yes \
-file://dontask.patch;apply=yes \
-file://nand-badisbad.patch;apply=yes \
-file://uboot-bbt-quiet.patch;apply=yes \
-file://raise-limits.patch;apply=yes \
-file://splashimage-command.patch;apply=yes \
-file://cmd-unzip.patch;apply=yes \
-file://enable-splash-bmp.patch;apply=yes \
-file://preboot-override.patch;apply=yes \
-file://lowlevel_foo.patch;apply=yes \
-file://default-env.patch;apply=yes \
-file://console-ansi.patch;apply=yes \
-file://boot-menu.patch;apply=yes \
-file://uboot-dfu.patch;apply=yes \
-file://uboot-neo1973-defaultenv.patch;apply=yes \
-file://uboot-nand-markbad-reallybad.patch;apply=yes \
-file://usbdcore-multiple_configs.patch;apply=yes \
-file://neo1973-chargefast.patch;apply=yes \
-file://uboot-s3c2440.patch;apply=yes \
-file://uboot-smdk2440.patch;apply=yes \
-file://uboot-hxd8.patch;apply=yes \
-file://uboot-license.patch;apply=yes \
-file://uboot-gta02.patch;apply=yes \
-file://uboot-s3c2443.patch;apply=yes \
-file://uboot-smdk2443.patch;apply=yes \
-file://unbusy-i2c.patch;apply=yes \
-file://makefile-no-dirafter.patch;apply=yes \
+file://uboot-machtypes.patch \
+file://ext2load_hex.patch \
+file://uboot-s3c2410-warnings-fix.patch \
+file://uboot-strtoul.patch \
+file://uboot-cramfs_but_no_jffs2.patch \
+file://nand-read_write_oob.patch \
+file://uboot-arm920t-gd_in_irq.patch \
+file://uboot-arm920_s3c2410_irq_demux.patch \
+file://uboot-s3c2410-nand.patch \
+file://uboot-cmd_s3c2410.patch \
+file://uboot-s3c2410-mmc.patch \
+file://env_nand_oob.patch \
+file://dynenv-harden.patch \
+file://uboot-s3c2410_fb.patch \
+file://uboot-20061030-qt2410.patch \
+file://uboot-20061030-neo1973.patch \
+file://uboot-s3c2410-misccr-definitions.patch \
+file://boot-from-ram-reloc.patch \
+file://boot-from-ram-and-nand.patch \
+file://wakeup-reason-nand-only.patch \
+file://uboot-neo1973-resume.patch \
+file://nand-dynamic_partitions.patch \
+file://uboot-s3c2410-norelocate_irqvec_cpy.patch \
+file://uboot-usbtty-acm.patch \
+file://uboot-s3c2410_udc.patch \
+file://bbt-create-optional.patch \
+file://nand-createbbt.patch \
+file://dontask.patch \
+file://nand-badisbad.patch \
+file://uboot-bbt-quiet.patch \
+file://raise-limits.patch \
+file://splashimage-command.patch \
+file://cmd-unzip.patch \
+file://enable-splash-bmp.patch \
+file://preboot-override.patch \
+file://lowlevel_foo.patch \
+file://default-env.patch \
+file://console-ansi.patch \
+file://boot-menu.patch \
+file://uboot-dfu.patch \
+file://uboot-neo1973-defaultenv.patch \
+file://uboot-nand-markbad-reallybad.patch \
+file://usbdcore-multiple_configs.patch \
+file://neo1973-chargefast.patch \
+file://uboot-s3c2440.patch \
+file://uboot-smdk2440.patch \
+file://uboot-hxd8.patch \
+file://uboot-license.patch \
+file://uboot-gta02.patch \
+file://uboot-s3c2443.patch \
+file://uboot-smdk2443.patch \
+file://unbusy-i2c.patch \
+file://makefile-no-dirafter.patch \
 "
 
 PROVIDES = ""
diff --git a/recipes/u-boot/u-boot-mkimage_1.3.2.bb b/recipes/u-boot/u-boot-mkimage_1.3.2.bb
index 716bc92929..d2bf7e5926 100644
--- a/recipes/u-boot/u-boot-mkimage_1.3.2.bb
+++ b/recipes/u-boot/u-boot-mkimage_1.3.2.bb
@@ -3,7 +3,7 @@ LICENSE = "GPLv2"
 SECTION = "bootloader"
 
 SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \
-           file://fix-arm920t-eabi.patch;apply=yes"
+           file://fix-arm920t-eabi.patch"
 
 PR = "r3"
 
diff --git a/recipes/u-boot/u-boot-omap2430sdp_1.1.4.bb b/recipes/u-boot/u-boot-omap2430sdp_1.1.4.bb
index b5660cd59e..2114a83ace 100644
--- a/recipes/u-boot/u-boot-omap2430sdp_1.1.4.bb
+++ b/recipes/u-boot/u-boot-omap2430sdp_1.1.4.bb
@@ -3,7 +3,7 @@ PR ="r1"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "http://linux.omap.com/pub/bootloader/2430sdp/source/u-boot-SEP1106.tar.gz \
-           file://u-boot-makefile-3.81.patch;apply=yes \
+           file://u-boot-makefile-3.81.patch \
           "
 
 S = "${WORKDIR}/u-boot"
diff --git a/recipes/u-boot/u-boot-omap3beagleboard_1.1.4.bb b/recipes/u-boot/u-boot-omap3beagleboard_1.1.4.bb
index d5ad38bdc3..d88d3d226a 100644
--- a/recipes/u-boot/u-boot-omap3beagleboard_1.1.4.bb
+++ b/recipes/u-boot/u-boot-omap3beagleboard_1.1.4.bb
@@ -3,11 +3,11 @@ PR ="r1"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "http://www.sakoman.net/omap3/u-boot.tar.gz \
-           file://name.patch;apply=yes \
-           file://armv7-a.patch;apply=yes \
-           file://500mhz-l2enable.patch;apply=yes \
-           file://disable-tone-logo.patch;apply=yes \
-           file://env.patch;apply=yes \
+           file://name.patch \
+           file://armv7-a.patch \
+           file://500mhz-l2enable.patch \
+           file://disable-tone-logo.patch \
+           file://env.patch \
           "
 
 S = "${WORKDIR}/u-boot"
diff --git a/recipes/u-boot/u-boot-openmoko_git.bb b/recipes/u-boot/u-boot-openmoko_git.bb
index 20558ecf17..bd7b6714ae 100644
--- a/recipes/u-boot/u-boot-openmoko_git.bb
+++ b/recipes/u-boot/u-boot-openmoko_git.bb
@@ -3,6 +3,6 @@ require u-boot-openmoko.inc
 SRCREV = "650149a53dbdd48bf6dfef90930c8ab182adb512"
 SRC_URI = "\
   git://git.openmoko.org/git/u-boot.git;protocol=git;branch=stable \
-  file://makefile-no-dirafter.patch;apply=yes \
+  file://makefile-no-dirafter.patch \
 "
 S = "${WORKDIR}/git"
diff --git a/recipes/u-boot/u-boot-utils_1.2.0.bb b/recipes/u-boot/u-boot-utils_1.2.0.bb
index 92ec00930a..7cf77b8416 100644
--- a/recipes/u-boot/u-boot-utils_1.2.0.bb
+++ b/recipes/u-boot/u-boot-utils_1.2.0.bb
@@ -6,9 +6,9 @@ DEPENDS = "mtd-utils"
 PR = "r9"
 
 SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \
-        file://fw_env.c.patch;apply=yes \
-        file://tools-Makefile.patch;apply=yes \
-        file://env-Makefile.patch;apply=yes \
+        file://fw_env.c.patch \
+        file://tools-Makefile.patch \
+        file://env-Makefile.patch \
         file://fw_env.config"
 
 S = "${WORKDIR}/u-boot-${PV}"
diff --git a/recipes/u-boot/u-boot_1.1.2.bb b/recipes/u-boot/u-boot_1.1.2.bb
index fb368c8b52..127be68f90 100644
--- a/recipes/u-boot/u-boot_1.1.2.bb
+++ b/recipes/u-boot/u-boot_1.1.2.bb
@@ -2,17 +2,17 @@ PR = "r3"
 require u-boot.inc
 
 SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \
-	   file://arm_flags.patch;apply=yes "
+	   file://arm_flags.patch "
 # Override whole URI fr Neon since Neon patch is incompatible with arm_flags patch.
 SRC_URI_bd-neon = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \
-                   file://u-boot-1.1.2-neon.patch;apply=yes"
-SRC_URI_append_vibren = "ftp://bec-systems.com/pub/pxa255_idp/u-boot/uboot_pxa255-idp_2005-03-23.patch;apply=yes"
-SRC_URI_append_mnci   = "file://mnci.patch;apply=yes \
-                         file://mnci-jffs2.patch;apply=yes \
-                         file://cmd-arm-linux.patch;apply=yes \
-                         file://command-names.patch;apply=yes"
-
-SRC_URI_append_magicbox  = "file://u-boot-emetec.patch;apply=yes "
+                   file://u-boot-1.1.2-neon.patch"
+SRC_URI_append_vibren = "ftp://bec-systems.com/pub/pxa255_idp/u-boot/uboot_pxa255-idp_2005-03-23.patch"
+SRC_URI_append_mnci   = "file://mnci.patch \
+                         file://mnci-jffs2.patch \
+                         file://cmd-arm-linux.patch \
+                         file://command-names.patch"
+
+SRC_URI_append_magicbox  = "file://u-boot-emetec.patch "
 
 
 # TODO: SRC_URI_append_rt3000
diff --git a/recipes/u-boot/u-boot_1.1.4.bb b/recipes/u-boot/u-boot_1.1.4.bb
index 57e9d3dc60..78d607b469 100644
--- a/recipes/u-boot/u-boot_1.1.4.bb
+++ b/recipes/u-boot/u-boot_1.1.4.bb
@@ -5,46 +5,46 @@ PR = "r1"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2;name=archive \
-          file://u-boot-make381-fix.patch;apply=yes"
+          file://u-boot-make381-fix.patch"
 
 SRC_URI_append_gumstix = "\
-	file://u-boot-autoscript.patch;apply=yes \
-	file://u-boot-base.patch;apply=yes \
-	file://u-boot-crc-warning-not-so-scary.patch;apply=yes \
-	file://u-boot-flash-protect-fixup.patch;apply=yes \
-	file://u-boot-fw_printenv.patch;apply=yes \
-	file://u-boot-install.patch;apply=yes \
-	file://u-boot-jerase-cmd.patch;apply=yes \
-	file://u-boot-jffs2-new-nodetypes.patch;apply=yes \
-	file://u-boot-loadb-safe.patch;apply=yes \
-	file://u-boot-mmc-init.patch;apply=yes \
-	file://u-boot-mmcclk-alternate.patch;apply=yes \
-	file://u-boot-smc91x-multi.patch;apply=yes \
-	file://u-boot-zzz-osx.patch;apply=yes"
+	file://u-boot-autoscript.patch \
+	file://u-boot-base.patch \
+	file://u-boot-crc-warning-not-so-scary.patch \
+	file://u-boot-flash-protect-fixup.patch \
+	file://u-boot-fw_printenv.patch \
+	file://u-boot-install.patch \
+	file://u-boot-jerase-cmd.patch \
+	file://u-boot-jffs2-new-nodetypes.patch \
+	file://u-boot-loadb-safe.patch \
+	file://u-boot-mmc-init.patch \
+	file://u-boot-mmcclk-alternate.patch \
+	file://u-boot-smc91x-multi.patch \
+	file://u-boot-zzz-osx.patch"
 
 SRC_URI_append_amsdelta = "\
-	http://the.earth.li/pub/e3/u-boot-amsdelta-20060519.diff;apply=yes;name=amspatch"
+	http://the.earth.li/pub/e3/u-boot-amsdelta-20060519.diff;name=amspatch"
 
 SRC_URI_append_dht-walnut= "\
-        file://u-boot-dht-walnut-df2.patch;apply=yes"
+        file://u-boot-dht-walnut-df2.patch"
 
 SRC_URI_append_avr32= "\
-	http://avr32linux.org/twiki/pub/Main/UbootPatches/u-boot-1.1.4-avr1.patch.bz2;apply=yes;name=avrpatch \
-	file://avr32-boards-fix-flash-read.patch;apply=yes \
-	file://lcdc-driver-for-avr32.patch;apply=yes \
-	file://spi-driver-for-avr32.patch;apply=yes \
-	file://at32ap-add-framebuffer-address.patch;apply=yes \
-	file://at32ap-add-spi-initcalls.patch;apply=yes \
-	file://at32ap-add-system-manager-header-file.patch;apply=yes \
-	file://ap7000-add-spi-device-and-lcdc-base-address.patch;apply=yes \
-	file://libavr32-add-spi-and-lcd-board-support.patch;apply=yes \
-	file://cmd-bmp-add-gzip-compressed-bmp.patch;apply=yes \
-	file://lcd-add-24-bpp-support-and-atmel-lcdc-support.patch;apply=yes \
-	file://atstk1000-spi-support.patch;apply=yes \
-	file://atstk1000-ltv350qv-display-support.patch;apply=yes \
-	file://atstk1000-add-lcd-and-spi-to-config.patch;apply=yes \
-	file://at32ap-add-define-for-sdram-test.patch;apply=yes \
-	file://fix-mmc-data-timeout.patch;apply=yes \
+	http://avr32linux.org/twiki/pub/Main/UbootPatches/u-boot-1.1.4-avr1.patch.bz2;name=avrpatch \
+	file://avr32-boards-fix-flash-read.patch \
+	file://lcdc-driver-for-avr32.patch \
+	file://spi-driver-for-avr32.patch \
+	file://at32ap-add-framebuffer-address.patch \
+	file://at32ap-add-spi-initcalls.patch \
+	file://at32ap-add-system-manager-header-file.patch \
+	file://ap7000-add-spi-device-and-lcdc-base-address.patch \
+	file://libavr32-add-spi-and-lcd-board-support.patch \
+	file://cmd-bmp-add-gzip-compressed-bmp.patch \
+	file://lcd-add-24-bpp-support-and-atmel-lcdc-support.patch \
+	file://atstk1000-spi-support.patch \
+	file://atstk1000-ltv350qv-display-support.patch \
+	file://atstk1000-add-lcd-and-spi-to-config.patch \
+	file://at32ap-add-define-for-sdram-test.patch \
+	file://fix-mmc-data-timeout.patch \
 "
 
 EXTRA_OEMAKE_gumstix = "CROSS_COMPILE=${TARGET_PREFIX} GUMSTIX_400MHZ=${GUMSTIX_400MHZ}"
diff --git a/recipes/u-boot/u-boot_1.1.6.bb b/recipes/u-boot/u-boot_1.1.6.bb
index 9bc4293911..7342c973aa 100644
--- a/recipes/u-boot/u-boot_1.1.6.bb
+++ b/recipes/u-boot/u-boot_1.1.6.bb
@@ -3,19 +3,19 @@ require u-boot.inc
 PR = "r3"
 
 SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-1.1.6.tar.bz2 \
-           file://devkit-idp.patch;apply=yes \
+           file://devkit-idp.patch \
 "
 
-SRC_URI_append_sarge-at91 = " file://sarge-uboot.patch;apply=yes"
+SRC_URI_append_sarge-at91 = " file://sarge-uboot.patch"
 
-SRC_URI_append_mpc8323e-rdb = "  file://u-boot-1.1.6-fsl-1-mpc83xx-20061206.patch;apply=yes \
-                                 file://u-boot-1.1.6-fsl-1-Fix-the-UEC-driver-bug-of-QE.patch;apply=yes \
-                                 file://u-boot-1.1.6-fsl-1-streamline-the-83xx-immr-head-file.patch;apply=yes \
-                                 file://u-boot-1.1.6-fsl-1-Add-support-for-the-MPC832XEMDS-board.patch;apply=yes \
-                                 file://u-boot-1.1.6-fsl-1-Add-the-MPC832XEMDS-board-readme.patch;apply=yes \
-                                 file://u-boot-1.1.6-fsl-1-Added-MPC8323E-RDB-board-support-2.patch;apply=yes \
-                                 file://u-boot-1.1.6-fsl-1-UEC-remove-udelay.patch;apply=yes \
-                                 file://u-boot-1.1.6-83xx-optimizations.patch;apply=yes \ 
+SRC_URI_append_mpc8323e-rdb = "  file://u-boot-1.1.6-fsl-1-mpc83xx-20061206.patch \
+                                 file://u-boot-1.1.6-fsl-1-Fix-the-UEC-driver-bug-of-QE.patch \
+                                 file://u-boot-1.1.6-fsl-1-streamline-the-83xx-immr-head-file.patch \
+                                 file://u-boot-1.1.6-fsl-1-Add-support-for-the-MPC832XEMDS-board.patch \
+                                 file://u-boot-1.1.6-fsl-1-Add-the-MPC832XEMDS-board-readme.patch \
+                                 file://u-boot-1.1.6-fsl-1-Added-MPC8323E-RDB-board-support-2.patch \
+                                 file://u-boot-1.1.6-fsl-1-UEC-remove-udelay.patch \
+                                 file://u-boot-1.1.6-83xx-optimizations.patch \ 
 "
 
 
diff --git a/recipes/u-boot/u-boot_1.2.0.bb b/recipes/u-boot/u-boot_1.2.0.bb
index 0469f042c4..b05c18114a 100644
--- a/recipes/u-boot/u-boot_1.2.0.bb
+++ b/recipes/u-boot/u-boot_1.2.0.bb
@@ -4,17 +4,17 @@ PR = "r3"
 
 SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-1.2.0.tar.bz2 \
 	"
-SRC_URI_append_turbostation = "file://qnap.diff;apply=yes"
+SRC_URI_append_turbostation = "file://qnap.diff"
 
-SRC_URI_append_lsppchg = "file://u-boot-kurobox.patch;apply=yes \
-			  file://u-boot-kurobox-fdt.patch;apply=yes \
+SRC_URI_append_lsppchg = "file://u-boot-kurobox.patch \
+			  file://u-boot-kurobox-fdt.patch \
 			  file://defconfig_lsppchg"
 
-SRC_URI_append_lsppchd = "file://u-boot-kurobox.patch;apply=yes \ 
-                          file://u-boot-kurobox-fdt.patch;apply=yes \ 
+SRC_URI_append_lsppchd = "file://u-boot-kurobox.patch \ 
+                          file://u-boot-kurobox-fdt.patch \ 
                           file://defconfig_lsppchg"
 
-SRC_URI_append_dm355-leopard = " file://dm355-leopard.diff;apply=yes"
+SRC_URI_append_dm355-leopard = " file://dm355-leopard.diff"
 
 do_compile_prepend_lsppchg () {
         cp ${WORKDIR}/defconfig_lsppchg ${S}/include/configs/linkstation.h
@@ -25,20 +25,20 @@ do_compile_prepend_lsppchd () {
 }
 
 SRC_URI_append_mpc8315e-rdb = " \
-http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-pre.patch;apply=yes \ 
-http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-soc.patch;apply=yes \ 
-http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-PHY.patch;apply=yes \ 
-http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-platform.patch;apply=yes \ 
-http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-nand-controller.patch;apply=yes \ 
-http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-nand-boot.patch;apply=yes \ 
-http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-serdes.patch;apply=yes \ 
-http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-pcie.patch;apply=yes \ 
-http://www.bitshrine.org/gpp/u-boot-fsl-1.3.0-MPC83xx-CW.patch;apply=yes \ 
-http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-silicon-1.1-1.2.patch;apply=yes \ 
-http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-extra-config-for-333-266MHz.patch;apply=yes \ 
-http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-resume-deep-sleep.patch;apply=yes \ 
-http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-improve-ddr-performance.patch;apply=yes \ 
-http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-fix-PCI-IO-base.patch;apply=yes \ 
+http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-pre.patch \ 
+http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-soc.patch \ 
+http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-PHY.patch \ 
+http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-platform.patch \ 
+http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-nand-controller.patch \ 
+http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-nand-boot.patch \ 
+http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-serdes.patch \ 
+http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-pcie.patch \ 
+http://www.bitshrine.org/gpp/u-boot-fsl-1.3.0-MPC83xx-CW.patch \ 
+http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-silicon-1.1-1.2.patch \ 
+http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-extra-config-for-333-266MHz.patch \ 
+http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-resume-deep-sleep.patch \ 
+http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-improve-ddr-performance.patch \ 
+http://www.bitshrine.org/gpp/u-boot-1.2.0-mpc8315erdb-fix-PCI-IO-base.patch \ 
 "
 
 
diff --git a/recipes/u-boot/u-boot_1.3.1.bb b/recipes/u-boot/u-boot_1.3.1.bb
index 5c9bf5927a..930e96fb07 100644
--- a/recipes/u-boot/u-boot_1.3.1.bb
+++ b/recipes/u-boot/u-boot_1.3.1.bb
@@ -5,9 +5,9 @@ DEFAULT_PREFERENCE = "-1"
 PR = "r1"
 
 SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \
-           file://mpc8313e-rdb-autoboot.patch;apply=yes \
-           file://mpc8313e-rdb-mtdparts.patch;apply=yes \
-           file://mpc8313e-rdb-nand.patch;apply=yes"
+           file://mpc8313e-rdb-autoboot.patch \
+           file://mpc8313e-rdb-mtdparts.patch \
+           file://mpc8313e-rdb-nand.patch"
 
 
 SRC_URI[md5sum] = "8fbd29c7e70c524a42d18b9c3f3a4aa1"
diff --git a/recipes/u-boot/u-boot_1.3.2.bb b/recipes/u-boot/u-boot_1.3.2.bb
index 08cd40bb43..dc3122dfb1 100644
--- a/recipes/u-boot/u-boot_1.3.2.bb
+++ b/recipes/u-boot/u-boot_1.3.2.bb
@@ -7,38 +7,38 @@ PR = "r12"
 SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2"
 
 SRC_URI_append_mpc8313e-rdb = "\
-           file://mpc8313e-rdb-autoboot.patch;apply=yes \
-           file://mpc8313e-rdb-nand.patch;apply=yes \
-           file://mpc8313e-rdb-mtdparts.patch;apply=yes \
-           file://mpc8313e-rdb-eeprom.patch;apply=yes \
-           file://mpc8313e-rdb-lm75.patch;apply=yes \
-           file://u-boot-fsl-1.3.0-mpc8313erdb-vsc7385-support.patch;apply=yes \
-           file://u-boot-fsl-1.3.0-mpc8313erdb-fix-vitesse-7385-firmware.patch;apply=yes \
-           file://u-boot-fsl-1.3.0-mpc8313erdb-performance-tuning-for-TSEC.patch;apply=yes \
-           file://gcc4-weak-inline.patch;apply=yes \
-           file://linker-script-sort-rodata-sections.patch;apply=yes \
+           file://mpc8313e-rdb-autoboot.patch \
+           file://mpc8313e-rdb-nand.patch \
+           file://mpc8313e-rdb-mtdparts.patch \
+           file://mpc8313e-rdb-eeprom.patch \
+           file://mpc8313e-rdb-lm75.patch \
+           file://u-boot-fsl-1.3.0-mpc8313erdb-vsc7385-support.patch \
+           file://u-boot-fsl-1.3.0-mpc8313erdb-fix-vitesse-7385-firmware.patch \
+           file://u-boot-fsl-1.3.0-mpc8313erdb-performance-tuning-for-TSEC.patch \
+           file://gcc4-weak-inline.patch \
+           file://linker-script-sort-rodata-sections.patch \
            "
 
 SRC_URI_append_boc01 = "\
-           file://mpc8313e-rdb-autoboot.patch;apply=yes \
-           file://mpc8313e-rdb-nand.patch;apply=yes \
-           file://mpc8313e-rdb-mtdparts.patch;apply=yes \
-           file://mpc8313e-rdb-eeprom.patch;apply=yes \
-           file://001-090205-SPI.patch;apply=yes \
-           file://002-081212-GPIO.patch;apply=yes \
-           file://003-081205-DTT_LM73.patch;apply=yes \
-           file://004-081205-WATCHDOG.patch;apply=yes \
-           file://006-081211-EEPROM_M24C32.patch;apply=yes \
-           file://007-090217-CAPSENSE.patch;apply=yes \
-           file://008-090107-TSEC.patch;apply=yes \
-           file://009-081212-EXIO.patch;apply=yes \
-           file://010-081212-LCD.patch;apply=yes \
-           file://011-081211-CMD_TEST.patch;apply=yes \
-           file://012-081209-BUG_SETENV.patch;apply=yes \
-           file://013-090206-FIX_OOB_8BITS_LARGEPAGE_NAND.patch;apply=yes \
-           file://014-081211-BOOT_RESCUE.patch;apply=yes \
-           file://015-090205-EMC.patch;apply=yes \
-           file://016-090209-PM.patch;apply=yes \
+           file://mpc8313e-rdb-autoboot.patch \
+           file://mpc8313e-rdb-nand.patch \
+           file://mpc8313e-rdb-mtdparts.patch \
+           file://mpc8313e-rdb-eeprom.patch \
+           file://001-090205-SPI.patch \
+           file://002-081212-GPIO.patch \
+           file://003-081205-DTT_LM73.patch \
+           file://004-081205-WATCHDOG.patch \
+           file://006-081211-EEPROM_M24C32.patch \
+           file://007-090217-CAPSENSE.patch \
+           file://008-090107-TSEC.patch \
+           file://009-081212-EXIO.patch \
+           file://010-081212-LCD.patch \
+           file://011-081211-CMD_TEST.patch \
+           file://012-081209-BUG_SETENV.patch \
+           file://013-090206-FIX_OOB_8BITS_LARGEPAGE_NAND.patch \
+           file://014-081211-BOOT_RESCUE.patch \
+           file://015-090205-EMC.patch \
+           file://016-090209-PM.patch \
            "
 
 
diff --git a/recipes/u-boot/u-boot_2009.01.bb b/recipes/u-boot/u-boot_2009.01.bb
index 4de17fdc6a..4e5ca483b3 100644
--- a/recipes/u-boot/u-boot_2009.01.bb
+++ b/recipes/u-boot/u-boot_2009.01.bb
@@ -19,14 +19,14 @@ PR = "r1"
 SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2"
 
 SRC_URI_append_at91sam9263ek = "\
-	   file://u-boot-2009.01-exp-002-at91sam9g20ek.patch;apply=yes \
-	   file://u-boot-2009.01-exp-003-drivers-net-macb.c.patch;apply=yes \
+	   file://u-boot-2009.01-exp-002-at91sam9g20ek.patch \
+	   file://u-boot-2009.01-exp-003-drivers-net-macb.c.patch \
            "
 
 SRC_URI_append_at91sam9g20ek = "\
-	   file://u-boot-2009.01-exp-002-at91sam9g20ek.patch;apply=yes \
-	   file://u-boot-2009.01-exp-003-drivers-net-macb.c.patch;apply=yes \
-           file://at91sam9g20-fix-config.patch;apply=yes \
+	   file://u-boot-2009.01-exp-002-at91sam9g20ek.patch \
+	   file://u-boot-2009.01-exp-003-drivers-net-macb.c.patch \
+           file://at91sam9g20-fix-config.patch \
            "
 
 
diff --git a/recipes/u-boot/u-boot_2009.03.bb b/recipes/u-boot/u-boot_2009.03.bb
index cccf4d7572..2cbded9a3f 100644
--- a/recipes/u-boot/u-boot_2009.03.bb
+++ b/recipes/u-boot/u-boot_2009.03.bb
@@ -8,12 +8,12 @@ DEPENDS_append_hipox = " oxnas-boot-tools oxnas-boot-tools-native "
 
 SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 "
 
-SRC_URI_append_hipox = "file://00-hipox.patch;apply=yes \
-	file://01-hipox-fix-gmac-reset.patch;apply=yes \
-	file://02-hipox-enable-mmu.patch;apply=yes \
-	file://03-hipox-direct-switch.patch;apply=yes \
-	file://04-hipox-env.patch;apply=yes \
-	file://10-hipox-boot-abort-key.patch;apply=yes \
+SRC_URI_append_hipox = "file://00-hipox.patch \
+	file://01-hipox-fix-gmac-reset.patch \
+	file://02-hipox-enable-mmu.patch \
+	file://03-hipox-direct-switch.patch \
+	file://04-hipox-env.patch \
+	file://10-hipox-boot-abort-key.patch \
 "
 
 TARGET_LDFLAGS = ""
diff --git a/recipes/u-boot/u-boot_2009.08.bb b/recipes/u-boot/u-boot_2009.08.bb
index 6670898f85..32037f2e9e 100644
--- a/recipes/u-boot/u-boot_2009.08.bb
+++ b/recipes/u-boot/u-boot_2009.08.bb
@@ -9,8 +9,8 @@ DEFAULT_PREFERENCE_igep0020 = "1"
 SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 "
 
 SRC_URI_append_igep0020 = " \
-	file://update-mach-types.patch;apply=yes \
-	file://add-board-support-for-IGEP-v2-series-rev-B.patch;apply=yes \
+	file://update-mach-types.patch \
+	file://add-board-support-for-IGEP-v2-series-rev-B.patch \
 "
 
 TARGET_LDFLAGS = ""
diff --git a/recipes/u-boot/u-boot_git.bb b/recipes/u-boot/u-boot_git.bb
index 97aa56f1f4..8dca7cfd53 100644
--- a/recipes/u-boot/u-boot_git.bb
+++ b/recipes/u-boot/u-boot_git.bb
@@ -14,48 +14,48 @@ SRCREV_palmpre = "6b8edfde22acc574b5532e9f086e6a7287a9bc78"
 SRCREV_cm-t35 = "3c014f1586d5bfe30dca7549396915c83f31cd30"
 SRCREV_mpc8641-hpcn = "f20393c5e787b3776c179d20f82a86bda124d651"
 SRCREV_p2020ds = "f20393c5e787b3776c179d20f82a86bda124d651"
-SRC_URI_append_afeb9260 = " file://AFEB9260-network-fix.patch;apply=yes"
-SRC_URI_append_afeb9260-180 = " file://AFEB9260-network-fix.patch;apply=yes"
-SRC_URI_append_cm-t35 = "file://cm-t35/cm-t35.patch;apply=yes"
+SRC_URI_append_afeb9260 = " file://AFEB9260-network-fix.patch"
+SRC_URI_append_afeb9260-180 = " file://AFEB9260-network-fix.patch"
+SRC_URI_append_cm-t35 = "file://cm-t35/cm-t35.patch"
 
 SRC_URI_beagleboard = "git://www.denx.de/git/u-boot.git;protocol=git \
-                       file://0001-OMAP3-enable-i2c-bus-switching-for-Beagle-and-Overo.patch;apply=yes \
-                       file://0002-OMAP3-add-board-revision-detection-for-Overo.patch;apply=yes \
-                       file://0003-OMAP3-update-Beagle-revision-detection-to-recognize-.patch;apply=yes \
-                       file://0004-OMAP3-Set-VAUX2-to-1.8V-for-EHCI-PHY-on-Beagle-Rev-C.patch;apply=yes \
-                       file://0005-OMAP3-add-entry-for-rev-3.1.2-check-and-display-max-.patch;apply=yes \
-                       file://0006-OMAP3-add-mpurate-boot-arg-for-overo-and-beagle.patch;apply=yes \
-                       file://0007-OMAP3-detect-expansion-board-type-version-using-eepr.patch;apply=yes \
-                       file://0008-OMAP3-Overo-enable-config-eeprom-to-set-u-boot-env-v.patch;apply=yes \
-                       file://0009-OMAP3-Overo-enable-input-on-MMC1_CLK-and-MMC3_CLK-pi.patch;apply=yes \
-                       file://0010-OMAP3-Overo-set-CONFIG_SYS_I2C_SPEED-to-400Khz.patch;apply=yes \
-                       file://0011-OMAP3-trim-excessively-long-delays-in-i2c-driver.patch;apply=yes \
-                       file://0012-OMAP3-Overo-allow-expansion-boards-with-any-vendor-I.patch;apply=yes \
-                       file://0013-OMAP3-Overo-change-address-of-expansion-eeprom-to-0x.patch;apply=yes \
-                       file://0014-OMAP3-board.c-don-t-attempt-to-set-up-second-RAM-ban.patch;apply=yes \
-                       file://0015-OMAP3-mem.c-enhance-the-RAM-test.patch;apply=yes \
-                       file://0016-env_nand.c-fail-gracefully-if-no-nand-is-present.patch;apply=yes \
-                       file://0017-OMAP3-add-definitions-to-support-sysinfo-cpu-and-cpu.patch;apply=yes \
-                       file://0018-OMAP3-sys_info-update-cpu-detection-for-36XX-37XX.patch;apply=yes \
-                       file://0019-OMAP3-clocks-update-clock-setup-for-36XX-37XX.patch;apply=yes \
-                       file://0020-OMAP3-beagle-add-support-for-Beagle-xM.patch;apply=yes \
-                       file://0021-OMAP3-Beagle-Overo-remove-omapfb.debug-y-from-defaul.patch;apply=yes \
-                       file://0022-OMAP3-beagle-implement-expansionboard-detection-base.patch;apply=yes \
-                       file://0023-beagleboard-display-message-about-I2C-errors-being-e.patch;apply=yes \
-                       file://0024-beagleboard-fix-TCT-expansionboard-IDs.patch;apply=yes \
-                       file://0025-Add-DSS-driver-for-OMAP3.patch;apply=yes \
-                       file://0026-Enable-DSS-driver-for-Beagle.patch;apply=yes \
-                       file://0027-beagleboardXM-don-t-set-mpurate-on-xM-in-bootargs.patch;apply=yes \
-                       file://0028-OMAP3-fix-and-clean-up-L2-cache-enable-disable-funct.patch;apply=yes \
-                       file://0029-OMAP3-convert-setup_auxcr-to-pure-asm.patch;apply=yes \
-                       file://0030-OMAP3-apply-Cortex-A8-errata-workarounds-only-on-aff.patch;apply=yes \
-                       file://0031-OMAP3-beagle-add-more-expansionboards-based-on-http-.patch;apply=yes \
-                       file://0032-OMAP3-beagle-set-mpurate-to-600-for-revB-and-revC1-3.patch;apply=yes \
-                       file://0033-OMAP3-beagle-prettify-expansionboard-message-a-bit.patch;apply=yes \
-                       file://0034-OMAP3-beagle-add-pinmux-for-Tincantools-Trainer-expa.patch;apply=yes \
-                       file://0035-OMAP3-Beagle-set-mpurate-to-1000-for-xM.patch;apply=yes \
-                       file://0036-OMAP3-Beagle-decrease-bootdelay-to-3-use-VGA-for-def.patch;apply=yes \
-                       file://0037-OMAP3-beagle-pass-expansionboard-name-in-bootargs.patch;apply=yes \
+                       file://0001-OMAP3-enable-i2c-bus-switching-for-Beagle-and-Overo.patch \
+                       file://0002-OMAP3-add-board-revision-detection-for-Overo.patch \
+                       file://0003-OMAP3-update-Beagle-revision-detection-to-recognize-.patch \
+                       file://0004-OMAP3-Set-VAUX2-to-1.8V-for-EHCI-PHY-on-Beagle-Rev-C.patch \
+                       file://0005-OMAP3-add-entry-for-rev-3.1.2-check-and-display-max-.patch \
+                       file://0006-OMAP3-add-mpurate-boot-arg-for-overo-and-beagle.patch \
+                       file://0007-OMAP3-detect-expansion-board-type-version-using-eepr.patch \
+                       file://0008-OMAP3-Overo-enable-config-eeprom-to-set-u-boot-env-v.patch \
+                       file://0009-OMAP3-Overo-enable-input-on-MMC1_CLK-and-MMC3_CLK-pi.patch \
+                       file://0010-OMAP3-Overo-set-CONFIG_SYS_I2C_SPEED-to-400Khz.patch \
+                       file://0011-OMAP3-trim-excessively-long-delays-in-i2c-driver.patch \
+                       file://0012-OMAP3-Overo-allow-expansion-boards-with-any-vendor-I.patch \
+                       file://0013-OMAP3-Overo-change-address-of-expansion-eeprom-to-0x.patch \
+                       file://0014-OMAP3-board.c-don-t-attempt-to-set-up-second-RAM-ban.patch \
+                       file://0015-OMAP3-mem.c-enhance-the-RAM-test.patch \
+                       file://0016-env_nand.c-fail-gracefully-if-no-nand-is-present.patch \
+                       file://0017-OMAP3-add-definitions-to-support-sysinfo-cpu-and-cpu.patch \
+                       file://0018-OMAP3-sys_info-update-cpu-detection-for-36XX-37XX.patch \
+                       file://0019-OMAP3-clocks-update-clock-setup-for-36XX-37XX.patch \
+                       file://0020-OMAP3-beagle-add-support-for-Beagle-xM.patch \
+                       file://0021-OMAP3-Beagle-Overo-remove-omapfb.debug-y-from-defaul.patch \
+                       file://0022-OMAP3-beagle-implement-expansionboard-detection-base.patch \
+                       file://0023-beagleboard-display-message-about-I2C-errors-being-e.patch \
+                       file://0024-beagleboard-fix-TCT-expansionboard-IDs.patch \
+                       file://0025-Add-DSS-driver-for-OMAP3.patch \
+                       file://0026-Enable-DSS-driver-for-Beagle.patch \
+                       file://0027-beagleboardXM-don-t-set-mpurate-on-xM-in-bootargs.patch \
+                       file://0028-OMAP3-fix-and-clean-up-L2-cache-enable-disable-funct.patch \
+                       file://0029-OMAP3-convert-setup_auxcr-to-pure-asm.patch \
+                       file://0030-OMAP3-apply-Cortex-A8-errata-workarounds-only-on-aff.patch \
+                       file://0031-OMAP3-beagle-add-more-expansionboards-based-on-http-.patch \
+                       file://0032-OMAP3-beagle-set-mpurate-to-600-for-revB-and-revC1-3.patch \
+                       file://0033-OMAP3-beagle-prettify-expansionboard-message-a-bit.patch \
+                       file://0034-OMAP3-beagle-add-pinmux-for-Tincantools-Trainer-expa.patch \
+                       file://0035-OMAP3-Beagle-set-mpurate-to-1000-for-xM.patch \
+                       file://0036-OMAP3-Beagle-decrease-bootdelay-to-3-use-VGA-for-def.patch \
+                       file://0037-OMAP3-beagle-pass-expansionboard-name-in-bootargs.patch \
                        file://fw_env.config \
 "
 SRCREV_beagleboard = "ca6e1c136ddb720c3bb2cc043b99f7f06bc46c55"
@@ -66,29 +66,29 @@ SRCREV_calamari = "533cf3a024947aaf74c16573a6d951cd0c3d0a7d"
 PV_calamari = "2009.11+${PR}+gitr${SRCREV}"
 SRC_URI_calamari = " \
         git://git.denx.de/u-boot-mpc85xx.git;protocol=git \
-	file://0002-cmd_itest.c-fix-pointer-dereferencing.patch;apply=yes \
-	file://0001-cmd_i2c.c-reduced-subaddress-length-to-3-bytes.patch;apply=yes \
-	file://0002-cmd_bootm.c-made-subcommand-array-static.patch;apply=yes \
-	file://0003-cmd_i2c.c-reworked-subcommand-handling.patch;apply=yes \
-	file://0004-cmd_i2c.c-sorted-commands-alphabetically.patch;apply=yes \
-	file://0005-cmd_i2c.c-added-i2c-read-to-memory-function.patch;apply=yes \
-	file://0007-cmd_setexpr-allow-memory-addresses-and-env-vars-in-e.patch;apply=yes \
+	file://0002-cmd_itest.c-fix-pointer-dereferencing.patch \
+	file://0001-cmd_i2c.c-reduced-subaddress-length-to-3-bytes.patch \
+	file://0002-cmd_bootm.c-made-subcommand-array-static.patch \
+	file://0003-cmd_i2c.c-reworked-subcommand-handling.patch \
+	file://0004-cmd_i2c.c-sorted-commands-alphabetically.patch \
+	file://0005-cmd_i2c.c-added-i2c-read-to-memory-function.patch \
+	file://0007-cmd_setexpr-allow-memory-addresses-and-env-vars-in-e.patch \
         "
 
 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 \
-                 file://dss2.patch;apply=yes \
-                 file://600mhz.patch;apply=yes \
-                 file://new-pinmux.patch;apply=yes \
-                 file://spi3.patch;apply=yes \
-                 file://spi4.patch;apply=yes \
-                 file://headphone.patch;apply=yes \
-                 file://power.patch;apply=yes \
-                 file://ai-logo.patch;apply=yes \
-                 file://mmcinit.patch;apply=yes \
-                 file://touchbook-config.patch;apply=yes \
+                 file://dss2.patch \
+                 file://600mhz.patch \
+                 file://new-pinmux.patch \
+                 file://spi3.patch \
+                 file://spi4.patch \
+                 file://headphone.patch \
+                 file://power.patch \
+                 file://ai-logo.patch \
+                 file://mmcinit.patch \
+                 file://touchbook-config.patch \
 "
 SRCREV_omap3-touchbook = "d363f9cb0918a1b6b92e2e20d01543d0c4f53274"
 PV_omap3-touchbook = "2009.05+${PR}+gitr${SRCREV}"
@@ -105,22 +105,22 @@ PV_dm3730-am3715-evm = "2009.11+${PR}+gitr${SRCREV}"
 
 SRCREV_am3517-evm = "e60beb13cf0"
 SRC_URI_append_am3517-evm = " \
-file://omap3evm/0001-Changes-for-making-a-NAND-build.patch;apply=yes \
-file://omap3evm/0002-Fix-for-NFS-boot-for-OMAP3-EVM.patch;apply=yes \
-file://omap3evm/0003-OMAP3-timer-handling-to-1ms-tick-and-CONFIG_SYS_HZ-t.patch;apply=yes \
-file://omap3evm/0004-Reverse-patch-for-NFS-boot-to-fix-comments-provided.patch;apply=yes \
-file://omap3evm/0005-SMC911x-driver-fixed-for-NFS-boot.patch;apply=yes \
-file://omap3evm/0006-Added-OMAP3517-3505-support.patch;apply=yes \
-file://omap3evm/0007-OMAP3517TEB-validated-on-OMAP3517TEB-board.patch;apply=yes \
-file://omap3evm/0008-OMAP3517PRE-ALPHA-validated-on-OMAP3517PRE_ALPHA-bo.patch;apply=yes \
-file://omap3evm/0009-OMAP3517PRE-ALPHA-DDR-size-issue-fixed.patch;apply=yes \
-file://omap3evm/0010-OMAP3517PRE-ALPHA-Mux-configuration-for-MMC-CD-and.patch;apply=yes \
-file://omap3evm/0011-Ethernet-driver-functional-no-need-for-time-delay.patch;apply=yes \
-file://omap3evm/0012-EMAC-driver-Implement-GPIO-driven-PHY-reset.patch;apply=yes \
-file://omap3evm/0013-Cleaned-up-during-EVM-hang-issue.patch;apply=yes \
-file://omap3evm/0014-EMAC-driver-cleanup-removed-debug-prints.patch;apply=yes \
-file://omap3evm/0015-EMAC-driver-Check-for-link-status-in-packet-send-lo.patch;apply=yes \
-file://omap3evm/0016-Config-option-and-name-changed-to-omap3517_evm.patch;apply=yes \
+file://omap3evm/0001-Changes-for-making-a-NAND-build.patch \
+file://omap3evm/0002-Fix-for-NFS-boot-for-OMAP3-EVM.patch \
+file://omap3evm/0003-OMAP3-timer-handling-to-1ms-tick-and-CONFIG_SYS_HZ-t.patch \
+file://omap3evm/0004-Reverse-patch-for-NFS-boot-to-fix-comments-provided.patch \
+file://omap3evm/0005-SMC911x-driver-fixed-for-NFS-boot.patch \
+file://omap3evm/0006-Added-OMAP3517-3505-support.patch \
+file://omap3evm/0007-OMAP3517TEB-validated-on-OMAP3517TEB-board.patch \
+file://omap3evm/0008-OMAP3517PRE-ALPHA-validated-on-OMAP3517PRE_ALPHA-bo.patch \
+file://omap3evm/0009-OMAP3517PRE-ALPHA-DDR-size-issue-fixed.patch \
+file://omap3evm/0010-OMAP3517PRE-ALPHA-Mux-configuration-for-MMC-CD-and.patch \
+file://omap3evm/0011-Ethernet-driver-functional-no-need-for-time-delay.patch \
+file://omap3evm/0012-EMAC-driver-Implement-GPIO-driven-PHY-reset.patch \
+file://omap3evm/0013-Cleaned-up-during-EVM-hang-issue.patch \
+file://omap3evm/0014-EMAC-driver-cleanup-removed-debug-prints.patch \
+file://omap3evm/0015-EMAC-driver-Check-for-link-status-in-packet-send-lo.patch \
+file://omap3evm/0016-Config-option-and-name-changed-to-omap3517_evm.patch \
 "
 PV_am3517-evm = "2009.03+${PR}+gitr${SRCREV}"
 
@@ -129,7 +129,7 @@ SRCREV_omapzoom = "d691b424f1f5bf7eea3a4131dfc578d272e8f335"
 PV_omapzoom = "2009.01+${PR}+gitr${SRCREV}"
 
 SRC_URI_omapzoom2 = "git://dev.omapzoom.org/pub/scm/bootloader/u-boot.git;branch=master;protocol=git \
-                     file://0001-OMAP3-set-L1NEON-bit-in-aux-control-register.patch;apply=yes"
+                     file://0001-OMAP3-set-L1NEON-bit-in-aux-control-register.patch"
 SRCREV_omapzoom2 = "78e778e0ea884306841c6499851a1e35177d81d0"
 PV_omapzoom2 = "1.1.4+${PR}+gitr${SRCREV}"
 PE_omapzoom2 = "1"
@@ -158,8 +158,8 @@ do_compile_omapzoom36x () {
 }
 
 SRC_URI_overo = "git://gitorious.org/u-boot-omap3/mainline.git;branch=omap3-dev;protocol=git \
-                 file://fw-env.patch;apply=yes \
-                 file://dss2.patch;apply=yes \
+                 file://fw-env.patch \
+                 file://dss2.patch \
 "
 SRCREV_overo = "2dea1db2a3b7c12ed70bbf8ee50755089c5e5170"
 PV_overo = "2009.03+${PR}+gitr${SRCREV}"
@@ -224,18 +224,18 @@ SRCREV_mini2440 = "3516c35fb777ca959e5cadf2156a792ca10e1cff"
 SRC_URI_micro2440 = "git://repo.or.cz/u-boot-openmoko/mini2440.git;protocol=git;branch=dev-mini2440-stable"
 SRCREV_micro2440 = "3516c35fb777ca959e5cadf2156a792ca10e1cff"
 
-SRC_URI_neuros-osd2 += "file://Makefile-fix.patch;apply=yes"
-SRC_URI_append_akita = "file://pdaXrom-u-boot.patch;apply=yes \
-                        file://uboot-eabi-fix-HACK2.patch;apply=yes \
-                        file://akita-standard-partitioning.patch;apply=yes \
+SRC_URI_neuros-osd2 += "file://Makefile-fix.patch"
+SRC_URI_append_akita = "file://pdaXrom-u-boot.patch \
+                        file://uboot-eabi-fix-HACK2.patch \
+                        file://akita-standard-partitioning.patch \
                        "
-SRC_URI_append_spitz = "file://pdaXrom-u-boot.patch;apply=yes \
-                        file://uboot-eabi-fix-HACK2.patch;apply=yes \
-                        file://spitz-standard-partitioning.patch;apply=yes \
+SRC_URI_append_spitz = "file://pdaXrom-u-boot.patch \
+                        file://uboot-eabi-fix-HACK2.patch \
+                        file://spitz-standard-partitioning.patch \
                        "
-SRC_URI_append_c7x0 = "file://pdaXrom-u-boot.patch;apply=yes \
-                       file://uboot-eabi-fix-HACK2.patch;apply=yes \
-                       file://corgi-standard-partitioning.patch;apply=yes \
+SRC_URI_append_c7x0 = "file://pdaXrom-u-boot.patch \
+                       file://uboot-eabi-fix-HACK2.patch \
+                       file://corgi-standard-partitioning.patch \
                        "
 SRC_URI_sheevaplug = "git://git.denx.de/u-boot-marvell.git;protocol=git;branch=testing"
 SRCREV_sheevaplug = "119b9942da2e450d4e525fc004208dd7f7d062e0"