aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Ulf Samuelsson <ulf.samuelsson@atmel.com>2009-01-19 22:42:03 +0000
committerGravatar Ulf Samuelsson <ulf.samuelsson@atmel.com>2009-01-19 22:42:03 +0000
commit5a4676144660f6e92bbe5e0de6b38094df155021 (patch)
tree064a71e50fa34e6a26c44b5597b3c4e1fc45556a
parentb71c76a10a21320a9401cc4246079e9f4f47fae1 (diff)
downloadbuildroot-5a4676144660f6e92bbe5e0de6b38094df155021.tar.gz
buildroot-5a4676144660f6e92bbe5e0de6b38094df155021.tar.bz2
Bump u-boot to -2009.01-rc3, and add possibility to apply the arch-at91 patches if using an at91
-rw-r--r--target/device/Atmel/arch-arm/Makefile.in2
-rw-r--r--target/device/Atmel/arch-arm/u-boot/2009.01-rc3/u-boot-2009.01-rc1-001-at91rm9200.patch (renamed from target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-001-at91rm9200.patch)0
-rw-r--r--target/device/Atmel/arch-arm/u-boot/2009.01-rc3/u-boot-2009.01-rc1-002-at91rm9200dk.h.patch (renamed from target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-002-at91rm9200dk.h.patch)0
-rw-r--r--target/device/Atmel/arch-arm/u-boot/2009.01-rc3/u-boot-2009.01-rc1-003-at91rm9200dk.patch (renamed from target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-003-at91rm9200dk.patch)0
-rw-r--r--target/device/Atmel/arch-arm/u-boot/2009.01-rc3/u-boot-2009.01-rc1-004-at91rm9200ek.patch (renamed from target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-004-at91rm9200ek.patch)0
-rw-r--r--target/device/Atmel/arch-arm/u-boot/2009.01-rc3/u-boot-2009.01-rc1-005-at91sam9g20ek.patch (renamed from target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-005-at91sam9g20ek.patch)0
-rw-r--r--target/device/Atmel/arch-arm/u-boot/2009.01-rc3/u-boot-2009.01-rc1-006-drivers-net-macb.c.patch (renamed from target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-006-drivers-net-macb.c.patch)0
-rw-r--r--target/device/Atmel/arch-arm/u-boot/2009.01-rc3/u-boot-2009.01-rc1-007-tools.patch (renamed from target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-007-tools.patch)0
-rw-r--r--target/device/Atmel/arch-arm/u-boot/2009.01-rc3/u-boot-2009.01-rc1-008-Makefile.patch (renamed from target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-008-Makefile.patch)0
-rw-r--r--target/device/Atmel/arch-arm/u-boot/2009.01-rc3/u-boot-2009.01-rc1-009-factory.patch (renamed from target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-009-factory.patch)0
-rw-r--r--target/device/Atmel/arch-arm/u-boot/2009.01-rc3/u-boot-2009.01-rc1-010-coloured_led.patch (renamed from target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-010-coloured_led.patch)0
-rw-r--r--target/device/Atmel/arch-arm/u-boot/2009.01-rc3/u-boot-2009.01-rc1-011-spimux.patch (renamed from target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-011-spimux.patch)0
-rw-r--r--target/device/Atmel/arch-arm/u-boot/2009.01-rc3/u-boot-2009.01-rc1-012-ethinit.patch (renamed from target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-012-ethinit.patch)0
-rw-r--r--target/device/Atmel/arch-arm/u-boot/2009.01-rc3/u-boot-2009.01-rc1-013-configs.patch (renamed from target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-013-configs.patch)0
-rw-r--r--target/device/Atmel/arch-arm/u-boot/Config.in20
-rw-r--r--target/device/Atmel/arch-arm/u-boot/Makefile.in5
-rw-r--r--target/device/Config.in.u-boot9
-rw-r--r--target/u-boot/Config.in16
-rw-r--r--target/u-boot/Makefile.in3
19 files changed, 48 insertions, 7 deletions
diff --git a/target/device/Atmel/arch-arm/Makefile.in b/target/device/Atmel/arch-arm/Makefile.in
index e69de29bb2..e4ca5434b5 100644
--- a/target/device/Atmel/arch-arm/Makefile.in
+++ b/target/device/Atmel/arch-arm/Makefile.in
@@ -0,0 +1,2 @@
+include target/device/Atmel/arch-arm/u-boot/Makefile.in
+
diff --git a/target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-001-at91rm9200.patch b/target/device/Atmel/arch-arm/u-boot/2009.01-rc3/u-boot-2009.01-rc1-001-at91rm9200.patch
index 0445b2329c..0445b2329c 100644
--- a/target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-001-at91rm9200.patch
+++ b/target/device/Atmel/arch-arm/u-boot/2009.01-rc3/u-boot-2009.01-rc1-001-at91rm9200.patch
diff --git a/target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-002-at91rm9200dk.h.patch b/target/device/Atmel/arch-arm/u-boot/2009.01-rc3/u-boot-2009.01-rc1-002-at91rm9200dk.h.patch
index 2e7e578229..2e7e578229 100644
--- a/target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-002-at91rm9200dk.h.patch
+++ b/target/device/Atmel/arch-arm/u-boot/2009.01-rc3/u-boot-2009.01-rc1-002-at91rm9200dk.h.patch
diff --git a/target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-003-at91rm9200dk.patch b/target/device/Atmel/arch-arm/u-boot/2009.01-rc3/u-boot-2009.01-rc1-003-at91rm9200dk.patch
index 8f14170fac..8f14170fac 100644
--- a/target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-003-at91rm9200dk.patch
+++ b/target/device/Atmel/arch-arm/u-boot/2009.01-rc3/u-boot-2009.01-rc1-003-at91rm9200dk.patch
diff --git a/target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-004-at91rm9200ek.patch b/target/device/Atmel/arch-arm/u-boot/2009.01-rc3/u-boot-2009.01-rc1-004-at91rm9200ek.patch
index 4d22c53348..4d22c53348 100644
--- a/target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-004-at91rm9200ek.patch
+++ b/target/device/Atmel/arch-arm/u-boot/2009.01-rc3/u-boot-2009.01-rc1-004-at91rm9200ek.patch
diff --git a/target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-005-at91sam9g20ek.patch b/target/device/Atmel/arch-arm/u-boot/2009.01-rc3/u-boot-2009.01-rc1-005-at91sam9g20ek.patch
index b87a655e6a..b87a655e6a 100644
--- a/target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-005-at91sam9g20ek.patch
+++ b/target/device/Atmel/arch-arm/u-boot/2009.01-rc3/u-boot-2009.01-rc1-005-at91sam9g20ek.patch
diff --git a/target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-006-drivers-net-macb.c.patch b/target/device/Atmel/arch-arm/u-boot/2009.01-rc3/u-boot-2009.01-rc1-006-drivers-net-macb.c.patch
index 81ab7c6e6e..81ab7c6e6e 100644
--- a/target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-006-drivers-net-macb.c.patch
+++ b/target/device/Atmel/arch-arm/u-boot/2009.01-rc3/u-boot-2009.01-rc1-006-drivers-net-macb.c.patch
diff --git a/target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-007-tools.patch b/target/device/Atmel/arch-arm/u-boot/2009.01-rc3/u-boot-2009.01-rc1-007-tools.patch
index 8f71ee043f..8f71ee043f 100644
--- a/target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-007-tools.patch
+++ b/target/device/Atmel/arch-arm/u-boot/2009.01-rc3/u-boot-2009.01-rc1-007-tools.patch
diff --git a/target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-008-Makefile.patch b/target/device/Atmel/arch-arm/u-boot/2009.01-rc3/u-boot-2009.01-rc1-008-Makefile.patch
index 176eed55df..176eed55df 100644
--- a/target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-008-Makefile.patch
+++ b/target/device/Atmel/arch-arm/u-boot/2009.01-rc3/u-boot-2009.01-rc1-008-Makefile.patch
diff --git a/target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-009-factory.patch b/target/device/Atmel/arch-arm/u-boot/2009.01-rc3/u-boot-2009.01-rc1-009-factory.patch
index 7d1c958dcd..7d1c958dcd 100644
--- a/target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-009-factory.patch
+++ b/target/device/Atmel/arch-arm/u-boot/2009.01-rc3/u-boot-2009.01-rc1-009-factory.patch
diff --git a/target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-010-coloured_led.patch b/target/device/Atmel/arch-arm/u-boot/2009.01-rc3/u-boot-2009.01-rc1-010-coloured_led.patch
index 5c1d29dce5..5c1d29dce5 100644
--- a/target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-010-coloured_led.patch
+++ b/target/device/Atmel/arch-arm/u-boot/2009.01-rc3/u-boot-2009.01-rc1-010-coloured_led.patch
diff --git a/target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-011-spimux.patch b/target/device/Atmel/arch-arm/u-boot/2009.01-rc3/u-boot-2009.01-rc1-011-spimux.patch
index 8ab469fd8d..8ab469fd8d 100644
--- a/target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-011-spimux.patch
+++ b/target/device/Atmel/arch-arm/u-boot/2009.01-rc3/u-boot-2009.01-rc1-011-spimux.patch
diff --git a/target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-012-ethinit.patch b/target/device/Atmel/arch-arm/u-boot/2009.01-rc3/u-boot-2009.01-rc1-012-ethinit.patch
index c2f709c709..c2f709c709 100644
--- a/target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-012-ethinit.patch
+++ b/target/device/Atmel/arch-arm/u-boot/2009.01-rc3/u-boot-2009.01-rc1-012-ethinit.patch
diff --git a/target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-013-configs.patch b/target/device/Atmel/arch-arm/u-boot/2009.01-rc3/u-boot-2009.01-rc1-013-configs.patch
index e65645b694..e65645b694 100644
--- a/target/device/Atmel/arch-arm/u-boot/2009.01-rc1/u-boot-2009.01-rc1-013-configs.patch
+++ b/target/device/Atmel/arch-arm/u-boot/2009.01-rc3/u-boot-2009.01-rc1-013-configs.patch
diff --git a/target/device/Atmel/arch-arm/u-boot/Config.in b/target/device/Atmel/arch-arm/u-boot/Config.in
new file mode 100644
index 0000000000..f9915b17d8
--- /dev/null
+++ b/target/device/Atmel/arch-arm/u-boot/Config.in
@@ -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 ""
+
diff --git a/target/device/Atmel/arch-arm/u-boot/Makefile.in b/target/device/Atmel/arch-arm/u-boot/Makefile.in
new file mode 100644
index 0000000000..841895c598
--- /dev/null
+++ b/target/device/Atmel/arch-arm/u-boot/Makefile.in
@@ -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
+
diff --git a/target/device/Config.in.u-boot b/target/device/Config.in.u-boot
new file mode 100644
index 0000000000..d67aacfaff
--- /dev/null
+++ b/target/device/Config.in.u-boot
@@ -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
+
diff --git a/target/u-boot/Config.in b/target/u-boot/Config.in
index 981b1787b9..55c20be039 100644
--- a/target/u-boot/Config.in
+++ b/target/u-boot/Config.in
@@ -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
diff --git a/target/u-boot/Makefile.in b/target/u-boot/Makefile.in
index baf331da7f..1386e03a7d 100644
--- a/target/u-boot/Makefile.in
+++ b/target/u-boot/Makefile.in
@@ -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)