aboutsummaryrefslogtreecommitdiff
path: root/boot/uboot/Config.in
diff options
context:
space:
mode:
Diffstat (limited to 'boot/uboot/Config.in')
-rw-r--r--boot/uboot/Config.in131
1 files changed, 43 insertions, 88 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