Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-09-22 23:52:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '2021-10-18-OF_xxx-cleanup'

Browse source 
- Clean things up and rework such that we can drop OF_PRIOR_STAGE
This commit is contained in:
Tom Rini 2021-10-19 09:07:07 -04:00
commit 9c79815c5c
23 changed files with 44 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/arm/Kconfig
View file

@ -636,7 +636,6 @@ config ARCH_BCMSTB
select DM
select GPIO_EXTRA_HEADER
select OF_CONTROL
select OF_PRIOR_STAGE
imply CMD_DM
help
This enables support for Broadcom ARM-based set-top box

3
arch/riscv/cpu/cpu.c
View file

@ -17,9 +17,6 @@
* The variables here must be stored in the data section since they are used
* before the bss section is available.
*/
#ifdef CONFIG_OF_PRIOR_STAGE
phys_addr_t prior_stage_fdt_address __section(".data");
#endif
#ifndef CONFIG_XIP
u32 hart_lottery __section(".data") = 0;

5
arch/riscv/cpu/start.S
View file

@ -142,11 +142,6 @@ call_harts_early_init:
bnez tp, secondary_hart_loop
#endif
#ifdef CONFIG_OF_PRIOR_STAGE
la t0, prior_stage_fdt_address
SREG s1, 0(t0)
#endif
jal board_init_f_init_reserve
SREG s1, GD_FIRMWARE_FDT_ADDR(gp)

6
arch/riscv/dts/binman.dtsi
View file

