From b0ff32bc4142aecfb71234c602e9bd4b1c020ebb Mon Sep 17 00:00:00 2001 From: Andre Przywara Date: Sun, 1 May 2016 22:50:27 +0100 Subject: bl31: remove no longer needed boot0 header As ATF now lives in SRAM, we can't load it directly as the ATF binary anymore (it would always be loaded into DRAM then). Instead we disguise it as the SCP, which does not require a specific boot0 header. Remove all the code that was prefixing the binary with the boot0 header (which was a bit misplaced in generic code anyway). Signed-off-by: Andre Przywara --- bl31/bl31.ld.S | 1 - bl31/bl31.mk | 3 +-- bl31/head_data.c | 22 ---------------------- 3 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 bl31/head_data.c diff --git a/bl31/bl31.ld.S b/bl31/bl31.ld.S index 37329b6..c53cd66 100644 --- a/bl31/bl31.ld.S +++ b/bl31/bl31.ld.S @@ -47,7 +47,6 @@ SECTIONS ro . : { __RO_START__ = .; - KEEP(*head_data.o(.head_data*)) KEEP(*bl31_entrypoint.o(.text*)) *(.text*) *(.rodata*) diff --git a/bl31/bl31.mk b/bl31/bl31.mk index be0a2ce..5e26aa0 100644 --- a/bl31/bl31.mk +++ b/bl31/bl31.mk @@ -28,8 +28,7 @@ # POSSIBILITY OF SUCH DAMAGE. # -BL31_SOURCES+= bl31/head_data.c \ - bl31/bl31_main.c \ +BL31_SOURCES+= bl31/bl31_main.c \ bl31/context_mgmt.c \ bl31/cpu_data_array.c \ bl31/runtime_svc.c \ diff --git a/bl31/head_data.c b/bl31/head_data.c deleted file mode 100644 index ebb3b9e..0000000 --- a/bl31/head_data.c +++ /dev/null @@ -1,22 +0,0 @@ -/* - * - * Header for semelis - * - */ - -#include -#include - -struct spare_boot_ctrl_head -monitor_head __attribute__ ((section(".head_data"))) = -{ - (0x14000000 | ((sizeof(struct spare_boot_ctrl_head) / sizeof(int)) & 0x00FFFFFF)), - "monitor", - 0, - 0, - 0, - 0, - "2.0", - "monitor", - {BL31_BASE} -}; -- cgit v1.2.3