Bump u-boot to -2009.01-rc3, and add possibility to apply the arch-at91 patches if using an at91

This commit is contained in:
Ulf Samuelsson 2009-01-19 22:42:03 +00:00
parent b71c76a10a
commit 5a46761446
19 changed files with 48 additions and 7 deletions

View File

@ -0,0 +1,2 @@
include target/device/Atmel/arch-arm/u-boot/Makefile.in

View File

@ -0,0 +1,20 @@
choice
prompt "Add AT91 specific patches to u-Boot"
default BR2_TARGET_U_BOOT_2009_01_RC3_ARCH_AT91
help
Select a patch to add to U-Boot
config BR2_TARGET_U_BOOT_2009_01_RC3_ARCH_AT91
bool "AT91 patches for u-boot-2009.03-rc3"
depends on BR2_TARGET_ATMEL && BR2_arm
help
Apply the at91 linux-2.6.28-rc6 patches
endchoice
config BR2_TARGET_U_BOOT_ARCH_AT91_PATCH_DIR
string
depends on BR2_TARGET_U_BOOT_ARCH_PATCH
default "target/device/Atmel/arch-arm/u-boot/2009.01-rc3" if BR2_TARGET_U_BOOT_2009_01_RC3_ARCH_AT91
default ""

View File

@ -0,0 +1,5 @@
ifneq ($(BR2_TARGET_U_BOOT_ARCH_AT91_PATCH_DIR),)
U_BOOT_ARCH_PATCH_DIR:=$(strip $(subst ",, $(BR2_TARGET_U_BOOT_ARCH_AT91_PATCH_DIR)))
#"))
endif

View File

@ -0,0 +1,9 @@
menuconfig BR2_TARGET_U_BOOT_ARCH_PATCH
bool "Add architecture specific patch"
help
Patch U-Boot for a specific family of chips
if BR2_TARGET_U_BOOT_ARCH_PATCH
source "target/device/Atmel/arch-arm/u-boot/Config.in"
endif # BR2_TARGET_U_BOOT_ARCH_PATCH

View File

@ -17,8 +17,11 @@ choice
help
Select the specific U-Boot version you want to use
config BR2_TARGET_UBOOT_2009_01_RC1
bool "u-boot-2009.01-rc1"
#config BR2_TARGET_UBOOT_2009_01
# bool "u-boot-2009.01"
config BR2_TARGET_UBOOT_2009_01_RC3
bool "u-boot-2009.01-rc3"
config BR2_TARGET_UBOOT_2008_10
bool "u-boot-2008.10"
@ -31,24 +34,23 @@ config BR2_TARGET_UBOOT_1_2_0_ATMEL
bool "u-boot-1.2.0-atmel"
depends on BR2_TARGET_AT91
#config BR2_TARGET_UBOOT_2009_01
# bool "u-boot-2009.01"
endchoice
config BR2_UBOOT_VERSION
string
default "2009.01-rc1" if BR2_TARGET_UBOOT_2009_01_RC1
default "2009.01" if BR2_TARGET_UBOOT_2009_01
default "2009.01-rc3" if BR2_TARGET_UBOOT_2009_01_RC3
default "2008.10" if BR2_TARGET_UBOOT_2008_10
default "1.3.4" if BR2_TARGET_UBOOT_1_3_4
default "1.2.0-atmel" if BR2_TARGET_UBOOT_1_2_0_ATMEL
default "2009.01" if BR2_TARGET_UBOOT_2009_01
config BR2_U_BOOT_SITE
string
default "$(BR2_ATMEL_MIRROR)" if BR2_TARGET_UBOOT_1_2_0_ATMEL
default "ftp://ftp.denx.de/pub/u-boot"
source "target/device/Config.in.u-boot"
config BR2_TARGET_UBOOT_CUSTOM_PATCH
string "custom patch"
help

View File

@ -88,6 +88,9 @@ $(U_BOOT_DIR)/.patched: $(U_BOOT_DIR)/.unpacked
toolchain/patch-kernel.sh $(U_BOOT_DIR) target/u-boot/$(U_BOOT_VERSION) \
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)