[Armadeus-commitlog] armadeus branch, buildroot-update, updated. armadeus-6.0-75-g2a736bd
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, buildroot-update, updated. armadeus-6.0-75-g2a736bd
|
From: Sébastien S. <ss...@us...> - 2016-05-11 07:03:19
|
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, buildroot-update has been updated
via 2a736bdef9022c207806c6709b629a11a9913163 (commit)
via d1db5ae2caf2e02a58fe9f98f8df2100a12a0e69 (commit)
via 1af8376bfb0c6b23eb0fc3d7f19f49fdff632e62 (commit)
from 9611f34ffb312778db2fae9cf361b0c34f768a12 (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 2a736bdef9022c207806c6709b629a11a9913163
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue May 10 11:30:42 2016 +0200
[BUILDROOT] APF6: update defconfig files
commit d1db5ae2caf2e02a58fe9f98f8df2100a12a0e69
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue May 10 10:31:50 2016 +0200
[BUILDROOT] Remove UBOOT_ARMADEUS_SPECIFIC_PATCH_HOOK hook
The way BR now handles U-Boot patches makes this hook useless. Remove it.
commit 1af8376bfb0c6b23eb0fc3d7f19f49fdff632e62
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon May 9 17:39:12 2016 +0200
[BUILDROOT] Fix U-Boot configuration in apf*_defconfig
* rename BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR to BR2_TARGET_UBOOT_PATCH
* rename BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE to
BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH
* remove BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27_defconfig | 5 ++---
buildroot/configs/apf27_webradio_defconfig | 5 ++---
buildroot/configs/apf27mainline_defconfig | 5 ++---
.../configs/apf27preempt-rtmainline_defconfig | 5 ++---
buildroot/configs/apf27test_defconfig | 5 ++---
buildroot/configs/apf27xenomai_defconfig | 5 ++---
buildroot/configs/apf27xenomaimainline_defconfig | 5 ++---
buildroot/configs/apf28_defconfig | 5 ++---
buildroot/configs/apf28mainline_defconfig | 5 ++---
buildroot/configs/apf28mainlinetest_defconfig | 5 ++---
buildroot/configs/apf28test_defconfig | 5 ++---
buildroot/configs/apf51_defconfig | 5 ++---
buildroot/configs/apf51mainline_defconfig | 5 ++---
buildroot/configs/apf51test_defconfig | 5 ++---
buildroot/configs/apf6failsafe_defconfig | 5 +----
buildroot/configs/apf6legacy-preempt-rt_defconfig | 15 ++++-----------
buildroot/configs/apf6legacy_defconfig | 15 ++++-----------
buildroot/configs/apf6mediacenter_defconfig | 14 ++++----------
buildroot/configs/apf6test_defconfig | 19 +++++++------------
buildroot/configs/apf6xenomai_defconfig | 14 ++++----------
buildroot/configs/apf9328_defconfig | 5 ++---
buildroot/configs/apf9328test_defconfig | 5 ++---
buildroot/configs/apf9328xenomai_defconfig | 5 ++---
buildroot/target/device/armadeus/Makefile.in | 8 --------
24 files changed, 58 insertions(+), 117 deletions(-)
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index 87cf7ff..6c317a4 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -84,9 +84,8 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2015.01"
-BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2015.01"
-BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
-BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2015.01.h"
+BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2015.01"
+BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2015.01.h"
BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-spl.bin"
BR2_TARGET_UBOOT_NETWORK=y
diff --git a/buildroot/configs/apf27_webradio_defconfig b/buildroot/configs/apf27_webradio_defconfig
index 1f6b6d8..4196728 100644
--- a/buildroot/configs/apf27_webradio_defconfig
+++ b/buildroot/configs/apf27_webradio_defconfig
@@ -88,9 +88,8 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2015.01"
-BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2015.01"
-BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
-BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2015.01.h"
+BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2015.01"
+BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2015.01.h"
BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-spl.bin"
BR2_TARGET_UBOOT_NETWORK=y
diff --git a/buildroot/configs/apf27mainline_defconfig b/buildroot/configs/apf27mainline_defconfig
index d0a2d52..2d17145 100644
--- a/buildroot/configs/apf27mainline_defconfig
+++ b/buildroot/configs/apf27mainline_defconfig
@@ -88,9 +88,8 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2015.01"
-BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2015.01"
-BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
-BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)mainline-u-boot-2015.01.h"
+BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2015.01"
+BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)mainline-u-boot-2015.01.h"
BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-spl.bin"
BR2_TARGET_UBOOT_NETWORK=y
diff --git a/buildroot/configs/apf27preempt-rtmainline_defconfig b/buildroot/configs/apf27preempt-rtmainline_defconfig
index f521b7b..b1a5da9 100644
--- a/buildroot/configs/apf27preempt-rtmainline_defconfig
+++ b/buildroot/configs/apf27preempt-rtmainline_defconfig
@@ -89,9 +89,8 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2015.01"
-BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2015.01"
-BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
-BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)mainline-u-boot-2015.01.h"
+BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2015.01"
+BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)mainline-u-boot-2015.01.h"
BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-spl.bin"
BR2_TARGET_UBOOT_NETWORK=y
diff --git a/buildroot/configs/apf27test_defconfig b/buildroot/configs/apf27test_defconfig
index 0278ec6..06db2bb 100644
--- a/buildroot/configs/apf27test_defconfig
+++ b/buildroot/configs/apf27test_defconfig
@@ -166,9 +166,8 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2015.01"
-BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2015.01"
-BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
-BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2015.01.h"
+BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2015.01"
+BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2015.01.h"
BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-spl.bin"
BR2_TARGET_UBOOT_NETWORK=y
diff --git a/buildroot/configs/apf27xenomai_defconfig b/buildroot/configs/apf27xenomai_defconfig
index 4d86c48..bf21a11 100644
--- a/buildroot/configs/apf27xenomai_defconfig
+++ b/buildroot/configs/apf27xenomai_defconfig
@@ -85,9 +85,8 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2015.01"
-BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2015.01"
-BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
-BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2015.01.h"
+BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2015.01"
+BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2015.01.h"
BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-spl.bin"
BR2_TARGET_UBOOT_NETWORK=y
diff --git a/buildroot/configs/apf27xenomaimainline_defconfig b/buildroot/configs/apf27xenomaimainline_defconfig
index 0caf774..9890b33 100644
--- a/buildroot/configs/apf27xenomaimainline_defconfig
+++ b/buildroot/configs/apf27xenomaimainline_defconfig
@@ -84,9 +84,8 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2015.01"
-BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2015.01"
-BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
-BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)mainline-u-boot-2015.01.h"
+BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2015.01"
+BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)mainline-u-boot-2015.01.h"
BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-spl.bin"
BR2_TARGET_UBOOT_NETWORK=y
diff --git a/buildroot/configs/apf28_defconfig b/buildroot/configs/apf28_defconfig
index 88073d5..3112107 100644
--- a/buildroot/configs/apf28_defconfig
+++ b/buildroot/configs/apf28_defconfig
@@ -85,9 +85,8 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2015.01"
-BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2015.01"
-BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
-BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2015.01.h"
+BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2015.01"
+BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2015.01.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/apf28mainline_defconfig b/buildroot/configs/apf28mainline_defconfig
index c7e0184..4f470a2 100644
--- a/buildroot/configs/apf28mainline_defconfig
+++ b/buildroot/configs/apf28mainline_defconfig
@@ -87,9 +87,8 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2015.01"
-BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2015.01"
-BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
-BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)mainline-u-boot-2015.01.h"
+BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2015.01"
+BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)mainline-u-boot-2015.01.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/apf28mainlinetest_defconfig b/buildroot/configs/apf28mainlinetest_defconfig
index bf3081e..44b2435 100644
--- a/buildroot/configs/apf28mainlinetest_defconfig
+++ b/buildroot/configs/apf28mainlinetest_defconfig
@@ -157,9 +157,8 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2015.01"
-BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2015.01"
-BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
-BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)mainline-u-boot-2015.01.h"
+BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2015.01"
+BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)mainline-u-boot-2015.01.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 a5f6a60..3284189 100644
--- a/buildroot/configs/apf28test_defconfig
+++ b/buildroot/configs/apf28test_defconfig
@@ -158,9 +158,8 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2015.01"
-BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2015.01"
-BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
-BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2015.01.h"
+BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2015.01"
+BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2015.01.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 b1873ca..3a722e1 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -90,9 +90,8 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2015.01"
-BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2015.01"
-BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
-BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2015.01.h"
+BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2015.01"
+BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2015.01.h"
BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-nand-spl.imx"
BR2_TARGET_UBOOT_NETWORK=y
diff --git a/buildroot/configs/apf51mainline_defconfig b/buildroot/configs/apf51mainline_defconfig
index 04e39ac..ffa3350 100644
--- a/buildroot/configs/apf51mainline_defconfig
+++ b/buildroot/configs/apf51mainline_defconfig
@@ -84,9 +84,8 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2015.01"
-BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2015.01"
-BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
-BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2015.01.h"
+BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2015.01"
+BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2015.01.h"
BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-nand-spl.imx"
BR2_TARGET_UBOOT_NETWORK=y
diff --git a/buildroot/configs/apf51test_defconfig b/buildroot/configs/apf51test_defconfig
index ef41831..c406dde 100644
--- a/buildroot/configs/apf51test_defconfig
+++ b/buildroot/configs/apf51test_defconfig
@@ -171,9 +171,8 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2015.01"
-BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2015.01"
-BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
-BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2015.01.h"
+BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2015.01"
+BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2015.01.h"
BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-nand-spl.imx"
BR2_TARGET_UBOOT_NETWORK=y
diff --git a/buildroot/configs/apf6failsafe_defconfig b/buildroot/configs/apf6failsafe_defconfig
index e278fa9..d7988f8 100644
--- a/buildroot/configs/apf6failsafe_defconfig
+++ b/buildroot/configs/apf6failsafe_defconfig
@@ -1,8 +1,7 @@
BR2_arm=y
BR2_cortex_a9=y
-BR2_ARM_EABIHF=y
BR2_ARM_ENABLE_NEON=y
-BR2_ARM_FPU_VFPV3D16=y
+BR2_ARM_ENABLE_VFP=y
BR2_DL_DIR="$(BASE_DIR)/../downloads"
BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
BR2_CCACHE=y
@@ -37,9 +36,7 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-apf6dev imx6dl-apf6dev"
BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_IMXREGS=y
BR2_PACKAGE_PV=y
-BR2_PACKAGE_E2FSPROGS=y
BR2_PACKAGE_E2FSPROGS_E4DEFRAG=y
-BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
BR2_PACKAGE_MMC_UTILS=y
BR2_PACKAGE_APF_CONFIG=y
BR2_PACKAGE_UBOOT_TOOLS=y
diff --git a/buildroot/configs/apf6legacy-preempt-rt_defconfig b/buildroot/configs/apf6legacy-preempt-rt_defconfig
index 5d3b9ad..64bea0f 100644
--- a/buildroot/configs/apf6legacy-preempt-rt_defconfig
+++ b/buildroot/configs/apf6legacy-preempt-rt_defconfig
@@ -1,8 +1,7 @@
BR2_arm=y
BR2_cortex_a9=y
-BR2_ARM_EABIHF=y
BR2_ARM_ENABLE_NEON=y
-BR2_ARM_FPU_VFPV3D16=y
+BR2_ARM_ENABLE_VFP=y
BR2_DL_DIR="$(BASE_DIR)/../downloads"
BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
BR2_CCACHE=y
@@ -78,9 +77,7 @@ BR2_PACKAGE_DOSFSTOOLS=y
BR2_PACKAGE_DOSFSTOOLS_FATLABEL=y
BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
-BR2_PACKAGE_E2FSPROGS=y
BR2_PACKAGE_E2FSPROGS_E4DEFRAG=y
-BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
BR2_PACKAGE_MMC_UTILS=y
BR2_PACKAGE_FBGRAB=y
BR2_PACKAGE_FB_TEST_APP=y
@@ -93,19 +90,16 @@ BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X=y
BR2_PACKAGE_APF_CONFIG=y
BR2_PACKAGE_EVTEST=y
BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q=y
-BR2_PACKAGE_FREESCALE_IMX_VERSION_3_10_31=y
-BR2_PACKAGE_GPU_VIV_BIN_MX6Q=y
+BR2_PACKAGE_IMX_GPU_VIV=y
BR2_PACKAGE_I2C_TOOLS=y
BR2_PACKAGE_KBD=y
BR2_PACKAGE_PCI_DEBUG=y
BR2_PACKAGE_PCIUTILS=y
BR2_PACKAGE_TI_UTILS=y
BR2_PACKAGE_UBOOT_TOOLS=y
-BR2_PACKAGE_USBUTILS=y
BR2_PACKAGE_LIBV4L=y
BR2_PACKAGE_LIBV4L_UTILS=y
BR2_PACKAGE_TSLIB=y
-BR2_PACKAGE_NEWT=y
BR2_PACKAGE_BC=y
BR2_PACKAGE_BLUEZ_UTILS=y
BR2_PACKAGE_CAN_UTILS=y
@@ -130,9 +124,8 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2014.07"
-BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2014.07"
-BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
-BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2014.07.h"
+BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2014.07"
+BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2014.07.h"
BR2_TARGET_UBOOT_FORMAT_IMG=y
BR2_TARGET_UBOOT_SPL=y
BR2_TARGET_UBOOT_SPL_NAME="SPL"
diff --git a/buildroot/configs/apf6legacy_defconfig b/buildroot/configs/apf6legacy_defconfig
index 74fdcac..ef0827a 100644
--- a/buildroot/configs/apf6legacy_defconfig
+++ b/buildroot/configs/apf6legacy_defconfig
@@ -1,8 +1,7 @@
BR2_arm=y
BR2_cortex_a9=y
-BR2_ARM_EABIHF=y
BR2_ARM_ENABLE_NEON=y
-BR2_ARM_FPU_VFPV3D16=y
+BR2_ARM_ENABLE_VFP=y
BR2_DL_DIR="$(BASE_DIR)/../downloads"
BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
BR2_CCACHE=y
@@ -79,9 +78,7 @@ BR2_PACKAGE_DOSFSTOOLS=y
BR2_PACKAGE_DOSFSTOOLS_FATLABEL=y
BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
-BR2_PACKAGE_E2FSPROGS=y
BR2_PACKAGE_E2FSPROGS_E4DEFRAG=y
-BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
BR2_PACKAGE_MMC_UTILS=y
BR2_PACKAGE_FBGRAB=y
BR2_PACKAGE_FB_TEST_APP=y
@@ -94,19 +91,16 @@ BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X=y
BR2_PACKAGE_APF_CONFIG=y
BR2_PACKAGE_EVTEST=y
BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q=y
-BR2_PACKAGE_FREESCALE_IMX_VERSION_3_10_31=y
-BR2_PACKAGE_GPU_VIV_BIN_MX6Q=y
+BR2_PACKAGE_IMX_GPU_VIV=y
BR2_PACKAGE_I2C_TOOLS=y
BR2_PACKAGE_KBD=y
BR2_PACKAGE_PCI_DEBUG=y
BR2_PACKAGE_PCIUTILS=y
BR2_PACKAGE_TI_UTILS=y
BR2_PACKAGE_UBOOT_TOOLS=y
-BR2_PACKAGE_USBUTILS=y
BR2_PACKAGE_LIBV4L=y
BR2_PACKAGE_LIBV4L_UTILS=y
BR2_PACKAGE_TSLIB=y
-BR2_PACKAGE_NEWT=y
BR2_PACKAGE_BC=y
BR2_PACKAGE_BLUEZ_UTILS=y
BR2_PACKAGE_CAN_UTILS=y
@@ -131,9 +125,8 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2014.07"
-BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2014.07"
-BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
-BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2014.07.h"
+BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2014.07"
+BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2014.07.h"
BR2_TARGET_UBOOT_FORMAT_IMG=y
BR2_TARGET_UBOOT_SPL=y
BR2_TARGET_UBOOT_SPL_NAME="SPL"
diff --git a/buildroot/configs/apf6mediacenter_defconfig b/buildroot/configs/apf6mediacenter_defconfig
index 45c0785..b7c06ad 100644
--- a/buildroot/configs/apf6mediacenter_defconfig
+++ b/buildroot/configs/apf6mediacenter_defconfig
@@ -1,8 +1,7 @@
BR2_arm=y
BR2_cortex_a9=y
-BR2_ARM_EABIHF=y
BR2_ARM_ENABLE_NEON=y
-BR2_ARM_FPU_VFPV3D16=y
+BR2_ARM_ENABLE_VFP=y
BR2_DL_DIR="$(BASE_DIR)/../downloads"
BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
BR2_CCACHE=y
@@ -49,9 +48,7 @@ BR2_PACKAGE_DOSFSTOOLS=y
BR2_PACKAGE_DOSFSTOOLS_FATLABEL=y
BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
-BR2_PACKAGE_E2FSPROGS=y
BR2_PACKAGE_E2FSPROGS_E4DEFRAG=y
-BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
BR2_PACKAGE_MMC_UTILS=y
BR2_PACKAGE_FBGRAB=y
BR2_PACKAGE_FB_TEST_APP=y
@@ -64,8 +61,7 @@ BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X=y
BR2_PACKAGE_APF_CONFIG=y
BR2_PACKAGE_EVTEST=y
BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q=y
-BR2_PACKAGE_FREESCALE_IMX_VERSION_3_10_31=y
-BR2_PACKAGE_GPU_VIV_BIN_MX6Q=y
+BR2_PACKAGE_IMX_GPU_VIV=y
BR2_PACKAGE_I2C_TOOLS=y
BR2_PACKAGE_KBD=y
BR2_PACKAGE_PCI_DEBUG=y
@@ -76,7 +72,6 @@ BR2_PACKAGE_LIBV4L=y
BR2_PACKAGE_LIBV4L_UTILS=y
BR2_PACKAGE_TSLIB=y
BR2_PACKAGE_LIBFSLVPUWRAP=y
-BR2_PACKAGE_NEWT=y
BR2_PACKAGE_BLUEZ_UTILS=y
BR2_PACKAGE_CAN_UTILS=y
BR2_PACKAGE_DROPBEAR=y
@@ -98,9 +93,8 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2014.07"
-BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2014.07"
-BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
-BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2014.07.h"
+BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2014.07"
+BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2014.07.h"
BR2_TARGET_UBOOT_FORMAT_IMG=y
BR2_TARGET_UBOOT_SPL=y
BR2_TARGET_UBOOT_SPL_NAME="SPL"
diff --git a/buildroot/configs/apf6test_defconfig b/buildroot/configs/apf6test_defconfig
index c216774..60c6f84 100644
--- a/buildroot/configs/apf6test_defconfig
+++ b/buildroot/configs/apf6test_defconfig
@@ -1,8 +1,7 @@
BR2_arm=y
BR2_cortex_a9=y
-BR2_ARM_EABIHF=y
BR2_ARM_ENABLE_NEON=y
-BR2_ARM_FPU_VFPV3D16=y
+BR2_ARM_ENABLE_VFP=y
BR2_DL_DIR="$(BASE_DIR)/../downloads"
BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
BR2_CCACHE=y
@@ -86,9 +85,7 @@ BR2_PACKAGE_DOSFSTOOLS=y
BR2_PACKAGE_DOSFSTOOLS_FATLABEL=y
BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
-BR2_PACKAGE_E2FSPROGS=y
BR2_PACKAGE_E2FSPROGS_E4DEFRAG=y
-BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
BR2_PACKAGE_MMC_UTILS=y
BR2_PACKAGE_DOOM_WAD=y
BR2_PACKAGE_OPENTYRIAN=y
@@ -112,8 +109,6 @@ BR2_PACKAGE_PCI_DEBUG=y
BR2_PACKAGE_PCIUTILS=y
BR2_PACKAGE_TI_UTILS=y
BR2_PACKAGE_UBOOT_TOOLS=y
-BR2_PACKAGE_LIBV4L=y
-BR2_PACKAGE_LIBV4L_UTILS=y
BR2_PACKAGE_LUA_READLINE=y
BR2_PACKAGE_PYTHON=y
BR2_PACKAGE_PYTHON_CURSES=y
@@ -121,8 +116,9 @@ BR2_PACKAGE_PYTHON_READLINE=y
BR2_PACKAGE_PYTHON_NUMPY=y
BR2_PACKAGE_PYTHON_SERIAL=y
BR2_PACKAGE_PYTHON_TWISTED=y
+BR2_PACKAGE_LIBV4L=y
+BR2_PACKAGE_LIBV4L_UTILS=y
BR2_PACKAGE_TSLIB=y
-BR2_PACKAGE_NEWT=y
BR2_PACKAGE_BC=y
BR2_PACKAGE_BLUEZ_UTILS=y
BR2_PACKAGE_CAN_UTILS=y
@@ -131,12 +127,12 @@ BR2_PACKAGE_HOSTAPD=y
BR2_PACKAGE_IPERF=y
BR2_PACKAGE_IPROUTE2=y
BR2_PACKAGE_IW=y
-BR2_PACKAGE_LRZSZ=y
-BR2_PACKAGE_RSYNC=y
BR2_PACKAGE_LIGHTTPD=y
BR2_PACKAGE_LIGHTTPD_ZLIB=y
BR2_PACKAGE_LIGHTTPD_LUA=y
BR2_PACKAGE_LINKS=y
+BR2_PACKAGE_LRZSZ=y
+BR2_PACKAGE_RSYNC=y
BR2_PACKAGE_WIRELESS_TOOLS=y
BR2_PACKAGE_WPA_SUPPLICANT=y
BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
@@ -151,9 +147,8 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2014.07"
-BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2014.07"
-BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
-BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2014.07.h"
+BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2014.07"
+BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2014.07.h"
BR2_TARGET_UBOOT_FORMAT_IMG=y
BR2_TARGET_UBOOT_SPL=y
BR2_TARGET_UBOOT_SPL_NAME="SPL"
diff --git a/buildroot/configs/apf6xenomai_defconfig b/buildroot/configs/apf6xenomai_defconfig
index 1d665df..1f2cf1e 100644
--- a/buildroot/configs/apf6xenomai_defconfig
+++ b/buildroot/configs/apf6xenomai_defconfig
@@ -1,8 +1,7 @@
BR2_arm=y
BR2_cortex_a9=y
-BR2_ARM_EABIHF=y
BR2_ARM_ENABLE_NEON=y
-BR2_ARM_FPU_VFPV3D16=y
+BR2_ARM_ENABLE_VFP=y
BR2_DL_DIR="$(BASE_DIR)/../downloads"
BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
BR2_CCACHE=y
@@ -35,9 +34,9 @@ BR2_LINUX_KERNEL_ZIMAGE=y
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-wandboard imx6dl-apf6dev imx6q-apf6dev"
BR2_LINUX_KERNEL_INSTALL_TARGET=y
-BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_LINUX_KERNEL_EXT_XENOMAI=y
BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH_URL="http://download.gna.org/adeos/patches/v3.x/arm/ipipe-core-3.10.32-arm-7.patch"
+BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_IMXREGS=y
BR2_PACKAGE_ALSA_UTILS=y
BR2_PACKAGE_ALSA_UTILS_AMIXER=y
@@ -52,9 +51,7 @@ BR2_PACKAGE_DOSFSTOOLS=y
BR2_PACKAGE_DOSFSTOOLS_FATLABEL=y
BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
-BR2_PACKAGE_E2FSPROGS=y
BR2_PACKAGE_E2FSPROGS_E4DEFRAG=y
-BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
BR2_PACKAGE_MMC_UTILS=y
BR2_PACKAGE_FBGRAB=y
BR2_PACKAGE_FB_TEST_APP=y
@@ -72,9 +69,7 @@ BR2_PACKAGE_PCI_DEBUG=y
BR2_PACKAGE_PCIUTILS=y
BR2_PACKAGE_TI_UTILS=y
BR2_PACKAGE_UBOOT_TOOLS=y
-BR2_PACKAGE_USBUTILS=y
BR2_PACKAGE_TSLIB=y
-BR2_PACKAGE_NEWT=y
BR2_PACKAGE_BC=y
BR2_PACKAGE_BLUEZ_UTILS=y
BR2_PACKAGE_CAN_UTILS=y
@@ -100,9 +95,8 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2014.07"
-BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2014.07"
-BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
-BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2014.07.h"
+BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2014.07"
+BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2014.07.h"
BR2_TARGET_UBOOT_FORMAT_IMG=y
BR2_TARGET_UBOOT_SPL=y
BR2_TARGET_UBOOT_SPL_NAME="SPL"
diff --git a/buildroot/configs/apf9328_defconfig b/buildroot/configs/apf9328_defconfig
index af6931f..86c6e34 100644
--- a/buildroot/configs/apf9328_defconfig
+++ b/buildroot/configs/apf9328_defconfig
@@ -69,9 +69,8 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2015.01"
-BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2015.01"
-BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
-BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2015.01.h"
+BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2015.01"
+BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2015.01.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 fec19cc..c685146 100644
--- a/buildroot/configs/apf9328test_defconfig
+++ b/buildroot/configs/apf9328test_defconfig
@@ -129,9 +129,8 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2015.01"
-BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2015.01"
-BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
-BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2015.01.h"
+BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2015.01"
+BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2015.01.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/apf9328xenomai_defconfig b/buildroot/configs/apf9328xenomai_defconfig
index 25ab662..a1b779b 100644
--- a/buildroot/configs/apf9328xenomai_defconfig
+++ b/buildroot/configs/apf9328xenomai_defconfig
@@ -73,9 +73,8 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2015.01"
-BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2015.01"
-BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
-BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2015.01.h"
+BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2015.01"
+BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2015.01.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/target/device/armadeus/Makefile.in b/buildroot/target/device/armadeus/Makefile.in
index a8cd78d..e6961d3 100644
--- a/buildroot/target/device/armadeus/Makefile.in
+++ b/buildroot/target/device/armadeus/Makefile.in
@@ -11,14 +11,6 @@ ARMADEUS_DTB_IMAGE_NAME:=$(addsuffix .dtb,$(BOARD_NAME))
LINUX26_KERNEL_NAME:=$(BOARD_NAME)-linux.bin
# !! if you modify the following, please also update scripts/quiltify.sh !!
-# TODO: Remove this hook when switching to >=BR2016.02
-ifneq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR)),)
-define UBOOT_ARMADEUS_SPECIFIC_PATCH_HOOK
- support/scripts/apply-patches.sh $(@D) $(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR) \*.patch
-endef
-UBOOT_POST_PATCH_HOOKS += UBOOT_ARMADEUS_SPECIFIC_PATCH_HOOK
-endif
-
ifneq ($(BR2_CPU_NAME), "imx6")
ifneq ($(BR2_CPU_NAME), "imx6ul")
define UBOOT_UPDATE_CONFIG_HEADER
hooks/post-receive
--
armadeus
|