diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2010-03-15 23:25:53 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2010-06-10 21:05:13 +0200 |
| commit | bbd247b7c0808b0a9783bb27688b47a4ac741ead (patch) | |
| tree | 92dd19bc7f17cc20b07a50602d6164e77d36bfbe | |
| parent | b116aff43428adbede513850902a397fa58d0a3c (diff) | |
u-boot: simplify custom patch handling
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
| -rw-r--r-- | boot/u-boot/Config.in | 9 | ||||
| -rw-r--r-- | boot/u-boot/u-boot.mk | 10 |
2 files changed, 8 insertions, 11 deletions
diff --git a/boot/u-boot/Config.in b/boot/u-boot/Config.in index 4c76d57b9..78a195d25 100644 --- a/boot/u-boot/Config.in +++ b/boot/u-boot/Config.in @@ -33,10 +33,13 @@ config BR2_UBOOT_VERSION default "2009.11" if BR2_TARGET_UBOOT_2009_11 default "2009.08" if BR2_TARGET_UBOOT_2009_08 -config BR2_TARGET_UBOOT_CUSTOM_PATCH - string "custom patch" +config BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR + string "custom patch dir" help - If your board requires a custom patch, add the path to the file here. + If your board requires custom patches, add the path to the + directory containing the patches here. The patches must be + named u-boot-<version>-<something>.patch. + Most users may leave this empty choice diff --git a/boot/u-boot/u-boot.mk b/boot/u-boot/u-boot.mk index 4edef12f4..efde3ea99 100644 --- a/boot/u-boot/u-boot.mk +++ b/boot/u-boot/u-boot.mk @@ -9,7 +9,6 @@ U_BOOT_SOURCE:=u-boot-$(U_BOOT_VERSION).tar.bz2 U_BOOT_SITE:=ftp://ftp.denx.de/pub/u-boot U_BOOT_DIR:=$(BUILD_DIR)/u-boot-$(U_BOOT_VERSION) -U_BOOT_PATCH_DIR:=$(BUILD_DIR)/u-boot-$(U_BOOT_VERSION)-patches U_BOOT_CAT:=$(BZCAT) U_BOOT_BIN:=u-boot.bin U_BOOT_TARGET_BIN:=u-boot-$(U_BOOT_VERSION)-$(DATE).bin @@ -69,13 +68,8 @@ $(U_BOOT_DIR)/.patched: $(U_BOOT_DIR)/.unpacked toolchain/patch-kernel.sh $(U_BOOT_DIR) boot/u-boot \ u-boot-$(U_BOOT_VERSION)-\*.patch \ u-boot-$(U_BOOT_VERSION)-\*.patch.$(ARCH) -ifneq ($(strip $(U_BOOT_ARCH_PATCH_DIR)),) - toolchain/patch-kernel.sh $(U_BOOT_DIR) $(U_BOOT_ARCH_PATCH_DIR) \*.patch -endif -ifneq ($(strip $(BR2_TARGET_UBOOT_CUSTOM_PATCH)),"") - @mkdir -p $(U_BOOT_PATCH_DIR) - cp -dpr $(BR2_TARGET_UBOOT_CUSTOM_PATCH) $(U_BOOT_PATCH_DIR) - toolchain/patch-kernel.sh $(U_BOOT_DIR) $(U_BOOT_PATCH_DIR) \*.patch +ifneq ($(qstrip $(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR)),) + toolchain/patch-kernel.sh $(U_BOOT_DIR) $(U_BOOT_CUSTOM_PATCH_DIR) u-boot-$(U_BOOT_VERSION)-\*.patch endif touch $@ |