[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-334-g92f508b
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-334-g92f508b
|
From: jorasse <jo...@us...> - 2013-07-24 12:11:54
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 92f508bb3f9bfc45961dd5daa1ae0f6c9af36578 (commit)
via f52469e5b6c72ea5c905843177b3fa12c71e88f0 (commit)
via 10438bbc61df6217c856a4782a4d7c972615a96f (commit)
via 5ccf0482e062e541d118cd54941df8f67fac872e (commit)
via b98858accfa48e4b03e5b67ed7032c0dabf87841 (commit)
from 9becacc17d58821a9cc2897eb776b732320b9a9b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 92f508bb3f9bfc45961dd5daa1ae0f6c9af36578
Author: Eric Jarrige <eri...@ar...>
Date: Wed Jul 24 14:21:29 2013 +0200
[BUILD] all apf/pps boards: update default config file to support the new option added to BUILDROOT
commit f52469e5b6c72ea5c905843177b3fa12c71e88f0
Author: Eric Jarrige <eri...@ar...>
Date: Wed Jul 24 14:15:31 2013 +0200
[OTHER] update makefiles according to the new U-Boot option
commit 10438bbc61df6217c856a4782a4d7c972615a96f
Author: Eric Jarrige <eri...@ar...>
Date: Wed Jul 24 14:12:22 2013 +0200
[BUILDROOT] update patch supporting the Safe Boot file format
commit 5ccf0482e062e541d118cd54941df8f67fac872e
Author: Eric Jarrige <eri...@ar...>
Date: Wed Jul 24 14:10:23 2013 +0200
[BUILDROOT] add U-Boot option to build any binary file format
commit b98858accfa48e4b03e5b67ed7032c0dabf87841
Author: Eric Jarrige <eri...@ar...>
Date: Wed Jul 24 14:08:35 2013 +0200
[BUILDROOT] make U-Boot custom config option generic to be submited upstream
-----------------------------------------------------------------------
Summary of changes:
Makefile.in | 2 +-
buildroot/configs/apf27_defconfig | 3 +-
buildroot/configs/apf27_webradio_defconfig | 3 +-
buildroot/configs/apf27test_defconfig | 3 +-
buildroot/configs/apf28_defconfig | 3 +-
buildroot/configs/apf28test_defconfig | 3 +-
buildroot/configs/apf51_defconfig | 3 +-
buildroot/configs/apf51test_defconfig | 3 +-
buildroot/configs/apf9328_defconfig | 3 +-
buildroot/configs/apf9328test_defconfig | 3 +-
buildroot/configs/pps51_defconfig | 3 +-
buildroot/configs/pps_defconfig | 3 +-
buildroot/target/device/armadeus/Makefile.in | 6 +-
...add_support_for_custom_configuration_file.patch | 46 ++++++++++++++++++++
...add_support_for_custom_binary_file_format.patch | 43 ++++++++++++++++++
...support-for-Safe-Boot-file-format-this-fo.patch | 46 --------------------
...d_possibility_to_choose_board_header_file.patch | 26 -----------
...oot-add_support_for_Safe_Boot_file_format.patch | 31 +++++++++++++
18 files changed, 146 insertions(+), 87 deletions(-)
create mode 100644 patches/buildroot/2013.05/050-U-Boot-add_support_for_custom_configuration_file.patch
create mode 100644 patches/buildroot/2013.05/051-U-Boot-add_support_for_custom_binary_file_format.patch
delete mode 100644 patches/buildroot/2013.05/051a-U-Boot-add-support-for-Safe-Boot-file-format-this-fo.patch
delete mode 100644 patches/buildroot/2013.05/051d-u-boot-add_possibility_to_choose_board_header_file.patch
create mode 100644 patches/buildroot/2013.05/052-U-Boot-add_support_for_Safe_Boot_file_format.patch
diff --git a/Makefile.in b/Makefile.in
index ae0c830..1eebf88 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -68,7 +68,7 @@ ARMADEUS_U_BOOT_DIR:=$(BUILDROOT_PROJECT_BUILD_DIR)/uboot-$(ARMADEUS_U_BOOT_VERS
ARMADEUS_UCLIBC_DIR:=$(BUILDROOT_TOOLCHAIN_BUILD_DIR)/uClibc-$(ARMADEUS_UCLIBC_VERSION)
ARMADEUS_BOARD_DIR:=$(BUILDROOT_DIR)/target/device/armadeus/$(ARMADEUS_BOARD_NAME)
ARMADEUS_LINUX_CONFIG:=$(ARMADEUS_BOARD_DIR)/$(ARMADEUS_BOARD_NAME)-linux-$(ARMADEUS_LINUX_MAIN_VERSION).config
-ARMADEUS_U_BOOT_CONFIG:=$(BUILDROOT_DIR)/$(shell echo $(BR2_TARGET_UBOOT_CONFIG_HEADER_FILE))
+ARMADEUS_U_BOOT_CONFIG:=$(BUILDROOT_DIR)/$(shell echo $(BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE))
ARMADEUS_STAGING_DIR:=$(BUILDROOT_OUTPUT_DIR)/staging
ARMADEUS_TOOLCHAIN_PATH:=$(BUILDROOT_OUTPUT_DIR)/host/usr/bin
ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index f3bf4df..22ffd44 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -71,10 +71,11 @@ BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047
BR2_TARGET_ROOTFS_UBI=y
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
-BR2_TARGET_UBOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2013.04.h"
BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="ftp://ftp.denx.de/pub/u-boot/u-boot-2013.04.tar.bz2"
BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2013.04"
+BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2013.04.h"
BR2_TARGET_UBOOT_FORMAT_NAND_BIN=y
BR2_TARGET_UBOOT_NETWORK=y
BR2_TARGET_UBOOT_SERVERIP="192.168.0.2"
diff --git a/buildroot/configs/apf27_webradio_defconfig b/buildroot/configs/apf27_webradio_defconfig
index 3cc70f6..2f63a7c 100644
--- a/buildroot/configs/apf27_webradio_defconfig
+++ b/buildroot/configs/apf27_webradio_defconfig
@@ -80,10 +80,11 @@ BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047
BR2_TARGET_ROOTFS_UBI=y
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
-BR2_TARGET_UBOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2012.04.h"
BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="ftp://ftp.denx.de/pub/u-boot/u-boot-2012.04.01.tar.bz2"
BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2012.04"
+BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2012.04.h"
BR2_TARGET_UBOOT_FORMAT_NAND_BIN=y
BR2_TARGET_UBOOT_NETWORK=y
BR2_TARGET_UBOOT_SERVERIP="192.168.0.2"
diff --git a/buildroot/configs/apf27test_defconfig b/buildroot/configs/apf27test_defconfig
index 0fd1055..5fe8b28 100644
--- a/buildroot/configs/apf27test_defconfig
+++ b/buildroot/configs/apf27test_defconfig
@@ -130,10 +130,11 @@ BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047
BR2_TARGET_ROOTFS_UBI=y
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
-BR2_TARGET_UBOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2013.04.h"
BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="ftp://ftp.denx.de/pub/u-boot/u-boot-2013.04.tar.bz2"
BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2013.04"
+BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2013.04.h"
BR2_TARGET_UBOOT_FORMAT_NAND_BIN=y
BR2_TARGET_UBOOT_NETWORK=y
BR2_TARGET_UBOOT_SERVERIP="192.168.0.2"
diff --git a/buildroot/configs/apf28_defconfig b/buildroot/configs/apf28_defconfig
index 57d98a3..83dfdcf 100644
--- a/buildroot/configs/apf28_defconfig
+++ b/buildroot/configs/apf28_defconfig
@@ -73,10 +73,11 @@ BR2_TARGET_ROOTFS_UBI=y
BR2_TARGET_ROOTFS_UBI_SUBSIZE=0
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
-BR2_TARGET_UBOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2013.04.h"
BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="ftp://ftp.denx.de/pub/u-boot/u-boot-2013.04.tar.bz2"
BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2013.04"
+BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2013.04.h"
BR2_TARGET_UBOOT_FORMAT_SB=y
BR2_TARGET_UBOOT_NETWORK=y
BR2_TARGET_UBOOT_SERVERIP="192.168.0.2"
diff --git a/buildroot/configs/apf28test_defconfig b/buildroot/configs/apf28test_defconfig
index 5a9e407..8022526 100644
--- a/buildroot/configs/apf28test_defconfig
+++ b/buildroot/configs/apf28test_defconfig
@@ -99,10 +99,11 @@ BR2_TARGET_ROOTFS_UBI=y
BR2_TARGET_ROOTFS_UBI_SUBSIZE=0
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
-BR2_TARGET_UBOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2013.04.h"
BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="ftp://ftp.denx.de/pub/u-boot/u-boot-2013.04.tar.bz2"
BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2013.04"
+BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2013.04.h"
BR2_TARGET_UBOOT_FORMAT_SB=y
BR2_TARGET_UBOOT_NETWORK=y
BR2_TARGET_UBOOT_SERVERIP="192.168.0.2"
diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51_defconfig
index 4ed5412..5813be8 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -81,10 +81,11 @@ BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=135301
BR2_TARGET_ROOTFS_UBI=y
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
-BR2_TARGET_UBOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2012.04.h"
BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="ftp://ftp.denx.de/pub/u-boot/u-boot-2012.04.01.tar.bz2"
BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2012.04"
+BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2012.04.h"
BR2_TARGET_UBOOT_FORMAT_NAND_BIN=y
BR2_TARGET_UBOOT_NETWORK=y
BR2_TARGET_UBOOT_SERVERIP="192.168.0.2"
diff --git a/buildroot/configs/apf51test_defconfig b/buildroot/configs/apf51test_defconfig
index e2f334b..fdf2e17 100644
--- a/buildroot/configs/apf51test_defconfig
+++ b/buildroot/configs/apf51test_defconfig
@@ -147,10 +147,11 @@ BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=135301
BR2_TARGET_ROOTFS_UBI=y
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
-BR2_TARGET_UBOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2012.04.h"
BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="ftp://ftp.denx.de/pub/u-boot/u-boot-2012.04.01.tar.bz2"
BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2012.04"
+BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2012.04.h"
BR2_TARGET_UBOOT_FORMAT_NAND_BIN=y
BR2_TARGET_UBOOT_NETWORK=y
BR2_TARGET_UBOOT_SERVERIP="192.168.0.2"
diff --git a/buildroot/configs/apf9328_defconfig b/buildroot/configs/apf9328_defconfig
index f083054..71e41dc 100644
--- a/buildroot/configs/apf9328_defconfig
+++ b/buildroot/configs/apf9328_defconfig
@@ -57,10 +57,11 @@ BR2_TARGET_ROOTFS_JFFS2=y
BR2_TARGET_ROOTFS_JFFS2_PAD=y
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
-BR2_TARGET_UBOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2013.04.h"
BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="ftp://ftp.denx.de/pub/u-boot/u-boot-2013.04.tar.bz2"
BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2013.04"
+BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2013.04.h"
BR2_TARGET_UBOOT_NETWORK=y
BR2_TARGET_UBOOT_SERVERIP="192.168.0.2"
BR2_TARGET_UBOOT_IPADDR="192.168.0.10"
diff --git a/buildroot/configs/apf9328test_defconfig b/buildroot/configs/apf9328test_defconfig
index 442ceda..1a99ed6 100644
--- a/buildroot/configs/apf9328test_defconfig
+++ b/buildroot/configs/apf9328test_defconfig
@@ -102,10 +102,11 @@ BR2_TARGET_ROOTFS_JFFS2=y
BR2_TARGET_ROOTFS_JFFS2_PAD=y
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
-BR2_TARGET_UBOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2013.04.h"
BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="ftp://ftp.denx.de/pub/u-boot/u-boot-2013.04.tar.bz2"
BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2013.04"
+BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2013.04.h"
BR2_TARGET_UBOOT_NETWORK=y
BR2_TARGET_UBOOT_SERVERIP="192.168.0.2"
BR2_TARGET_UBOOT_IPADDR="192.168.0.10"
diff --git a/buildroot/configs/pps51_defconfig b/buildroot/configs/pps51_defconfig
index bfcdc7e..2e612e5 100644
--- a/buildroot/configs/pps51_defconfig
+++ b/buildroot/configs/pps51_defconfig
@@ -85,10 +85,11 @@ BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=135301
BR2_TARGET_ROOTFS_UBI=y
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="apf51"
-BR2_TARGET_UBOOT_CONFIG_HEADER_FILE="$(ARMADEUS_PATH)/apf51/apf51-u-boot-2012.04.h"
BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="ftp://ftp.denx.de/pub/u-boot/u-boot-2012.04.01.tar.bz2"
BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2012.04"
+BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2012.04.h"
BR2_TARGET_UBOOT_FORMAT_NAND_BIN=y
BR2_TARGET_UBOOT_NETWORK=y
BR2_TARGET_UBOOT_SERVERIP="192.168.0.2"
diff --git a/buildroot/configs/pps_defconfig b/buildroot/configs/pps_defconfig
index 7cc99df..92e6a3d 100644
--- a/buildroot/configs/pps_defconfig
+++ b/buildroot/configs/pps_defconfig
@@ -75,10 +75,11 @@ BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047
BR2_TARGET_ROOTFS_UBI=y
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="apf27"
-BR2_TARGET_UBOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2012.04.h"
BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="ftp://ftp.denx.de/pub/u-boot/u-boot-2012.04.01.tar.bz2"
BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2012.04"
+BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2012.04.h"
BR2_TARGET_UBOOT_FORMAT_NAND_BIN=y
BR2_TARGET_UBOOT_NETWORK=y
BR2_TARGET_UBOOT_SERVERIP="192.168.0.2"
diff --git a/buildroot/target/device/armadeus/Makefile.in b/buildroot/target/device/armadeus/Makefile.in
index 79803ca..a37a8c4 100644
--- a/buildroot/target/device/armadeus/Makefile.in
+++ b/buildroot/target/device/armadeus/Makefile.in
@@ -12,9 +12,6 @@ LINUX26_KERNEL_NAME:=$(BOARD_NAME)-linux.bin
# !! if you modify the following, please also update scripts/quiltify.sh !!
define UBOOT_ARMADEUS_SPECIFIC_PATCH_HOOK
support/scripts/apply-patches.sh $(@D) $(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR) \*.patch
-$(ifneq ($(strip $(BR2_TARGET_UBOOT_CONFIG_HEADER_FILE)),))
- cp -pf $(BR2_TARGET_UBOOT_CONFIG_HEADER_FILE) $(@D)/include/configs/$(UBOOT_BOARD_NAME).h
-$(endif)
endef
UBOOT_POST_PATCH_HOOKS += UBOOT_ARMADEUS_SPECIFIC_PATCH_HOOK
@@ -40,6 +37,9 @@ define UBOOT_POST_INSTALL_IMAGES_ACTION
@if [ ! -e "$(BINARIES_DIR)/$(BOARD_NAME)-u-boot.bin" ]; then \
ln -sf $(BINARIES_DIR)/$(BOARD_NAME)-$(UBOOT_BIN) $(BINARIES_DIR)/$(BOARD_NAME)-u-boot.bin ; \
fi
+ @if [ ! -e "$(BINARIES_DIR)/$(BOARD_NAME)-u-boot-nand.bin" ]; then \
+ ln -sf $(BINARIES_DIR)/$(BOARD_NAME)-$(UBOOT_BIN) $(BINARIES_DIR)/$(BOARD_NAME)-u-boot-nand.bin ; \
+ fi
endef
UBOOT_POST_INSTALL_IMAGES_HOOKS += UBOOT_POST_INSTALL_IMAGES_ACTION
diff --git a/patches/buildroot/2013.05/050-U-Boot-add_support_for_custom_configuration_file.patch b/patches/buildroot/2013.05/050-U-Boot-add_support_for_custom_configuration_file.patch
new file mode 100644
index 0000000..5791481
--- /dev/null
+++ b/patches/buildroot/2013.05/050-U-Boot-add_support_for_custom_configuration_file.patch
@@ -0,0 +1,46 @@
+U-Boot: add option to use a custom config file as it can be done within
+ Linux kernel, Busybox, uClibc and some other tools.
+
+Signed-off-by: Eric Jarrige <eri...@ar...>
+---
+--- buildroot/boot/uboot/Config.in
++++ buildroot/boot/uboot/Config.in
+@@ -71,6 +71,26 @@ config BR2_TARGET_UBOOT_CUSTOM_GIT_VERSI
+ endif
+
+ choice
++ prompt "U-Boot configuration"
++ default BR2_TARGET_UBOOT_USE_DEFCONFIG
++
++config BR2_TARGET_UBOOT_USE_DEFCONFIG
++ bool "Using default configuration"
++ help
++ Using the default configuration selected by U-Boot board name.
++
++config BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG
++ bool "Using a custom config file"
++
++endchoice
++
++config BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE
++ string "Configuration file path"
++ depends on BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG
++ help
++ Path to the custimized U-Boot configuration file
++
++choice
+ prompt "U-Boot binary format"
+ default BR2_TARGET_UBOOT_FORMAT_BIN
+
+--- buildroot/boot/uboot/uboot.mk
++++ buildroot/boot/uboot/uboot.mk
+@@ -71,6 +71,9 @@ UBOOT_POST_PATCH_HOOKS += UBOOT_APPLY_CU
+ endif
+
+ define UBOOT_CONFIGURE_CMDS
++ $(if $(BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG),
++ cp -pf $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE)) \
++ $(@D)/include/configs/$(UBOOT_BOARD_NAME).h)
+ $(TARGET_CONFIGURE_OPTS) $(UBOOT_CONFIGURE_OPTS) \
+ $(MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) \
+ $(UBOOT_BOARD_NAME)_config
diff --git a/patches/buildroot/2013.05/051-U-Boot-add_support_for_custom_binary_file_format.patch b/patches/buildroot/2013.05/051-U-Boot-add_support_for_custom_binary_file_format.patch
new file mode 100644
index 0000000..636ff2e
--- /dev/null
+++ b/patches/buildroot/2013.05/051-U-Boot-add_support_for_custom_binary_file_format.patch
@@ -0,0 +1,43 @@
+U-Boot: add option to use a custom U-Boot binary image format
+
+Signed-off-by: Eric Jarrige <eri...@ar...>
+---
+--- buildroot/boot/uboot/Config.in
++++ buildroot/boot/uboot/Config.in
+@@ -118,8 +118,23 @@ config BR2_TARGET_UBOOT_FORMAT_LDR
+ depends on BR2_bfin
+ bool "u-boot.ldr"
+
++config BR2_LINUX_UBOOT_USE_CUSTOM_FORMAT
++ bool "custom binary format"
++ help
++ Use CPU-specific binary format.
++
++ Select this option and specify the make target in "U-Boot
++ binary target name".
++
+ endchoice
+
++config BR2_LINUX_UBOOT_CUSTOM_FORMAT_NAME
++ string "U-Boot binary target name"
++ depends on BR2_LINUX_UBOOT_USE_CUSTOM_FORMAT
++ help
++ Specify the kernel make target to build the kernel that you
++ need.
++
+ config BR2_TARGET_UBOOT_OMAP_IFT
+ depends on BR2_TARGET_UBOOT_FORMAT_BIN
+ depends on BR2_arm || BR2_armeb
+--- buildroot/boot/uboot/uboot.mk
++++ buildroot/boot/uboot/uboot.mk
+@@ -37,6 +37,9 @@ else ifeq ($(BR2_TARGET_UBOOT_FORMAT_NAN
+ UBOOT_BIN = u-boot-nand.bin
+ else ifeq ($(BR2_TARGET_UBOOT_FORMAT_IMG),y)
+ UBOOT_BIN = u-boot.img
++else ifeq ($(BR2_LINUX_UBOOT_USE_CUSTOM_FORMAT),y)
++UBOOT_BIN = $(call qstrip,$(BR2_LINUX_UBOOT_CUSTOM_FORMAT_NAME))
++UBOOT_MAKE_TARGET = $(UBOOT_BIN)
+ else
+ UBOOT_BIN = u-boot.bin
+ UBOOT_BIN_IFT = $(UBOOT_BIN).ift
+
diff --git a/patches/buildroot/2013.05/051a-U-Boot-add-support-for-Safe-Boot-file-format-this-fo.patch b/patches/buildroot/2013.05/051a-U-Boot-add-support-for-Safe-Boot-file-format-this-fo.patch
deleted file mode 100644
index a503b90..0000000
--- a/patches/buildroot/2013.05/051a-U-Boot-add-support-for-Safe-Boot-file-format-this-fo.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From c6f5dc1ac36a8b01a732b972035a1ace5b97f790 Mon Sep 17 00:00:00 2001
-From: Eric Jarrige <eri...@ar...>
-Date: Tue, 13 Mar 2012 12:42:52 +0100
-Subject: [PATCH 2/2] u-boot: add support for u-boot.sb file format
-
-add u-boot.sb binary format in BR menuconfig - Safe Boot (.sb) file format
-have to be used with Freescale CPUs like imx23, imx28, stp37xx
-
-Signed-off-by: Eric Jarrige <eri...@ar...>
----
- boot/uboot/Config.in | 3 +++
- boot/uboot/uboot.mk | 4 ++++
- 2 files changed, 7 insertions(+), 0 deletions(-)
-
-diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
-index c8db9fb..5fd5258 100644
---- a/boot/uboot/Config.in
-+++ b/boot/uboot/Config.in
-@@ -98,6 +98,9 @@ config BR2_TARGET_UBOOT_FORMAT_LDR
- depends on BR2_bfin
- bool "u-boot.ldr"
-
-+config BR2_TARGET_UBOOT_FORMAT_SB
-+ bool "u-boot.sb"
-+
- endchoice
-
- config BR2_TARGET_UBOOT_OMAP_IFT
-diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
-index db9de8d..1394400 100644
---- a/boot/uboot/uboot.mk
-+++ b/boot/uboot/uboot.mk
-@@ -37,6 +37,10 @@ else ifeq ($(BR2_TARGET_UBOOT_FORMAT_LDR),y)
- UBOOT_BIN = u-boot-nand.bin
- else ifeq ($(BR2_TARGET_UBOOT_FORMAT_IMG),y)
- UBOOT_BIN = u-boot.img
-+else ifeq ($(BR2_TARGET_UBOOT_FORMAT_SB),y)
-+UBOOT_DEPENDENCIES += host-elftosb
-+UBOOT_BIN = u-boot.sb
-+UBOOT_MAKE_TARGET = $(UBOOT_BIN)
- else
- UBOOT_BIN = u-boot.bin
- UBOOT_BIN_IFT = $(UBOOT_BIN).ift
---
-1.7.2.5
-
diff --git a/patches/buildroot/2013.05/051d-u-boot-add_possibility_to_choose_board_header_file.patch b/patches/buildroot/2013.05/051d-u-boot-add_possibility_to_choose_board_header_file.patch
deleted file mode 100644
index 631fe1e..0000000
--- a/patches/buildroot/2013.05/051d-u-boot-add_possibility_to_choose_board_header_file.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-
-BR maintainer removes this change (and others) with this commit:
-http://git.buildroot.net/buildroot/commit/?id=3bab463be4a42de790b745ab2e873e1c1ce42f2d
-
-We need it because U-Boot's mainline doesn't have (yet?) our boards configs.
-So this patch reverts the removing + refines it.
-
-Index: buildroot/boot/uboot/Config.in
-===================================================================
---- buildroot.orig/boot/uboot/Config.in 2012-02-21 16:44:24.000000000 +0100
-+++ buildroot/boot/uboot/Config.in 2012-02-21 16:44:26.000000000 +0100
-@@ -12,6 +12,14 @@
- See boards.cfg in U-Boot source code for the list of available
- configurations.
-
-+config BR2_TARGET_UBOOT_CONFIG_HEADER_FILE
-+ string "U-Boot header file"
-+ default "$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-$(BR2_TARGET_UBOOT_VERSION).h"
-+ help
-+ U-Boot config header file to use to build U-Boot for your target.
-+ Mainly for people using boards not (yet) integrated in U-Boot's
-+ mainline or wanting to test a config different from the default one.
-+
- choice
- prompt "U-Boot Version"
- help
diff --git a/patches/buildroot/2013.05/052-U-Boot-add_support_for_Safe_Boot_file_format.patch b/patches/buildroot/2013.05/052-U-Boot-add_support_for_Safe_Boot_file_format.patch
new file mode 100644
index 0000000..5a1192d
--- /dev/null
+++ b/patches/buildroot/2013.05/052-U-Boot-add_support_for_Safe_Boot_file_format.patch
@@ -0,0 +1,31 @@
+add u-boot.sb binary format in BR menuconfig - Safe Boot (.sb) format
+depends on the host-elftosb tool to build requiring a specific dependency
+in BuidlRoot makefile
+
+Signed-off-by: Eric Jarrige <eri...@ar...>
+---
+--- buildroot/boot/uboot/Config.in
++++ buildroot/boot/uboot/Config.in
+@@ -118,6 +118,9 @@ config BR2_TARGET_UBOOT_FORMAT_LDR
+ depends on BR2_bfin
+ bool "u-boot.ldr"
+
++config BR2_TARGET_UBOOT_FORMAT_SB
++ bool "u-boot.sb"
++
+ config BR2_LINUX_UBOOT_USE_CUSTOM_FORMAT
+ bool "custom binary format"
+ help
+--- buildroot/boot/uboot/uboot.mk
++++ buildroot/boot/uboot/uboot.mk
+@@ -37,6 +37,10 @@ else ifeq ($(BR2_TARGET_UBOOT_FORMAT_NAN
+ UBOOT_BIN = u-boot-nand.bin
+ else ifeq ($(BR2_TARGET_UBOOT_FORMAT_IMG),y)
+ UBOOT_BIN = u-boot.img
++else ifeq ($(BR2_TARGET_UBOOT_FORMAT_SB),y)
++UBOOT_DEPENDENCIES += host-elftosb
++UBOOT_BIN = u-boot.sb
++UBOOT_MAKE_TARGET = $(UBOOT_BIN)
+ else ifeq ($(BR2_LINUX_UBOOT_USE_CUSTOM_FORMAT),y)
+ UBOOT_BIN = $(call qstrip,$(BR2_LINUX_UBOOT_CUSTOM_FORMAT_NAME))
+ UBOOT_MAKE_TARGET = $(UBOOT_BIN)
hooks/post-receive
--
armadeus
|