@ -48,7 +48,7 @@
};
};
#ifndef CONFIG_OF_PRIOR_STAGE
#ifndef CONFIG_OF_BOARD
@fdt-SEQ {
description = "NAME";
type = "flat_dt";
@ -60,7 +60,7 @@
configurations {
default = "conf-1";
#ifndef CONFIG_OF_PRIOR_STAGE
#ifndef CONFIG_OF_BOARD
@conf-SEQ {
#else
conf-1 {
@ -68,7 +68,7 @@
description = "NAME";
firmware = "opensbi";
loadables = "uboot";
#ifndef CONFIG_OF_PRIOR_STAGE
#ifndef CONFIG_OF_BOARD
fdt = "fdt-SEQ";
#endif
};

7
board/AndesTech/ax25-ae350/ax25-ae350.c
View file

@ -21,7 +21,6 @@
DECLARE_GLOBAL_DATA_PTR;
extern phys_addr_t prior_stage_fdt_address;
/*
* Miscellaneous platform dependent initializations
*/
@ -57,7 +56,13 @@ ulong board_flash_get_legacy(ulong base, int banknum, flash_info_t *info)
void *board_fdt_blob_setup(void)
{
#if CONFIG_IS_ENABLED(OF_BOARD)
return (void *)(ulong)gd->arch.firmware_fdt_addr;
#elif CONFIG_IS_ENABLED(OF_SEPARATE)
return (void *)CONFIG_SYS_FDT_BASE;
#else
return NULL;
#endif
}
int smc_init(void)

6
board/broadcom/bcmstb/bcmstb.c
View file

@ -130,3 +130,9 @@ int board_late_init(void)
return 0;
}
void *board_fdt_blob_setup(void)
{
/* Stored the DTB address there during our init */
return (void *)prior_stage_fdt_address;
}

8
board/emulation/qemu-riscv/qemu-riscv.c
View file

@ -14,6 +14,8 @@
#include <virtio_types.h>
#include <virtio.h>
DECLARE_GLOBAL_DATA_PTR;
int board_init(void)
{
/*
@ -69,3 +71,9 @@ int board_fit_config_name_match(const char *name)
return 0;
}
#endif
void *board_fdt_blob_setup(void)
{
/* Stored the DTB address there during our init */
return (void *)(ulong)gd->arch.firmware_fdt_addr;
}

2
configs/ae350_rv32_defconfig
View file

@ -17,7 +17,7 @@ CONFIG_CMD_SF_TEST=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_BOOTP_PREFER_SERVERIP=y
CONFIG_CMD_CACHE=y
CONFIG_OF_PRIOR_STAGE=y
CONFIG_OF_BOARD=y
CONFIG_ENV_OVERWRITE=y
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_SYS_RELOC_GD_ENV_ADDR=y

2
configs/ae350_rv32_spl_defconfig
View file

@ -21,7 +21,7 @@ CONFIG_CMD_SF_TEST=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_BOOTP_PREFER_SERVERIP=y
CONFIG_CMD_CACHE=y
CONFIG_OF_PRIOR_STAGE=y
CONFIG_OF_BOARD=y
CONFIG_ENV_OVERWRITE=y
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_BOOTP_SEND_HOSTNAME=y

2
configs/ae350_rv64_defconfig
View file

@ -18,7 +18,7 @@ CONFIG_CMD_SF_TEST=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_BOOTP_PREFER_SERVERIP=y
CONFIG_CMD_CACHE=y
CONFIG_OF_PRIOR_STAGE=y
CONFIG_OF_BOARD=y
CONFIG_ENV_OVERWRITE=y
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_SYS_RELOC_GD_ENV_ADDR=y

2
configs/ae350_rv64_spl_defconfig
View file

@ -22,7 +22,7 @@ CONFIG_CMD_SF_TEST=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_BOOTP_PREFER_SERVERIP=y
CONFIG_CMD_CACHE=y
CONFIG_OF_PRIOR_STAGE=y
CONFIG_OF_BOARD=y
CONFIG_ENV_OVERWRITE=y
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_BOOTP_SEND_HOSTNAME=y

2
configs/bcm7260_defconfig
View file

@ -25,7 +25,7 @@ CONFIG_CMD_CACHE=y
CONFIG_CMD_EXT2=y
CONFIG_CMD_EXT4=y
CONFIG_CMD_FS_GENERIC=y
CONFIG_OF_PRIOR_STAGE=y
CONFIG_OF_BOARD=y
CONFIG_ENV_OVERWRITE=y
CONFIG_ENV_IS_IN_MMC=y
CONFIG_SYS_REDUNDAND_ENVIRONMENT=y

2
configs/bcm7445_defconfig
View file

@ -26,7 +26,7 @@ CONFIG_CMD_CACHE=y
CONFIG_CMD_EXT2=y
CONFIG_CMD_EXT4=y
CONFIG_CMD_FS_GENERIC=y
CONFIG_OF_PRIOR_STAGE=y
CONFIG_OF_BOARD=y
CONFIG_ENV_OVERWRITE=y
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_SYS_REDUNDAND_ENVIRONMENT=y

2
configs/qemu-riscv32_defconfig
View file

@ -11,6 +11,6 @@ CONFIG_DISPLAY_BOARDINFO=y
CONFIG_CMD_BOOTEFI_SELFTEST=y
CONFIG_CMD_NVEDIT_EFI=y
# CONFIG_CMD_MII is not set
CONFIG_OF_PRIOR_STAGE=y
CONFIG_OF_BOARD=y
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_DM_MTD=y

2
configs/qemu-riscv32_smode_defconfig
View file

@ -12,7 +12,7 @@ CONFIG_DISPLAY_BOARDINFO=y
CONFIG_CMD_BOOTEFI_SELFTEST=y
CONFIG_CMD_NVEDIT_EFI=y
# CONFIG_CMD_MII is not set
CONFIG_OF_PRIOR_STAGE=y
CONFIG_OF_BOARD=y
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_DM_MTD=y
CONFIG_SYSRESET_SBI=y

2
configs/qemu-riscv32_spl_defconfig
View file

@ -14,7 +14,7 @@ CONFIG_DISPLAY_CPUINFO=y
CONFIG_DISPLAY_BOARDINFO=y
CONFIG_CMD_SBI=y
# CONFIG_CMD_MII is not set
CONFIG_OF_PRIOR_STAGE=y
CONFIG_OF_BOARD=y
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_DM_MTD=y
CONFIG_SYSRESET_SBI=y

2
configs/qemu-riscv64_defconfig
View file

@ -12,6 +12,6 @@ CONFIG_DISPLAY_BOARDINFO=y
CONFIG_CMD_BOOTEFI_SELFTEST=y
CONFIG_CMD_NVEDIT_EFI=y
# CONFIG_CMD_MII is not set
CONFIG_OF_PRIOR_STAGE=y
CONFIG_OF_BOARD=y
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_DM_MTD=y

2
configs/qemu-riscv64_smode_defconfig
View file

@ -15,7 +15,7 @@ CONFIG_DISPLAY_BOARDINFO=y
CONFIG_CMD_BOOTEFI_SELFTEST=y
CONFIG_CMD_NVEDIT_EFI=y
# CONFIG_CMD_MII is not set
CONFIG_OF_PRIOR_STAGE=y
CONFIG_OF_BOARD=y
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_DM_MTD=y
CONFIG_SYSRESET_SBI=y

2
configs/qemu-riscv64_spl_defconfig
View file

@ -15,7 +15,7 @@ CONFIG_DISPLAY_CPUINFO=y
CONFIG_DISPLAY_BOARDINFO=y
CONFIG_CMD_SBI=y
# CONFIG_CMD_MII is not set
CONFIG_OF_PRIOR_STAGE=y
CONFIG_OF_BOARD=y
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_DM_MTD=y
CONFIG_SYSRESET_SBI=y

13
dts/Kconfig
View file

@ -22,7 +22,7 @@ config BINMAN
config BINMAN_STANDALONE_FDT
bool
depends on BINMAN
default y if OF_BOARD || OF_PRIOR_STAGE
default y if OF_BOARD
help
This option tells U-Boot build system that a standalone device tree
source is explicitly required when using binman to package U-Boot.
@ -32,7 +32,7 @@ config BINMAN_STANDALONE_FDT
directory for a specific board. Such device tree sources are built for
OF_SEPARATE or OF_EMBED. However for a scenario like the board device
tree blob is not provided in the U-Boot build tree, but fed to U-Boot
in the runtime, e.g.: in the OF_PRIOR_STAGE case that it is passed by
in the runtime, e.g.: in the OF_BOARD case that it is passed by
a prior stage bootloader. For such scenario, a standalone device tree
blob containing binman node to describe how to package U-Boot should
be provided explicitly.
@ -118,7 +118,7 @@ config OF_EMBED
Boards in the mainline U-Boot tree should not use it.
config OF_BOARD
bool "Provided by the board at runtime"
bool "Provided by the board (e.g a previous loader) at runtime"
depends on !SANDBOX
help
If this option is enabled, the device tree will be provided by
@ -133,13 +133,6 @@ config OF_HOSTFILE
This is only useful for Sandbox. Use the -d flag to U-Boot to
specify the file to read.
config OF_PRIOR_STAGE
bool "Prior stage bootloader DTB for DT control"
help
If this option is enabled, the device tree used for DT
control will be read from a device tree binary, at a memory
location passed to U-Boot by the prior stage bootloader.
endchoice
config DEFAULT_DEVICE_TREE

4
include/fdtdec.h
View file

@ -55,10 +55,6 @@ struct bd_info;
#define SPL_BUILD 0
#endif
#ifdef CONFIG_OF_PRIOR_STAGE
extern phys_addr_t prior_stage_fdt_address;
#endif
/*
* Information about a resource. start is the first address of the resource
* and end is the last address (inclusive). The length of the resource will

2
lib/fdtdec.c
View file

@ -1613,8 +1613,6 @@ int fdtdec_setup(void)
puts("Failed to read control FDT\n");
return -1;
}
# elif defined(CONFIG_OF_PRIOR_STAGE)
gd->fdt_blob = (void *)(uintptr_t)prior_stage_fdt_address;
# endif
# ifndef CONFIG_SPL_BUILD
/* Allow the early environment to override the fdt address */

16
tools/binman/binman.rst
View file

@ -232,18 +232,18 @@ You can use other, more specific CONFIG options - see 'Automatic .dtsi
inclusion' below.
Using binman with OF_BOARD or OF_PRIOR_STAGE
Using binman with OF_BOARD
--------------------------------------------
Normally binman is used with a board configured with OF_SEPARATE or OF_EMBED.
This is a typical scenario where a device tree source that contains the binman
node is provided in the arch/<arch>/dts directory for a specific board.
However for a board configured with OF_BOARD or OF_PRIOR_STAGE, no device tree
blob is provided in the U-Boot build phase hence the binman node information
is not available. In order to support such use case, a new Kconfig option
BINMAN_STANDALONE_FDT is introduced, to tell the build system that a standalone
device tree blob containing binman node is explicitly required.
However for a board configured with OF_BOARD, no device tree blob is provided
in the U-Boot build phase hence the binman node information is not available.
In order to support such use case, a new Kconfig option BINMAN_STANDALONE_FDT
is introduced, to tell the build system that a standalone device tree blob
containing binman node is explicitly required.
Note there is a Kconfig option BINMAN_FDT which enables U-Boot run time to
access information about binman entries, stored in the device tree in a binman
@ -252,10 +252,6 @@ For the other OF_CONTROL methods, it's quite possible binman node is not
available as binman is invoked during the build phase, thus this option is not
turned on by default for these OF_CONTROL methods.
See qemu-riscv64_spl_defconfig for an example of how binman is used with
OF_PRIOR_STAGE to generate u-boot.itb image.
Access to binman entry offsets at run time (symbols)
----------------------------------------------------