aboutsummaryrefslogtreecommitdiff
path: root/boot/uboot
diff options
context:
space:
mode:
Diffstat (limited to 'boot/uboot')
-rw-r--r--boot/uboot/Config.in131
-rw-r--r--boot/uboot/uboot.hash2
-rw-r--r--boot/uboot/uboot.mk56
3 files changed, 59 insertions, 130 deletions
diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index a87a642581..d43c85cce7 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -41,7 +41,7 @@ choice
Select the specific U-Boot version you want to use
config BR2_TARGET_UBOOT_LATEST_VERSION
- bool "2020.07"
+ bool "2021.01"
config BR2_TARGET_UBOOT_CUSTOM_VERSION
bool "Custom version"
@@ -85,7 +85,7 @@ endif
config BR2_TARGET_UBOOT_VERSION
string
- default "2020.07" if BR2_TARGET_UBOOT_LATEST_VERSION
+ default "2021.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
@@ -229,6 +229,16 @@ config BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF
endchoice
+config BR2_TARGET_UBOOT_NEEDS_OPENSBI
+ bool "U-Boot needs OpenSBI"
+ depends on BR2_TARGET_OPENSBI
+ help
+ Some RISC-V platforms (such as SiFive HiFive Unleashed)
+ encapsulate the OpenSBI firmware image inside U-Boot.
+ This option makes sure OpenSBI gets built prior to U-Boot,
+ and that the OpenSBI variable pointing to OpenSBI binary,
+ is passed during the Buildroot build.
+
menu "U-Boot binary format"
config BR2_TARGET_UBOOT_FORMAT_AIS
@@ -245,47 +255,31 @@ config BR2_TARGET_UBOOT_FORMAT_BIN
config BR2_TARGET_UBOOT_FORMAT_DTB_BIN
bool "u-boot-dtb.bin"
-config BR2_TARGET_UBOOT_FORMAT_DTB_IMG
- bool "u-boot-dtb.img"
+config BR2_TARGET_UBOOT_FORMAT_NAND_BIN
+ bool "u-boot-nand.bin"
-config BR2_TARGET_UBOOT_FORMAT_DTB_IMX
- bool "u-boot-dtb.imx"
+config BR2_TARGET_UBOOT_FORMAT_ELF
+ bool "u-boot.elf"
config BR2_TARGET_UBOOT_FORMAT_IMG
bool "u-boot.img"
-config BR2_TARGET_UBOOT_FORMAT_ITB
- bool "u-boot.itb"
+config BR2_TARGET_UBOOT_FORMAT_DTB_IMG
+ bool "u-boot-dtb.img"
config BR2_TARGET_UBOOT_FORMAT_IMX
bool "u-boot.imx"
-config BR2_TARGET_UBOOT_FORMAT_NAND_BIN
- bool "u-boot-nand.bin"
+config BR2_TARGET_UBOOT_FORMAT_DTB_IMX
+ bool "u-boot-dtb.imx"
+
+config BR2_TARGET_UBOOT_FORMAT_ITB
+ bool "u-boot.itb"
config BR2_TARGET_UBOOT_FORMAT_KWB
bool "u-boot.kwb (Marvell)"
depends on BR2_arm
-config BR2_TARGET_UBOOT_FORMAT_ELF
- bool "u-boot.elf"
-
-config BR2_TARGET_UBOOT_FORMAT_SB
- bool "u-boot.sb (Freescale i.MX28)"
- depends on BR2_arm
-
-config BR2_TARGET_UBOOT_FORMAT_SD
- bool "u-boot.sd (Freescale i.MX28)"
- depends on BR2_arm
- help
- This is Freescale i.MX28 SB format, with a header for booting
- from an SD card.
-
- U-Boot includes an mxsboot tool to generate this format,
- starting from 2011.12.
-
- See doc/README.mxs (or doc/README.mx28_common before 2013.07)
-
config BR2_TARGET_UBOOT_FORMAT_NAND
bool "u-boot.nand (Freescale i.MX28)"
depends on BR2_arm
@@ -343,6 +337,26 @@ config BR2_TARGET_UBOOT_FORMAT_NAND_ERASE_SIZE
endif
+config BR2_TARGET_UBOOT_FORMAT_SB
+ bool "u-boot.sb (Freescale i.MX28)"
+ depends on BR2_arm
+
+config BR2_TARGET_UBOOT_FORMAT_SD
+ bool "u-boot.sd (Freescale i.MX28)"
+ depends on BR2_arm
+ help
+ This is Freescale i.MX28 SB format, with a header for booting
+ from an SD card.
+
+ U-Boot includes an mxsboot tool to generate this format,
+ starting from 2011.12.
+
+ See doc/README.mxs (or doc/README.mx28_common before 2013.07)
+
+config BR2_TARGET_UBOOT_FORMAT_STM32
+ bool "u-boot.stm32"
+ depends on BR2_arm
+
config BR2_TARGET_UBOOT_FORMAT_CUSTOM
bool "Custom (specify below)"
help
@@ -533,65 +547,6 @@ config BR2_TARGET_UBOOT_ALTERA_SOCFPGA_IMAGE_CRC
In either case the resulting file will be given a .crc
extension.
-menuconfig BR2_TARGET_UBOOT_ENVIMAGE
- bool "Environment image"
- help
- Generate a valid binary environment image from a text file
- describing the key=value pairs of the environment.
-
- The environment image will be called uboot-env.bin.
-
-if BR2_TARGET_UBOOT_ENVIMAGE
-
-config BR2_TARGET_UBOOT_ENVIMAGE_SOURCE
- string "Source files for environment"
- help
- Text files describing the environment. Files should have
- lines of the form var=value, one per line. Blank lines and
- lines starting with a # are ignored.
-
- Multiple source files are concatenated in the order listed.
-
- Leave empty to generate image from compiled-in env.
-
-config BR2_TARGET_UBOOT_ENVIMAGE_SIZE
- string "Size of environment"
- help
- Size of envronment, can be prefixed with 0x for hexadecimal
- values.
-
-config BR2_TARGET_UBOOT_ENVIMAGE_REDUNDANT
- bool "Environment has two copies"
- help
- Some platforms define in their U-Boot configuration that the
- U-Boot environment should be duplicated in two locations (for
- extra safety). Check your U-Boot configuration for the
- CONFIG_ENV_ADDR_REDUND and CONFIG_ENV_SIZE_REDUND settings to
- see if this is the case for your platform.
-
- If it is the case, then you should enable this option to
- ensure that the U-Boot environment image generated by
- Buildroot is compatible with the "redundant environment"
- mechanism of U-Boot.
-
-endif # BR2_TARGET_UBOOT_ENVIMAGE
-
-config BR2_TARGET_UBOOT_BOOT_SCRIPT
- bool "Generate a U-Boot boot script"
- help
- Generate a U-Boot boot script, given a file listing U-Boot
- commands to be executed at boot time. The generated boot
- script will be called 'boot.scr'.
-
-if BR2_TARGET_UBOOT_BOOT_SCRIPT
-
-config BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE
- string "U-Boot boot script source"
- help
- Source file to generate the U-Boot boot script.
-
-endif
-
if BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG
config BR2_TARGET_UBOOT_CUSTOM_DTS_PATH
diff --git a/boot/uboot/uboot.hash b/boot/uboot/uboot.hash
index 4b660dd6d8..7cbd785541 100644
--- a/boot/uboot/uboot.hash
+++ b/boot/uboot/uboot.hash
@@ -1,3 +1,3 @@
# Locally computed:
-sha256 c1f5bf9ee6bb6e648edbf19ce2ca9452f614b08a9f886f1a566aa42e8cf05f6a u-boot-2020.07.tar.bz2
+sha256 b407e1510a74e863b8b5cb42a24625344f0e0c2fc7582d8c866bd899367d0454 u-boot-2021.01.tar.bz2
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Licenses/gpl-2.0.txt
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index 1831466780..bb45980022 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -11,6 +11,8 @@ UBOOT_LICENSE = GPL-2.0+
ifeq ($(BR2_TARGET_UBOOT_LATEST_VERSION),y)
UBOOT_LICENSE_FILES = Licenses/gpl-2.0.txt
endif
+UBOOT_CPE_ID_VENDOR = denx
+UBOOT_CPE_ID_PRODUCT = u-boot
UBOOT_INSTALL_IMAGES = YES
@@ -121,6 +123,11 @@ UBOOT_MAKE_TARGET += u-boot.sb
UBOOT_DEPENDENCIES += host-elftosb host-openssl
endif
+ifeq ($(BR2_TARGET_UBOOT_FORMAT_STM32),y)
+UBOOT_BINS += u-boot.stm32
+UBOOT_MAKE_TARGET += u-boot.stm32
+endif
+
ifeq ($(BR2_TARGET_UBOOT_FORMAT_CUSTOM),y)
UBOOT_BINS += $(call qstrip,$(BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME))
endif
@@ -156,14 +163,19 @@ UBOOT_MAKE_OPTS += BL31=$(BINARIES_DIR)/bl31.bin
endif
endif
+ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSBI),y)
+UBOOT_DEPENDENCIES += opensbi
+UBOOT_MAKE_OPTS += OPENSBI=$(BINARIES_DIR)/fw_dynamic.bin
+endif
+
ifeq ($(BR2_TARGET_UBOOT_NEEDS_DTC),y)
UBOOT_DEPENDENCIES += host-dtc
endif
ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON2),y)
-UBOOT_DEPENDENCIES += host-python
+UBOOT_DEPENDENCIES += host-python host-python-setuptools
else ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON3),y)
-UBOOT_DEPENDENCIES += host-python3
+UBOOT_DEPENDENCIES += host-python3 host-python3-setuptools
endif
ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYLIBFDT),y)
@@ -312,21 +324,6 @@ define UBOOT_BUILD_OMAP_IFT
-c $(call qstrip,$(BR2_TARGET_UBOOT_OMAP_IFT_CONFIG))
endef
-ifneq ($(BR2_TARGET_UBOOT_ENVIMAGE),)
-UBOOT_GENERATE_ENV_FILE = $(call qstrip,$(BR2_TARGET_UBOOT_ENVIMAGE_SOURCE))
-define UBOOT_GENERATE_ENV_IMAGE
- $(if $(UBOOT_GENERATE_ENV_FILE), \
- cat $(UBOOT_GENERATE_ENV_FILE), \
- CROSS_COMPILE="$(TARGET_CROSS)" $(@D)/scripts/get_default_envs.sh $(@D)) \
- >$(@D)/buildroot-env.txt
- $(HOST_DIR)/bin/mkenvimage -s $(BR2_TARGET_UBOOT_ENVIMAGE_SIZE) \
- $(if $(BR2_TARGET_UBOOT_ENVIMAGE_REDUNDANT),-r) \
- $(if $(filter "BIG",$(BR2_ENDIAN)),-b) \
- -o $(BINARIES_DIR)/uboot-env.bin \
- $(@D)/buildroot-env.txt
-endef
-endif
-
define UBOOT_INSTALL_IMAGES_CMDS
$(foreach f,$(UBOOT_BINS), \
cp -dpf $(@D)/$(f) $(BINARIES_DIR)/
@@ -338,11 +335,6 @@ define UBOOT_INSTALL_IMAGES_CMDS
cp -dpf $(@D)/$(f) $(BINARIES_DIR)/
)
)
- $(UBOOT_GENERATE_ENV_IMAGE)
- $(if $(BR2_TARGET_UBOOT_BOOT_SCRIPT),
- $(MKIMAGE) -C none -A $(MKIMAGE_ARCH) -T script \
- -d $(call qstrip,$(BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE)) \
- $(BINARIES_DIR)/boot.scr)
endef
ifeq ($(BR2_TARGET_UBOOT_ZYNQMP),y)
@@ -443,24 +435,6 @@ define UBOOT_KCONFIG_FIXUP_CMDS
$(UBOOT_ZYNQMP_KCONFIG_PSU_INIT)
endef
-ifeq ($(BR2_TARGET_UBOOT_ENVIMAGE),y)
-ifeq ($(BR_BUILDING),y)
-ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_ENVIMAGE_SIZE)),)
-$(error Please provide U-Boot environment size (BR2_TARGET_UBOOT_ENVIMAGE_SIZE setting))
-endif
-endif
-UBOOT_DEPENDENCIES += host-uboot-tools
-endif
-
-ifeq ($(BR2_TARGET_UBOOT_BOOT_SCRIPT),y)
-ifeq ($(BR_BUILDING),y)
-ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE)),)
-$(error Please define a source file for U-Boot boot script (BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE setting))
-endif
-endif
-UBOOT_DEPENDENCIES += host-uboot-tools
-endif
-
ifeq ($(BR2_TARGET_UBOOT)$(BR_BUILDING),yy)
#
@@ -510,7 +484,7 @@ ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL)),)
$(error No custom U-Boot repository URL specified. Check your BR2_TARGET_UBOOT_CUSTOM_REPO_URL setting)
endif # qstrip BR2_TARGET_UBOOT_CUSTOM_CUSTOM_REPO_URL
ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION)),)
-$(error No custom U-Boot repository URL specified. Check your BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION setting)
+$(error No custom U-Boot repository version specified. Check your BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION setting)
endif # qstrip BR2_TARGET_UBOOT_CUSTOM_CUSTOM_REPO_VERSION
endif # BR2_TARGET_UBOOT_CUSTOM_GIT || BR2_TARGET_UBOOT_CUSTOM_HG