diff options
| author | Tom Rini <[email protected]> | 2019-07-18 11:31:37 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2019-07-18 11:31:37 -0400 |
| commit | 0de815356474912ef5bef9a69f0327a5a93bb2c2 (patch) | |
| tree | 92db8fda09396081f58a0c5fb182e72fbc3fdd50 /include/configs | |
| parent | 9a06eb800c1bdc68aa81fcad6d4f404e12dfff33 (diff) | |
| parent | bf88d2b023063a0c46d7617a4f6897d5d561662d (diff) | |
Merge branch '2019-07-17-master-imports'
- Various FS/disk related fixes with security implications.
- Proper fix for the pci_ep test.
- Assorted bugfixes
- Some MediaTek updates.
- 'env erase' support.
Diffstat (limited to 'include/configs')
| -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 65fdb1e9298..35e3c5ad7a8 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 */ |