| Message ID | 20200930163918.24995-5-andre.przywara@arm.com |
|---|---|
| State | Accepted |
| Commit | 3d8d9186c379a9d7504088d901b6cb97eb6598ba |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | qemu-arm64: Allow booting via Trusted Firmware | expand |
On Wed, Sep 30, 2020 at 05:39:16PM +0100, Andre Przywara wrote: > Currently we hard-code the number and initial addresses of QEMU's flash > banks, even though our code is perfectly able to gather the same > information from the DTB provided by QEMU. > This is especially annoying, since we have two slightly different > U-Boot configurations ("bare-metal" vs. loaded via Arm Trusted > Firmware), which need to be selected at build time. > > Drop the two hard coded alternatives, and use > CONFIG_SYS_MAX_FLASH_BANKS_DETECT instead, which relies on the DTB to > figure out the actual flash configuration at runtime. > > Signed-off-by: Andre Przywara <andre.przywara@arm.com> Applied to u-boot/master, thanks!
diff --git a/include/configs/qemu-arm.h b/include/configs/qemu-arm.h index bc8b7c5c123..273fa1a7d7b 100644 --- a/include/configs/qemu-arm.h +++ b/include/configs/qemu-arm.h @@ -45,13 +45,7 @@ #define CONFIG_SYS_CBSIZE 512 #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE -#ifdef CONFIG_TFABOOT -#define CONFIG_SYS_FLASH_BASE 0x4000000 -#define CONFIG_SYS_MAX_FLASH_BANKS 1 -#else -#define CONFIG_SYS_FLASH_BASE 0x0 -#define CONFIG_SYS_MAX_FLASH_BANKS 2 -#endif +#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT 2 #define CONFIG_SYS_MAX_FLASH_SECT 256 /* Sector: 256K, Bank: 64M */ #define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS
Currently we hard-code the number and initial addresses of QEMU's flash banks, even though our code is perfectly able to gather the same information from the DTB provided by QEMU. This is especially annoying, since we have two slightly different U-Boot configurations ("bare-metal" vs. loaded via Arm Trusted Firmware), which need to be selected at build time. Drop the two hard coded alternatives, and use CONFIG_SYS_MAX_FLASH_BANKS_DETECT instead, which relies on the DTB to figure out the actual flash configuration at runtime. Signed-off-by: Andre Przywara <andre.przywara@arm.com> --- include/configs/qemu-arm.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)