Bump buildroot to version 2017-02
TG-3 #closed
This commit is contained in:
@@ -4,6 +4,7 @@ source "boot/afboot-stm32/Config.in"
|
||||
source "boot/at91bootstrap/Config.in"
|
||||
source "boot/at91bootstrap3/Config.in"
|
||||
source "boot/at91dataflashboot/Config.in"
|
||||
source "boot/arm-trusted-firmware/Config.in"
|
||||
source "boot/barebox/Config.in"
|
||||
source "boot/boot-wrapper-aarch64/Config.in"
|
||||
source "boot/grub/Config.in"
|
||||
@@ -15,6 +16,7 @@ source "boot/s500-bootloader/Config.in"
|
||||
source "boot/syslinux/Config.in"
|
||||
source "boot/ts4800-mbrboot/Config.in"
|
||||
source "boot/uboot/Config.in"
|
||||
source "boot/vexpress-firmware/Config.in"
|
||||
source "boot/xloader/Config.in"
|
||||
|
||||
endmenu
|
||||
|
||||
65
bsp/buildroot/boot/arm-trusted-firmware/Config.in
Normal file
65
bsp/buildroot/boot/arm-trusted-firmware/Config.in
Normal file
@@ -0,0 +1,65 @@
|
||||
config BR2_TARGET_ARM_TRUSTED_FIRMWARE
|
||||
bool "ARM Trusted Firmware (ATF)"
|
||||
depends on BR2_aarch64 && BR2_TARGET_UBOOT
|
||||
help
|
||||
Enable this option if you want to build the ATF for your ARM
|
||||
based embedded device.
|
||||
|
||||
https://github.com/ARM-software/arm-trusted-firmware
|
||||
|
||||
if BR2_TARGET_ARM_TRUSTED_FIRMWARE
|
||||
choice
|
||||
prompt "ATF Version"
|
||||
help
|
||||
Select the specific ATF version you want to use
|
||||
|
||||
config BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION
|
||||
bool "v1.2"
|
||||
|
||||
config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL
|
||||
bool "Custom tarball"
|
||||
|
||||
config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT
|
||||
bool "Custom Git repository"
|
||||
|
||||
endchoice
|
||||
|
||||
if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL
|
||||
|
||||
config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION
|
||||
string "URL of custom ATF tarball"
|
||||
|
||||
endif
|
||||
|
||||
config BR2_TARGET_ARM_TRUSTED_FIRMWARE_VERSION
|
||||
string
|
||||
default "v1.2" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION
|
||||
default "custom" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL
|
||||
default BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION \
|
||||
if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT
|
||||
|
||||
if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT
|
||||
|
||||
config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL
|
||||
string "URL of custom repository"
|
||||
|
||||
config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION
|
||||
string "Custom repository version"
|
||||
help
|
||||
Revision to use in the typical format used by Git
|
||||
E.G. a sha id, a tag, ..
|
||||
|
||||
endif
|
||||
|
||||
config BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM
|
||||
string "ATF platform"
|
||||
help
|
||||
Target plaform to build for.
|
||||
|
||||
config BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES
|
||||
string "Additional ATF build variables"
|
||||
help
|
||||
Additional parameters for the ATF build
|
||||
E.G. 'DEBUG=1 LOG_LEVEL=20'
|
||||
|
||||
endif
|
||||
@@ -0,0 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 cbdd9b770ec1ab4933fc7f9f520daea5a364bb4dc964820fb017a0cf8c7df556 arm-trusted-firmware-v1.2.tar.gz
|
||||
md5 fac2c08bd74337fec2e14a98fc9f748f arm-trusted-firmware-v1.2.tar.gz
|
||||
@@ -0,0 +1,69 @@
|
||||
################################################################################
|
||||
#
|
||||
# arm-trusted-firmware
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ARM_TRUSTED_FIRMWARE_VERSION = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_VERSION))
|
||||
ARM_TRUSTED_FIRMWARE_LICENSE = BSD-3c
|
||||
ARM_TRUSTED_FIRMWARE_LICENSE_FILES = license.md
|
||||
|
||||
ARM_TRUSTED_FIRMWARE_DEPENDENCIES += uboot
|
||||
|
||||
ifeq ($(ARM_TRUSTED_FIRMWARE_VERSION),custom)
|
||||
# Handle custom ATF tarballs as specified by the configuration
|
||||
ARM_TRUSTED_FIRMWARE_TARBALL = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION))
|
||||
ARM_TRUSTED_FIRMWARE_SITE = $(patsubst %/,%,$(dir $(ARM_TRUSTED_FIRMWARE_TARBALL)))
|
||||
ARM_TRUSTED_FIRMWARE_SOURCE = $(notdir $(ARM_TRUSTED_FIRMWARE_TARBALL))
|
||||
BR_NO_CHECK_HASH_FOR += $(ARM_TRUSTED_FIRMWARE_SOURCE)
|
||||
else ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT),y)
|
||||
ARM_TRUSTED_FIRMWARE_SITE = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL))
|
||||
ARM_TRUSTED_FIRMWARE_SITE_METHOD = git
|
||||
else
|
||||
ARM_TRUSTED_FIRMWARE_SITE = $(call github,ARM-software,arm-trusted-firmware,$(ARM_TRUSTED_FIRMWARE_VERSION))
|
||||
endif
|
||||
|
||||
ARM_TRUSTED_FIRMWARE_INSTALL_IMAGES = YES
|
||||
|
||||
ARM_TRUSTED_FIRMWARE_PLATFORM = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM))
|
||||
|
||||
ARM_TRUSTED_FIRMWARE_MAKE_OPTS += \
|
||||
CROSS_COMPILE="$(TARGET_CROSS)" \
|
||||
BL33=$(BINARIES_DIR)/u-boot.bin \
|
||||
$(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES)) \
|
||||
PLAT=$(ARM_TRUSTED_FIRMWARE_PLATFORM) \
|
||||
all fip
|
||||
|
||||
ifeq ($(BR2_TARGET_VEXPRESS_FIRMWARE),y)
|
||||
ARM_TRUSTED_FIRMWARE_MAKE_OPTS += SCP_BL2=$(BINARIES_DIR)/scp-fw.bin
|
||||
ARM_TRUSTED_FIRMWARE_DEPENDENCIES += vexpress-firmware
|
||||
endif
|
||||
|
||||
define ARM_TRUSTED_FIRMWARE_BUILD_CMDS
|
||||
$(TARGET_CONFIGURE_OPTS) \
|
||||
$(MAKE) -C $(@D) $(ARM_TRUSTED_FIRMWARE_MAKE_OPTS) \
|
||||
$(ARM_TRUSTED_FIRMWARE_MAKE_TARGET)
|
||||
endef
|
||||
|
||||
define ARM_TRUSTED_FIRMWARE_INSTALL_IMAGES_CMDS
|
||||
cp -dpf $(@D)/build/$(ARM_TRUSTED_FIRMWARE_PLATFORM)/release/*.bin $(BINARIES_DIR)/
|
||||
endef
|
||||
|
||||
# Configuration ckeck
|
||||
ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE)$(BR_BUILDING),yy)
|
||||
|
||||
ifeq ($(ARM_TRUSTED_FIRMWARE_VERSION),custom)
|
||||
ifeq ($(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION))),)
|
||||
$(error No tarball location specified. Please check BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION))
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT),y)
|
||||
ifeq ($(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL)),)
|
||||
$(error No repository specified. Please check BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL)
|
||||
endif
|
||||
endif
|
||||
|
||||
endif
|
||||
|
||||
$(eval $(generic-package))
|
||||
@@ -15,7 +15,7 @@ choice
|
||||
prompt "AT91 Bootstrap 3 version"
|
||||
|
||||
config BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION
|
||||
bool "3.8"
|
||||
bool "3.8.6"
|
||||
|
||||
config BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT
|
||||
bool "Custom Git repository"
|
||||
@@ -40,7 +40,7 @@ endif
|
||||
|
||||
config BR2_TARGET_AT91BOOTSTRAP3_VERSION
|
||||
string
|
||||
default "v3.8" if BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION
|
||||
default "v3.8.6" if BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION
|
||||
default BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION \
|
||||
if BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT
|
||||
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 ae7bb3f8e631f5216f05fd4650b37f2e76d88d0b893bd680f4f398f33b8f3470 at91bootstrap3-v3.8.tar.gz
|
||||
sha256 a2e9ec6f42ee3b5a805fe215257b63070b6c498d57c568c46fcb18fd1b38ea7e at91bootstrap3-v3.8.6.tar.gz
|
||||
|
||||
@@ -12,7 +12,7 @@ choice
|
||||
Select the specific Barebox version you want to use
|
||||
|
||||
config BR2_TARGET_BAREBOX_LATEST_VERSION
|
||||
bool "2016.06.0"
|
||||
bool "2017.01.0"
|
||||
|
||||
config BR2_TARGET_BAREBOX_CUSTOM_VERSION
|
||||
bool "Custom version"
|
||||
@@ -40,7 +40,7 @@ endif
|
||||
|
||||
config BR2_TARGET_BAREBOX_VERSION
|
||||
string
|
||||
default "2016.06.0" if BR2_TARGET_BAREBOX_LATEST_VERSION
|
||||
default "2017.01.0" if BR2_TARGET_BAREBOX_LATEST_VERSION
|
||||
default BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION
|
||||
default "custom" if BR2_TARGET_BAREBOX_CUSTOM_TARBALL
|
||||
default BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT
|
||||
|
||||
@@ -67,8 +67,7 @@ config BR2_TARGET_BAREBOX_AUX_CUSTOM_EMBEDDED_ENV_PATH
|
||||
invalid. This option sets the barebox Kconfig option
|
||||
CONFIG_DEFAULT_ENVIRONMENT_PATH to the specified path. This
|
||||
way it is possible to use Buildroot variables like
|
||||
BR2_EXTERNAL, TOPDIR etc. to refer to the custom
|
||||
environment.
|
||||
TOPDIR etc. to refer to the custom environment.
|
||||
|
||||
Depending on your setup, the custom embedded environment
|
||||
will probably be based on either the content of the
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# http://www.barebox.org/download/barebox-2016.06.0.tar.bz2.md5
|
||||
md5 7dac834e637db66e624bf058e9310212 barebox-2016.06.0.tar.bz2
|
||||
# http://www.barebox.org/download/barebox-2017.01.0.tar.bz2.md5
|
||||
md5 d2933437885497b09d69d6e6f4beeffc barebox-2017.01.0.tar.bz2
|
||||
|
||||
# Locally calculated
|
||||
sha256 a214167c55bf691f686397379e8b9557a1d597e56b7c1bf9607b478a1c4c597e barebox-2016.06.0.tar.bz2
|
||||
sha256 ca4cc06bdc7183e3fcb4bed300f1e820df1e022a7b86fdcf64205ddb6a103567 barebox-2017.01.0.tar.bz2
|
||||
|
||||
@@ -73,8 +73,7 @@ config BR2_TARGET_BAREBOX_CUSTOM_EMBEDDED_ENV_PATH
|
||||
invalid. This option sets the barebox Kconfig option
|
||||
CONFIG_DEFAULT_ENVIRONMENT_PATH to the specified path. This
|
||||
way it is possible to use Buildroot variables like
|
||||
BR2_EXTERNAL, TOPDIR etc. to refer to the custom
|
||||
environment.
|
||||
TOPDIR etc. to refer to the custom environment.
|
||||
|
||||
Depending on your setup, the custom embedded environment
|
||||
will probably be based on either the content of the
|
||||
|
||||
@@ -11,7 +11,7 @@ config BR2_TARGET_BOOT_WRAPPER_AARCH64
|
||||
possible to start an Aarch64 kernel inside the available
|
||||
software simulators for the Aarch64 architecture.
|
||||
|
||||
git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/boot-wrapper-aarch64.git
|
||||
git://git.kernel.org/pub/scm/linux/kernel/git/mark/boot-wrapper-aarch64.git
|
||||
|
||||
if BR2_TARGET_BOOT_WRAPPER_AARCH64
|
||||
|
||||
@@ -32,4 +32,10 @@ config BR2_TARGET_BOOT_WRAPPER_AARCH64_BOOTARGS
|
||||
Kernel bootargs to embed inside the image generated by the
|
||||
boot wrapper.
|
||||
|
||||
config BR2_TARGET_BOOT_WRAPPER_AARCH64_PSCI
|
||||
bool "Boot secondary SMP cores using PSCI"
|
||||
help
|
||||
Boot secondary SMP cores using PSCI firmware calls. If
|
||||
disabled, the spin-table method is used instead.
|
||||
|
||||
endif
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
################################################################################
|
||||
|
||||
BOOT_WRAPPER_AARCH64_VERSION = 4266507a84f8c06452109d38e0350d4759740694
|
||||
BOOT_WRAPPER_AARCH64_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/boot-wrapper-aarch64.git
|
||||
BOOT_WRAPPER_AARCH64_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/mark/boot-wrapper-aarch64.git
|
||||
BOOT_WRAPPER_AARCH64_LICENSE = BSD3c
|
||||
BOOT_WRAPPER_AARCH64_LICENSE_FILES = LICENSE.txt
|
||||
BOOT_WRAPPER_AARCH64_DEPENDENCIES = linux
|
||||
@@ -30,6 +30,12 @@ BOOT_WRAPPER_AARCH64_CONF_OPTS = \
|
||||
--with-kernel-dir=$(LINUX_DIR) \
|
||||
--with-cmdline=$(BR2_TARGET_BOOT_WRAPPER_AARCH64_BOOTARGS)
|
||||
|
||||
ifeq ($(BR2_TARGET_BOOT_WRAPPER_AARCH64_PSCI),y)
|
||||
BOOT_WRAPPER_AARCH64_CONF_OPTS += --enable-psci
|
||||
else
|
||||
BOOT_WRAPPER_AARCH64_CONF_OPTS += --disable-psci
|
||||
endif
|
||||
|
||||
# We need to convince the configure script that the Linux kernel tree
|
||||
# exists, as well as the DTB and the kernel Image. Even though those
|
||||
# are available on the build machine, the configure script uses
|
||||
|
||||
@@ -4,7 +4,6 @@ config BR2_TARGET_GUMMIBOOT
|
||||
select BR2_PACKAGE_GNU_EFI
|
||||
select BR2_PACKAGE_UTIL_LINUX
|
||||
select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
|
||||
depends on BR2_USE_WCHAR # util-linux
|
||||
help
|
||||
gummiboot is a simple UEFI boot manager which executes
|
||||
configured EFI images. The default entry is selected by a
|
||||
@@ -22,6 +21,3 @@ config BR2_TARGET_GUMMIBOOT
|
||||
files will be located in /loader/ inside the EFI partition.
|
||||
|
||||
http://freedesktop.org/wiki/Software/gummiboot/
|
||||
|
||||
comment "gummiboot needs a toolchain w/ wchar"
|
||||
depends on !BR2_USE_WCHAR
|
||||
|
||||
22
bsp/buildroot/boot/syslinux/0002-disable-pie.patch
Normal file
22
bsp/buildroot/boot/syslinux/0002-disable-pie.patch
Normal file
@@ -0,0 +1,22 @@
|
||||
Description: Disable PIE to avoid FTBFS on amd64
|
||||
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1579023
|
||||
Author: Graham Inggs <ginggs@ubuntu.com>
|
||||
Last-Update: 2016-05-06
|
||||
|
||||
gcc 6.x has PIE support enabled by default, which causes a build issue
|
||||
with syslinux. This patch disables PIE support in the relevant
|
||||
syslinux Makefile.
|
||||
|
||||
Signed-off-by: Ryan Coe <bluemrp9@gmail.com>
|
||||
|
||||
--- a/gpxe/src/Makefile
|
||||
+++ b/gpxe/src/Makefile
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
|
||||
CLEANUP :=
|
||||
-CFLAGS :=
|
||||
+CFLAGS := -fno-PIE
|
||||
ASFLAGS :=
|
||||
LDFLAGS :=
|
||||
MAKEDEPS := Makefile
|
||||
@@ -0,0 +1,39 @@
|
||||
From 7c8d81605302e7d7fdd3e7d8eb69302bddc64a2c Mon Sep 17 00:00:00 2001
|
||||
From: Alexey Brodkin <abrodkin@synopsys.com>
|
||||
Date: Fri, 16 Sep 2016 12:12:26 +0300
|
||||
Subject: [PATCH] arc: Use -mcpu=XXX instead of obsolete -marcXXX
|
||||
|
||||
With newer ARC tools old way of CPU specification gets obsolete,
|
||||
so we're switching to newer and more common way of setting "-mcpu".
|
||||
|
||||
Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
|
||||
---
|
||||
arch/arc/config.mk | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/arch/arc/config.mk b/arch/arc/config.mk
|
||||
index 7c974f0..13676bd 100644
|
||||
--- a/arch/arc/config.mk
|
||||
+++ b/arch/arc/config.mk
|
||||
@@ -31,15 +31,15 @@ CONFIG_MMU = 1
|
||||
endif
|
||||
|
||||
ifdef CONFIG_CPU_ARC750D
|
||||
-PLATFORM_CPPFLAGS += -marc700
|
||||
+PLATFORM_CPPFLAGS += -mcpu=arc700
|
||||
endif
|
||||
|
||||
ifdef CONFIG_CPU_ARC770D
|
||||
-PLATFORM_CPPFLAGS += -marc700 -mlock -mswape
|
||||
+PLATFORM_CPPFLAGS += -mcpu=arc700 -mlock -mswape
|
||||
endif
|
||||
|
||||
ifdef CONFIG_CPU_ARCEM6
|
||||
-PLATFORM_CPPFLAGS += -marcem
|
||||
+PLATFORM_CPPFLAGS += -mcpu=arcem
|
||||
endif
|
||||
|
||||
ifdef CONFIG_CPU_ARCHS34
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
From 7c8d81605302e7d7fdd3e7d8eb69302bddc64a2c Mon Sep 17 00:00:00 2001
|
||||
From: Alexey Brodkin <abrodkin@synopsys.com>
|
||||
Date: Fri, 16 Sep 2016 12:12:26 +0300
|
||||
Subject: [PATCH] arc: Use -mcpu=XXX instead of obsolete -marcXXX
|
||||
|
||||
With newer ARC tools old way of CPU specification gets obsolete,
|
||||
so we're switching to newer and more common way of setting "-mcpu".
|
||||
|
||||
Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
|
||||
---
|
||||
arch/arc/config.mk | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/arch/arc/config.mk b/arch/arc/config.mk
|
||||
index 7c974f0..13676bd 100644
|
||||
--- a/arch/arc/config.mk
|
||||
+++ b/arch/arc/config.mk
|
||||
@@ -31,15 +31,15 @@ CONFIG_MMU = 1
|
||||
endif
|
||||
|
||||
ifdef CONFIG_CPU_ARC750D
|
||||
-PLATFORM_CPPFLAGS += -marc700
|
||||
+PLATFORM_CPPFLAGS += -mcpu=arc700
|
||||
endif
|
||||
|
||||
ifdef CONFIG_CPU_ARC770D
|
||||
-PLATFORM_CPPFLAGS += -marc700 -mlock -mswape
|
||||
+PLATFORM_CPPFLAGS += -mcpu=arc700 -mlock -mswape
|
||||
endif
|
||||
|
||||
ifdef CONFIG_CPU_ARCEM6
|
||||
-PLATFORM_CPPFLAGS += -marcem
|
||||
+PLATFORM_CPPFLAGS += -mcpu=arcem
|
||||
endif
|
||||
|
||||
ifdef CONFIG_CPU_ARCHS34
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -38,7 +38,7 @@ choice
|
||||
Select the specific U-Boot version you want to use
|
||||
|
||||
config BR2_TARGET_UBOOT_LATEST_VERSION
|
||||
bool "2016.07"
|
||||
bool "2017.01"
|
||||
|
||||
config BR2_TARGET_UBOOT_CUSTOM_VERSION
|
||||
bool "Custom version"
|
||||
@@ -86,7 +86,7 @@ endif
|
||||
|
||||
config BR2_TARGET_UBOOT_VERSION
|
||||
string
|
||||
default "2016.07" if BR2_TARGET_UBOOT_LATEST_VERSION
|
||||
default "2017.01" if BR2_TARGET_UBOOT_LATEST_VERSION
|
||||
default BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE \
|
||||
if BR2_TARGET_UBOOT_CUSTOM_VERSION
|
||||
default "custom" if BR2_TARGET_UBOOT_CUSTOM_TARBALL
|
||||
@@ -95,6 +95,7 @@ config BR2_TARGET_UBOOT_VERSION
|
||||
|
||||
config BR2_TARGET_UBOOT_PATCH
|
||||
string "Custom U-Boot patches"
|
||||
default BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR if BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR != "" # legacy
|
||||
help
|
||||
A space-separated list of patches to apply to U-Boot.
|
||||
Each patch can be described as an URL, a local file path,
|
||||
@@ -137,9 +138,15 @@ config BR2_TARGET_UBOOT_NEEDS_DTC
|
||||
Select this option if your U-Boot board configuration
|
||||
requires the Device Tree compiler to be available.
|
||||
|
||||
choice
|
||||
prompt "U-Boot binary format"
|
||||
default BR2_TARGET_UBOOT_FORMAT_BIN
|
||||
config BR2_TARGET_UBOOT_NEEDS_OPENSSL
|
||||
bool "U-Boot needs OpenSSL"
|
||||
help
|
||||
Select this option if your U-Boot board configuration
|
||||
requires OpenSSL to be available on the host. This is
|
||||
typically the case when the board configuration has
|
||||
CONFIG_FIT_SIGNATURE enabled.
|
||||
|
||||
menu "U-Boot binary format"
|
||||
|
||||
config BR2_TARGET_UBOOT_FORMAT_AIS
|
||||
bool "u-boot.ais"
|
||||
@@ -150,6 +157,7 @@ config BR2_TARGET_UBOOT_FORMAT_AIS
|
||||
|
||||
config BR2_TARGET_UBOOT_FORMAT_BIN
|
||||
bool "u-boot.bin"
|
||||
default y
|
||||
|
||||
config BR2_TARGET_UBOOT_FORMAT_DTB_IMG
|
||||
bool "u-boot-dtb.img"
|
||||
@@ -252,19 +260,21 @@ config BR2_TARGET_UBOOT_FORMAT_CUSTOM
|
||||
help
|
||||
On some platforms, the standard U-Boot binary is not called
|
||||
u-boot.bin, but u-boot<something>.bin. If this is your case,
|
||||
you should select this option and specify the correct name
|
||||
you should select this option and specify the correct name(s)
|
||||
in BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME.
|
||||
|
||||
endchoice
|
||||
|
||||
config BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME
|
||||
string "U-Boot binary format: custom name"
|
||||
string "U-Boot binary format: custom names"
|
||||
depends on BR2_TARGET_UBOOT_FORMAT_CUSTOM
|
||||
help
|
||||
Specify the correct name of the output binary created by
|
||||
U-Boot, if it is not one of the default names. For example:
|
||||
In case the U-Boot binary for the target platform is not among
|
||||
the default names, one or more custom names can be listed here.
|
||||
Use space to separate multiple names.
|
||||
Example:
|
||||
u-boot_magic.bin
|
||||
|
||||
endmenu
|
||||
|
||||
config BR2_TARGET_UBOOT_OMAP_IFT
|
||||
depends on BR2_TARGET_UBOOT_FORMAT_BIN
|
||||
depends on BR2_arm || BR2_armeb
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# Locally computed:
|
||||
sha256 974fb7225c0af6a721307631f66b81e20dbda82a4d7cc32aba2a625727231253 u-boot-2016.07.tar.bz2
|
||||
sha256 6c425175f93a4bcf2ec9faf5658ef279633dbd7856a293d95bd1ff516528ecf2 u-boot-2017.01.tar.bz2
|
||||
|
||||
@@ -36,48 +36,81 @@ BR_NO_CHECK_HASH_FOR += $(UBOOT_SOURCE)
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TARGET_UBOOT_FORMAT_BIN),y)
|
||||
UBOOT_BINS += u-boot.bin
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TARGET_UBOOT_FORMAT_ELF),y)
|
||||
UBOOT_BIN = u-boot
|
||||
UBOOT_BINS += u-boot
|
||||
# To make elf usable for debuging on ARC use special target
|
||||
ifeq ($(BR2_arc),y)
|
||||
UBOOT_MAKE_TARGET = mdbtrick
|
||||
UBOOT_MAKE_TARGET += mdbtrick
|
||||
endif
|
||||
else ifeq ($(BR2_TARGET_UBOOT_FORMAT_KWB),y)
|
||||
UBOOT_BIN = u-boot.kwb
|
||||
UBOOT_MAKE_TARGET = $(UBOOT_BIN)
|
||||
else ifeq ($(BR2_TARGET_UBOOT_FORMAT_AIS),y)
|
||||
UBOOT_BIN = u-boot.ais
|
||||
UBOOT_MAKE_TARGET = $(UBOOT_BIN)
|
||||
else ifeq ($(BR2_TARGET_UBOOT_FORMAT_LDR),y)
|
||||
UBOOT_BIN = u-boot.ldr
|
||||
else ifeq ($(BR2_TARGET_UBOOT_FORMAT_NAND_BIN),y)
|
||||
UBOOT_BIN = u-boot-nand.bin
|
||||
else ifeq ($(BR2_TARGET_UBOOT_FORMAT_DTB_IMG),y)
|
||||
UBOOT_BIN = u-boot-dtb.img
|
||||
UBOOT_MAKE_TARGET = all $(UBOOT_BIN)
|
||||
else ifeq ($(BR2_TARGET_UBOOT_FORMAT_IMG),y)
|
||||
UBOOT_BIN = u-boot.img
|
||||
else ifeq ($(BR2_TARGET_UBOOT_FORMAT_IMX),y)
|
||||
UBOOT_BIN = u-boot.imx
|
||||
else ifeq ($(BR2_TARGET_UBOOT_FORMAT_SB),y)
|
||||
UBOOT_BIN = u-boot.sb
|
||||
UBOOT_MAKE_TARGET = $(UBOOT_BIN)
|
||||
endif
|
||||
|
||||
# Call 'make all' unconditionally
|
||||
UBOOT_MAKE_TARGET += all
|
||||
|
||||
ifeq ($(BR2_TARGET_UBOOT_FORMAT_KWB),y)
|
||||
UBOOT_BINS += u-boot.kwb
|
||||
UBOOT_MAKE_TARGET += u-boot.kwb
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TARGET_UBOOT_FORMAT_AIS),y)
|
||||
UBOOT_BINS += u-boot.ais
|
||||
UBOOT_MAKE_TARGET += u-boot.ais
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TARGET_UBOOT_FORMAT_LDR),y)
|
||||
UBOOT_BINS += u-boot.ldr
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TARGET_UBOOT_FORMAT_NAND_BIN),y)
|
||||
UBOOT_BINS += u-boot-nand.bin
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TARGET_UBOOT_FORMAT_DTB_IMG),y)
|
||||
UBOOT_BINS += u-boot-dtb.img
|
||||
UBOOT_MAKE_TARGET += u-boot-dtb.img
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TARGET_UBOOT_FORMAT_IMG),y)
|
||||
UBOOT_BINS += u-boot.img
|
||||
UBOOT_MAKE_TARGET += u-boot.img
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TARGET_UBOOT_FORMAT_IMX),y)
|
||||
UBOOT_BINS += u-boot.imx
|
||||
UBOOT_MAKE_TARGET += u-boot.imx
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TARGET_UBOOT_FORMAT_SB),y)
|
||||
UBOOT_BINS += u-boot.sb
|
||||
UBOOT_MAKE_TARGET += u-boot.sb
|
||||
# mxsimage needs OpenSSL
|
||||
UBOOT_DEPENDENCIES += host-elftosb host-openssl
|
||||
else ifeq ($(BR2_TARGET_UBOOT_FORMAT_SD),y)
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TARGET_UBOOT_FORMAT_SD),y)
|
||||
# BootStream (.sb) is generated by U-Boot, we convert it to SD format
|
||||
UBOOT_BIN = u-boot.sd
|
||||
UBOOT_MAKE_TARGET = u-boot.sb
|
||||
UBOOT_BINS += u-boot.sd
|
||||
UBOOT_MAKE_TARGET += u-boot.sb
|
||||
UBOOT_DEPENDENCIES += host-elftosb host-openssl
|
||||
else ifeq ($(BR2_TARGET_UBOOT_FORMAT_NAND),y)
|
||||
UBOOT_BIN = u-boot.nand
|
||||
UBOOT_MAKE_TARGET = u-boot.sb
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TARGET_UBOOT_FORMAT_NAND),y)
|
||||
UBOOT_BINS += u-boot.nand
|
||||
UBOOT_MAKE_TARGET += u-boot.sb
|
||||
UBOOT_DEPENDENCIES += host-elftosb host-openssl
|
||||
else ifeq ($(BR2_TARGET_UBOOT_FORMAT_CUSTOM),y)
|
||||
UBOOT_BIN = $(call qstrip,$(BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME))
|
||||
else
|
||||
UBOOT_BIN = u-boot.bin
|
||||
UBOOT_BIN_IFT = $(UBOOT_BIN).ift
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TARGET_UBOOT_FORMAT_CUSTOM),y)
|
||||
UBOOT_BINS += $(call qstrip,$(BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME))
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TARGET_UBOOT_OMAP_IFT),y)
|
||||
UBOOT_BINS += u-boot.bin
|
||||
UBOOT_BIN_IFT = u-boot.bin.ift
|
||||
endif
|
||||
|
||||
# The kernel calls AArch64 'arm64', but U-Boot calls it just 'arm', so
|
||||
@@ -100,6 +133,10 @@ ifeq ($(BR2_TARGET_UBOOT_NEEDS_DTC),y)
|
||||
UBOOT_DEPENDENCIES += host-dtc
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSSL),y)
|
||||
UBOOT_DEPENDENCIES += host-openssl
|
||||
endif
|
||||
|
||||
# prior to u-boot 2013.10 the license info was in COPYING. Copy it so
|
||||
# legal-info finds it
|
||||
define UBOOT_COPY_OLD_LICENSE_FILE
|
||||
@@ -144,6 +181,12 @@ endif # BR2_TARGET_UBOOT_USE_DEFCONFIG
|
||||
|
||||
UBOOT_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig
|
||||
UBOOT_KCONFIG_OPTS = $(UBOOT_MAKE_OPTS)
|
||||
define UBOOT_HELP_CMDS
|
||||
@echo ' uboot-menuconfig - Run U-Boot menuconfig'
|
||||
@echo ' uboot-savedefconfig - Run U-Boot savedefconfig'
|
||||
@echo ' uboot-update-defconfig - Save the U-Boot configuration to the path specified'
|
||||
@echo ' by BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE'
|
||||
endef
|
||||
endif # BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY
|
||||
|
||||
define UBOOT_BUILD_CMDS
|
||||
@@ -166,9 +209,11 @@ define UBOOT_BUILD_OMAP_IFT
|
||||
endef
|
||||
|
||||
define UBOOT_INSTALL_IMAGES_CMDS
|
||||
cp -dpf $(@D)/$(UBOOT_BIN) $(BINARIES_DIR)/
|
||||
$(foreach f,$(UBOOT_BINS), \
|
||||
cp -dpf $(@D)/$(f) $(BINARIES_DIR)/
|
||||
)
|
||||
$(if $(BR2_TARGET_UBOOT_FORMAT_NAND),
|
||||
cp -dpf $(@D)/$(UBOOT_MAKE_TARGET) $(BINARIES_DIR))
|
||||
cp -dpf $(@D)/u-boot.sb $(BINARIES_DIR))
|
||||
$(if $(BR2_TARGET_UBOOT_SPL),
|
||||
$(foreach f,$(call qstrip,$(BR2_TARGET_UBOOT_SPL_NAME)), \
|
||||
cp -dpf $(@D)/$(f) $(BINARIES_DIR)/
|
||||
@@ -177,7 +222,8 @@ define UBOOT_INSTALL_IMAGES_CMDS
|
||||
$(if $(BR2_TARGET_UBOOT_ENVIMAGE),
|
||||
cat $(call qstrip,$(BR2_TARGET_UBOOT_ENVIMAGE_SOURCE)) | \
|
||||
$(HOST_DIR)/usr/bin/mkenvimage -s $(BR2_TARGET_UBOOT_ENVIMAGE_SIZE) \
|
||||
-p 0 $(if $(BR2_TARGET_UBOOT_ENVIMAGE_REDUNDANT),-r) \
|
||||
$(if $(BR2_TARGET_UBOOT_ENVIMAGE_REDUNDANT),-r) \
|
||||
$(if $(filter BIG,$(BR2_ENDIAN)),-b) \
|
||||
-o $(BINARIES_DIR)/uboot-env.bin -)
|
||||
endef
|
||||
|
||||
|
||||
6
bsp/buildroot/boot/vexpress-firmware/Config.in
Normal file
6
bsp/buildroot/boot/vexpress-firmware/Config.in
Normal file
@@ -0,0 +1,6 @@
|
||||
config BR2_TARGET_VEXPRESS_FIRMWARE
|
||||
bool "vexpress-firmware"
|
||||
depends on BR2_aarch64
|
||||
help
|
||||
Versatile Express firmware from ARM, with Linaro mods last
|
||||
change.
|
||||
@@ -0,0 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 def599c86ab3606f7f67c0190e9b237fbc0cf934a951ffb1c5fb0c47d8a8f3d2 vexpress-firmware-901f81977c3b367a2e0bf3d6444be302822d97a3.tar.gz
|
||||
20
bsp/buildroot/boot/vexpress-firmware/vexpress-firmware.mk
Normal file
20
bsp/buildroot/boot/vexpress-firmware/vexpress-firmware.mk
Normal file
@@ -0,0 +1,20 @@
|
||||
################################################################################
|
||||
#
|
||||
# vexpress-firmware
|
||||
#
|
||||
################################################################################
|
||||
|
||||
VEXPRESS_FIRMWARE_VERSION = 901f81977c3b367a2e0bf3d6444be302822d97a3
|
||||
VEXPRESS_FIRMWARE_SITE = https://git.linaro.org/arm/vexpress-firmware.git
|
||||
VEXPRESS_FIRMWARE_SITE_METHOD = git
|
||||
# The only available license files are in PDF and RTF formats, and we
|
||||
# support only plain text.
|
||||
VEXPRESS_FIRMWARE_LICENSE = ARM EULA
|
||||
|
||||
VEXPRESS_FIRMWARE_INSTALL_IMAGES = YES
|
||||
|
||||
define VEXPRESS_FIRMWARE_INSTALL_IMAGES_CMDS
|
||||
$(INSTALL) -D -m 0644 $(@D)/SOFTWARE/bl30.bin $(BINARIES_DIR)/scp-fw.bin
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
Reference in New Issue
Block a user