diff options
| author | AKASHI Takahiro <takahiro.akashi@linaro.org> | 2019-07-03 10:44:40 +0900 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-07-18 11:31:28 -0400 |
| commit | 70a64a070e79b657dcb4903299ccad0f5fff8267 (patch) | |
| tree | 5bbfdbf69425f7e1e1117dabe2b3d673979a9192 /include | |
| parent | 6324d50679b4eae7f611a41a1885ef395ac7b1b9 (diff) | |
| download | u-boot-70a64a070e79b657dcb4903299ccad0f5fff8267.zip u-boot-70a64a070e79b657dcb4903299ccad0f5fff8267.tar.gz u-boot-70a64a070e79b657dcb4903299ccad0f5fff8267.tar.bz2 | |
arm: qemu: fix failure in flash initialization if booting from TF-A
If U-Boot is loaded and started from TF-A (you need to change
SYS_TEXT_BASE to 0x60000000), it will hang up at flash initialization.
If secure mode is off (default, or -machine virt,secure=off) at qemu,
it will provide dtb with two flash memory banks:
flash@0 {
bank-width = <0x4>;
reg = <0x0 0x0 0x0 0x4000000 0x0 0x4000000 0x0 0x4000000>;
compatible = "cfi-flash";
};
If secure mode is on, on the other hand, qemu provides dtb with 1 bank:
flash@0 {
bank-width = <0x4>;
reg = <0x0 0x4000000 0x0 0x4000000>;
compatible = "cfi-flash";
};
As a result, flash_init()/flash_get_size() will eventually fail.
With this patch applied, relevant CONFIG values are modified.
Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
Tested-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/qemu-arm.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/configs/qemu-arm.h b/include/configs/qemu-arm.h index 65fdb1e..35e3c5a 100644 --- a/include/configs/qemu-arm.h +++ b/include/configs/qemu-arm.h @@ -46,8 +46,13 @@ #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_SECT 256 /* Sector: 256K, Bank: 64M */ #endif /* __CONFIG_H */ |