Commit bbd247b7 authored by Thomas Petazzoni's avatar Thomas Petazzoni
Browse files

u-boot: simplify custom patch handling 



Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent b116aff4

boot/u-boot/Config.in

+6 −3
Original line number Diff line number Diff line
@@ -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

boot/u-boot/u-boot.mk

+2 −8
Original line number Diff line number Diff line
@@ -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 $@