diff options
author | Haojian Zhuang <haojian.zhuang@linaro.org> | 2018-01-29 12:45:28 +0800 |
---|---|---|
committer | Haojian Zhuang <haojian.zhuang@linaro.org> | 2018-03-05 13:05:26 +0800 |
commit | 99ffcaf2efac457806d558c7e7bc36cc23144894 (patch) | |
tree | dfdd62ce13f3615dabc7e34537401cd1e85e1801 /plat/hisilicon/hikey960/hikey960_bl1_setup.c | |
parent | 8495c03af48ea5fd5becd4d1efbdfe15575b45b5 (diff) | |
download | trusted-firmware-a-99ffcaf2efac457806d558c7e7bc36cc23144894.tar.gz |
hikey960: drop LOAD_IMAGE v1
Since LOAD_IMAGE_V2 is always enabled in HiKey960 platform. Drop
LOAD_IMAGE v1 to simplify code.
Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>
Diffstat (limited to 'plat/hisilicon/hikey960/hikey960_bl1_setup.c')
-rw-r--r-- | plat/hisilicon/hikey960/hikey960_bl1_setup.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/plat/hisilicon/hikey960/hikey960_bl1_setup.c b/plat/hisilicon/hikey960/hikey960_bl1_setup.c index 11f143a829..4f1640da3c 100644 --- a/plat/hisilicon/hikey960/hikey960_bl1_setup.c +++ b/plat/hisilicon/hikey960/hikey960_bl1_setup.c @@ -74,7 +74,6 @@ meminfo_t *bl1_plat_sec_mem_layout(void) return &bl1_tzram_layout; } -#if LOAD_IMAGE_V2 /******************************************************************************* * Function that takes a memory layout into which BL2 has been loaded and * populates a new memory layout for BL2 that ensures that BL1's data sections @@ -96,7 +95,6 @@ void bl1_init_bl2_mem_layout(const meminfo_t *bl1_mem_layout, flush_dcache_range((unsigned long)bl2_mem_layout, sizeof(meminfo_t)); } -#endif /* LOAD_IMAGE_V2 */ /* * Perform any BL1 specific platform actions. @@ -118,16 +116,6 @@ void bl1_early_platform_setup(void) bl1_tzram_layout.total_base = BL1_RW_BASE; bl1_tzram_layout.total_size = BL1_RW_SIZE; -#if !LOAD_IMAGE_V2 - /* Calculate how much RAM BL1 is using and how much remains free */ - bl1_tzram_layout.free_base = BL1_RW_BASE; - bl1_tzram_layout.free_size = BL1_RW_SIZE; - reserve_mem(&bl1_tzram_layout.free_base, - &bl1_tzram_layout.free_size, - BL1_RAM_BASE, - BL1_RAM_LIMIT - BL1_RAM_BASE); /* bl1_size */ -#endif /* LOAD_IMAGE_V2 */ - INFO("BL1: 0x%lx - 0x%lx [size = %lu]\n", BL1_RAM_BASE, BL1_RAM_LIMIT, BL1_RAM_LIMIT - BL1_RAM_BASE); /* bl1_size */ } |