diff options
| author | Tom Rini <trini@konsulko.com> | 2019-08-31 17:38:02 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-08-31 17:38:02 -0400 |
| commit | 7967290f519ea6d3bb1272601210e8388f2658f7 (patch) | |
| tree | f5ff4b95ab0ee1853f57353dabecde12c45b5844 /arch | |
| parent | 877294b56a52f1cb60bbfa7e4722fcc33451f7b2 (diff) | |
| parent | 47e8ee6b39a47dc0bbde43049dc83dbc48dcdb56 (diff) | |
Merge branch '2019-08-30-master-imports'
- Assorted bug fixes
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/Kconfig | 10 | ||||
| -rw-r--r-- | arch/arm/lib/cache.c | 1 |
2 files changed, 1 insertions, 10 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 37b2585f56..3b0e315061 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1066,16 +1066,6 @@ config TARGET_VEXPRESS64_BASE_FVP select PL01X_SERIAL select SEMIHOSTING -config TARGET_VEXPRESS64_BASE_FVP_DRAM - bool "Support Versatile Express ARMv8a FVP BASE model booting from DRAM" - select ARM64 - select PL01X_SERIAL - help - This target is derived from TARGET_VEXPRESS64_BASE_FVP and over-rides - the default config to allow the user to load the images directly into - DRAM using model parameters rather than by using semi-hosting to load - the files from the host filesystem. - config TARGET_VEXPRESS64_JUNO bool "Support Versatile Express Juno Development Platform" select ARM64 diff --git a/arch/arm/lib/cache.c b/arch/arm/lib/cache.c index 449544d11c..463d283cb7 100644 --- a/arch/arm/lib/cache.c +++ b/arch/arm/lib/cache.c @@ -77,6 +77,7 @@ void noncached_init(void) phys_addr_t start, end; size_t size; + /* If this calculation changes, update board_f.c:reserve_noncached() */ end = ALIGN(mem_malloc_start, MMU_SECTION_SIZE) - MMU_SECTION_SIZE; size = ALIGN(CONFIG_SYS_NONCACHED_MEMORY, MMU_SECTION_SIZE); start = end - size; |