stm32mp1: Link BL2, BL32 and DTB in one binary
platform.mk is updated to have compilation rules for DTB, stm32image tool, and the concatenation of the 3 binaries. A new linker script and an assembly file are added to manage this. Signed-off-by: Yann Gautier <yann.gautier@st.com> Signed-off-by: Mathieu Belou <mathieu.belou@st.com> Signed-off-by: Lionel Debieve <lionel.debieve@st.com>
This commit is contained in:
Yann Gautier
parent
5fbcdd056b
commit
f74cbc93a8
|
|
@ -20,6 +20,11 @@ PLAT_INCLUDES := -Iplat/st/stm32mp1/include/
|
|||
PLAT_INCLUDES += -Iinclude/common/tbbr
|
||||
PLAT_INCLUDES += -Iinclude/drivers/st
|
||||
|
||||
# Device tree
|
||||
STM32_DTB_FILE_NAME ?= stm32mp157c-ev1.dtb
|
||||
FDT_SOURCES := $(addprefix fdts/, $(patsubst %.dtb,%.dts,$(STM32_DTB_FILE_NAME)))
|
||||
DTC_FLAGS += -Wno-unit_address_vs_reg
|
||||
|
||||
include lib/libfdt/libfdt.mk
|
||||
|
||||
PLAT_BL_COMMON_SOURCES := plat/st/stm32mp1/stm32mp1_common.c
|
||||
|
|
@ -68,3 +73,76 @@ BL2_SOURCES += common/desc_image_load.c \
|
|||
# For memory footprint optimization, build with thumb and interwork support
|
||||
ASFLAGS += -mthumb -mthumb-interwork
|
||||
TF_CFLAGS += -mthumb -mthumb-interwork
|
||||
|
||||
# Macros and rules to build TF binary
|
||||
STM32_TF_ELF_LDFLAGS := --hash-style=gnu --as-needed
|
||||
STM32_DT_BASENAME := $(STM32_DTB_FILE_NAME:.dtb=)
|
||||
STM32_TF_STM32 := ${BUILD_PLAT}/tf-a-${STM32_DT_BASENAME}.stm32
|
||||
STM32_TF_BINARY := $(STM32_TF_STM32:.stm32=.bin)
|
||||
STM32_TF_MAPFILE := $(STM32_TF_STM32:.stm32=.map)
|
||||
STM32_TF_LINKERFILE := $(STM32_TF_STM32:.stm32=.ld)
|
||||
STM32_TF_ELF := $(STM32_TF_STM32:.stm32=.elf)
|
||||
STM32_TF_DTBFILE := ${BUILD_PLAT}/fdts/${STM32_DTB_FILE_NAME}
|
||||
STM32_TF_OBJS := ${BUILD_PLAT}/stm32mp1.o
|
||||
|
||||
# Variables for use with stm32image
|
||||
STM32IMAGEPATH ?= tools/stm32image
|
||||
STM32IMAGE ?= ${STM32IMAGEPATH}/stm32image${BIN_EXT}
|
||||
|
||||
.PHONY: ${STM32_TF_STM32}
|
||||
.SUFFIXES:
|
||||
|
||||
all: check_dtc_version ${STM32_TF_STM32} stm32image
|
||||
|
||||
ifeq ($(AARCH32_SP),sp_min)
|
||||
# BL32 is built only if using SP_MIN
|
||||
BL32_DEP := bl32
|
||||
BL32_PATH := -DBL32_BIN_PATH=\"${BUILD_PLAT}/bl32.bin\"
|
||||
endif
|
||||
|
||||
distclean realclean clean: clean_stm32image
|
||||
|
||||
stm32image:
|
||||
${Q}${MAKE} CPPFLAGS="" --no-print-directory -C ${STM32IMAGEPATH}
|
||||
|
||||
clean_stm32image:
|
||||
${Q}${MAKE} --no-print-directory -C ${STM32IMAGEPATH} clean
|
||||
|
||||
check_dtc_version:
|
||||
$(eval DTC_V = $(shell $(DTC) -v | awk '{print $$NF}'))
|
||||
$(eval DTC_VERSION = $(shell printf "%d" $(shell echo ${DTC_V} | cut -d- -f1 | sed "s/\./0/g")))
|
||||
@if [ ${DTC_VERSION} -lt 10404 ]; then \
|
||||
echo "dtc version too old (${DTC_V}), you need at least version 1.4.4"; \
|
||||
false; \
|
||||
fi
|
||||
|
||||
|
||||
${STM32_TF_OBJS}: plat/st/stm32mp1/stm32mp1.S bl2 ${BL32_DEP} ${STM32_TF_DTBFILE}
|
||||
@echo " AS $<"
|
||||
${Q}${AS} ${ASFLAGS} ${TF_CFLAGS} \
|
||||
${BL32_PATH} \
|
||||
-DBL2_BIN_PATH=\"${BUILD_PLAT}/bl2.bin\" \
|
||||
-DDTB_BIN_PATH=\"${STM32_TF_DTBFILE}\" \
|
||||
-c plat/st/stm32mp1/stm32mp1.S -o $@
|
||||
|
||||
${STM32_TF_LINKERFILE}: plat/st/stm32mp1/stm32mp1.ld.S
|
||||
@echo " LDS $<"
|
||||
${Q}${AS} ${ASFLAGS} ${TF_CFLAGS} -P -E $< -o $@
|
||||
|
||||
${STM32_TF_ELF}: ${STM32_TF_OBJS} ${STM32_TF_LINKERFILE}
|
||||
@echo " LDS $<"
|
||||
${Q}${LD} -o $@ ${STM32_TF_ELF_LDFLAGS} -Map=${STM32_TF_MAPFILE} --script ${STM32_TF_LINKERFILE} ${STM32_TF_OBJS}
|
||||
|
||||
${STM32_TF_BINARY}: ${STM32_TF_ELF}
|
||||
${Q}${OC} -O binary ${STM32_TF_ELF} $@
|
||||
@echo
|
||||
@echo "Built $@ successfully"
|
||||
@echo
|
||||
|
||||
${STM32_TF_STM32}: stm32image ${STM32_TF_BINARY}
|
||||
@echo
|
||||
@echo "Generated $@"
|
||||
$(eval LOADADDR = $(shell cat ${STM32_TF_MAPFILE} | grep RAM | awk '{print $$2}'))
|
||||
$(eval ENTRY = $(shell cat ${STM32_TF_MAPFILE} | grep "__BL2_IMAGE_START" | awk '{print $$1}'))
|
||||
${STM32IMAGE} -s ${STM32_TF_BINARY} -d $@ -l $(LOADADDR) -e ${ENTRY} -v ${STM32_TF_VERSION}
|
||||
@echo
|
||||
|
|
|
|||
|
|
@ -0,0 +1,16 @@
|
|||
/*
|
||||
* Copyright (c) 2016-2018, ARM Limited and Contributors. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
||||
#ifdef BL32_BIN_PATH
|
||||
.section .bl32_image
|
||||
.incbin BL32_BIN_PATH
|
||||
#endif
|
||||
|
||||
.section .bl2_image
|
||||
.incbin BL2_BIN_PATH
|
||||
|
||||
.section .dtb_image
|
||||
.incbin DTB_BIN_PATH
|
||||
|
|
@ -0,0 +1,76 @@
|
|||
/*
|
||||
* Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
||||
#ifndef __STM32MP1_LD_S__
|
||||
#define __STM32MP1_LD_S__
|
||||
#include <platform_def.h>
|
||||
#include <xlat_tables_defs.h>
|
||||
|
||||
OUTPUT_FORMAT(PLATFORM_LINKER_FORMAT)
|
||||
OUTPUT_ARCH(PLATFORM_LINKER_ARCH)
|
||||
|
||||
ENTRY(__BL2_IMAGE_START__)
|
||||
|
||||
MEMORY {
|
||||
HEADER (rw) : ORIGIN = 0x00000000, LENGTH = 0x3000
|
||||
RAM (rwx) : ORIGIN = STM32MP1_BINARY_BASE, LENGTH = STM32MP1_BINARY_SIZE
|
||||
}
|
||||
|
||||
SECTIONS
|
||||
{
|
||||
/*
|
||||
* TF mapping must conform to ROM code specification.
|
||||
*/
|
||||
.header : {
|
||||
__HEADER_START__ = .;
|
||||
KEEP(*(.header))
|
||||
. = ALIGN(4);
|
||||
__HEADER_END__ = .;
|
||||
} >HEADER
|
||||
|
||||
. = STM32MP1_BINARY_BASE;
|
||||
.data . : {
|
||||
. = ALIGN(PAGE_SIZE);
|
||||
__DATA_START__ = .;
|
||||
*(.data*)
|
||||
|
||||
/*
|
||||
* dtb.
|
||||
* The strongest and only alignment contraint is MMU 4K page.
|
||||
* Indeed as images below will be removed, 4K pages will be re-used.
|
||||
*/
|
||||
. = ( STM32MP1_DTB_BASE - STM32MP1_BINARY_BASE );
|
||||
__DTB_IMAGE_START__ = .;
|
||||
*(.dtb_image*)
|
||||
__DTB_IMAGE_END__ = .;
|
||||
|
||||
/*
|
||||
* bl2.
|
||||
* The strongest and only alignment contraint is MMU 4K page.
|
||||
* Indeed as images below will be removed, 4K pages will be re-used.
|
||||
*/
|
||||
. = ( STM32MP1_BL2_BASE - STM32MP1_BINARY_BASE );
|
||||
__BL2_IMAGE_START__ = .;
|
||||
*(.bl2_image*)
|
||||
__BL2_IMAGE_END__ = .;
|
||||
|
||||
/*
|
||||
* bl32 will be settled by bl2.
|
||||
* The strongest and only alignment constraint is 8 words to simplify
|
||||
* memraise8 assembly code.
|
||||
*/
|
||||
. = ( STM32MP1_BL32_BASE - STM32MP1_BINARY_BASE );
|
||||
__BL32_IMAGE_START__ = .;
|
||||
*(.bl32_image*)
|
||||
__BL32_IMAGE_END__ = .;
|
||||
|
||||
__DATA_END__ = .;
|
||||
} >RAM
|
||||
|
||||
__TF_END__ = .;
|
||||
|
||||
}
|
||||
#endif /*__STM32MP1_LD_S__*/
|
||||
Loading…
Reference in New Issue