From: Jan Kiszka <[email protected]> Allows to drop the backport patch. Requires to update some Marvell dependency - and allows another patch removal.
Signed-off-by: Jan Kiszka <[email protected]> --- ...se-abspath-to-dereference-BUILD_BASE.patch | 144 ------------------ ...-fix-gcc-warning-about-uninitialized.patch | 40 ----- ...=> trusted-firmware-a-macchiatobin_2.4.bb} | 7 +- ... => trusted-firmware-a-pine64-plus_2.4.bb} | 0 ..._2.3.bb => trusted-firmware-a-rpi4_2.4.bb} | 0 ...3.bb => trusted-firmware-a-ultra96_2.4.bb} | 0 ...e-a_2.3.inc => trusted-firmware-a_2.4.inc} | 6 +- 7 files changed, 5 insertions(+), 192 deletions(-) delete mode 100644 recipes-bsp/trusted-firmware-a/files/0001-Use-abspath-to-dereference-BUILD_BASE.patch delete mode 100644 recipes-bsp/trusted-firmware-a/files/0001-mv_ddr4_training-fix-gcc-warning-about-uninitialized.patch rename recipes-bsp/trusted-firmware-a/{trusted-firmware-a-macchiatobin_2.3.bb => trusted-firmware-a-macchiatobin_2.4.bb} (77%) rename recipes-bsp/trusted-firmware-a/{trusted-firmware-a-pine64-plus_2.3.bb => trusted-firmware-a-pine64-plus_2.4.bb} (100%) rename recipes-bsp/trusted-firmware-a/{trusted-firmware-a-rpi4_2.3.bb => trusted-firmware-a-rpi4_2.4.bb} (100%) rename recipes-bsp/trusted-firmware-a/{trusted-firmware-a-ultra96_2.3.bb => trusted-firmware-a-ultra96_2.4.bb} (100%) rename recipes-bsp/trusted-firmware-a/{trusted-firmware-a_2.3.inc => trusted-firmware-a_2.4.inc} (65%) diff --git a/recipes-bsp/trusted-firmware-a/files/0001-Use-abspath-to-dereference-BUILD_BASE.patch b/recipes-bsp/trusted-firmware-a/files/0001-Use-abspath-to-dereference-BUILD_BASE.patch deleted file mode 100644 index 37b6251..0000000 --- a/recipes-bsp/trusted-firmware-a/files/0001-Use-abspath-to-dereference-BUILD_BASE.patch +++ /dev/null @@ -1,144 +0,0 @@ -From f62206b4871020506842807b263408e5162b23e9 Mon Sep 17 00:00:00 2001 -From: Grant Likely <[email protected]> -Date: Thu, 30 Jul 2020 08:50:10 +0100 -Subject: [PATCH] Use abspath to dereference $BUILD_BASE - -If the user tries to change BUILD_BASE to put the build products outside -the build tree the compile will fail due to hard coded assumptions that -$BUILD_BASE is a relative path. Fix by using $(abspath $(BUILD_BASE)) -to rationalize to an absolute path every time and remove the relative -path assumptions. - -This patch also adds documentation that BUILD_BASE can be specified by -the user. - -Signed-off-by: Grant Likely <[email protected]> -Signed-off-by: Manish Pandey <[email protected]> -Change-Id: Ib1af874de658484aaffc672f30029b852d2489c8 ---- - Makefile | 6 ++++-- - docs/getting_started/build-options.rst | 2 ++ - lib/romlib/Makefile | 8 ++++---- - plat/marvell/a8k/common/ble/ble.mk | 8 ++++---- - plat/nvidia/tegra/platform.mk | 2 +- - plat/ti/k3/platform.mk | 2 +- - tools/sptool/sp_mk_generator.py | 4 ++-- - 7 files changed, 18 insertions(+), 14 deletions(-) - -diff --git a/Makefile b/Makefile -index f01a9ae3e..1290d4ff4 100644 ---- a/Makefile -+++ b/Makefile -@@ -449,8 +449,10 @@ include common/backtrace/backtrace.mk - - include ${MAKE_HELPERS_DIRECTORY}plat_helpers.mk - --BUILD_BASE := ./build --BUILD_PLAT := ${BUILD_BASE}/${PLAT}/${BUILD_TYPE} -+ifeq (${BUILD_BASE},) -+ BUILD_BASE := ./build -+endif -+BUILD_PLAT := $(abspath ${BUILD_BASE})/${PLAT}/${BUILD_TYPE} - - SPDS := $(sort $(filter-out none, $(patsubst services/spd/%,%,$(wildcard services/spd/*)))) - -diff --git a/docs/getting_started/build-options.rst b/docs/getting_started/build-options.rst -index 90fe83feb..c96499020 100644 ---- a/docs/getting_started/build-options.rst -+++ b/docs/getting_started/build-options.rst -@@ -116,6 +116,8 @@ Common build options - - ``BUILD_STRING``: Input string for VERSION_STRING, which allows the TF-A - build to be uniquely identified. Defaults to the current git commit id. - -+- ``BUILD_BASE``: Output directory for the build. Defaults to ``./build`` -+ - - ``CFLAGS``: Extra user options appended on the compiler's command line in - addition to the options set by the build system. - -diff --git a/lib/romlib/Makefile b/lib/romlib/Makefile -index cec94043d..2ff480bd4 100644 ---- a/lib/romlib/Makefile -+++ b/lib/romlib/Makefile -@@ -10,14 +10,14 @@ LD = $(CROSS_COMPILE)ld - OC = $(CROSS_COMPILE)objcopy - CPP = $(CROSS_COMPILE)cpp - ROMLIB_GEN = ./romlib_generator.py --BUILD_DIR = ../../$(BUILD_PLAT)/romlib --LIB_DIR = ../../$(BUILD_PLAT)/lib --WRAPPER_DIR = ../../$(BUILD_PLAT)/libwrapper -+BUILD_DIR = $(BUILD_PLAT)/romlib -+LIB_DIR = $(BUILD_PLAT)/lib -+WRAPPER_DIR = $(BUILD_PLAT)/libwrapper - LIBS = -lmbedtls -lfdt -lc - INC = $(INCLUDES:-I%=-I../../%) - PPFLAGS = $(INC) $(DEFINES) -P -x assembler-with-cpp -D__LINKER__ -MD -MP -MT $(BUILD_DIR)/romlib.ld - OBJS = $(BUILD_DIR)/jmptbl.o $(BUILD_DIR)/init.o --MAPFILE = ../../$(BUILD_PLAT)/romlib/romlib.map -+MAPFILE = $(BUILD_PLAT)/romlib/romlib.map - - ifneq ($(PLAT_DIR),) - WRAPPER_SOURCES = $(shell $(ROMLIB_GEN) genwrappers -b $(WRAPPER_DIR) --list ../../$(PLAT_DIR)/jmptbl.i) -diff --git a/plat/marvell/a8k/common/ble/ble.mk b/plat/marvell/a8k/common/ble/ble.mk -index b6a9cd291..12e657581 100644 ---- a/plat/marvell/a8k/common/ble/ble.mk -+++ b/plat/marvell/a8k/common/ble/ble.mk -@@ -5,9 +5,9 @@ - - MV_DDR_PATH ?= drivers/marvell/mv_ddr - --MV_DDR_LIB = $(CURDIR)/$(BUILD_PLAT)/ble/mv_ddr_lib.a --LIBC_LIB = $(CURDIR)/$(BUILD_PLAT)/lib/libc.a --BLE_LIBS = $(MV_DDR_LIB) $(LIBC_LIB) -+MV_DDR_LIB = $(BUILD_PLAT)/ble/mv_ddr_lib.a -+LIBC_LIB = $(BUILD_PLAT)/lib/libc.a -+BLE_LIBS = $(MV_DDR_LIB) $(LIBC_LIB) - PLAT_MARVELL = plat/marvell - - BLE_SOURCES += $(BLE_PATH)/ble_main.c \ -@@ -29,4 +29,4 @@ BLE_LINKERFILE := $(BLE_PATH)/ble.ld.S - FORCE: - - $(MV_DDR_LIB): FORCE -- @+make -C $(MV_DDR_PATH) --no-print-directory PLAT_INCLUDES="$(PLAT_INCLUDES)" PLATFORM=$(PLAT) ARCH=AARCH64 OBJ_DIR=$(CURDIR)/$(BUILD_PLAT)/ble -+ @+make -C $(MV_DDR_PATH) --no-print-directory PLAT_INCLUDES="$(PLAT_INCLUDES)" PLATFORM=$(PLAT) ARCH=AARCH64 OBJ_DIR=$(BUILD_PLAT)/ble -diff --git a/plat/nvidia/tegra/platform.mk b/plat/nvidia/tegra/platform.mk -index e03e1f37b..f7221afac 100644 ---- a/plat/nvidia/tegra/platform.mk -+++ b/plat/nvidia/tegra/platform.mk -@@ -56,7 +56,7 @@ $(eval $(call add_define,ENABLE_TEGRA_WDT_LEGACY_FIQ_HANDLING)) - $(eval $(call add_define,RELOCATE_BL32_IMAGE)) - - # modify BUILD_PLAT to point to SoC specific build directory --BUILD_PLAT := ${BUILD_BASE}/${PLAT}/${TARGET_SOC}/${BUILD_TYPE} -+BUILD_PLAT := $(abspath ${BUILD_BASE})/${PLAT}/${TARGET_SOC}/${BUILD_TYPE} - - # platform cflags (enable signed comparisons, disable stdlib) - TF_CFLAGS += -Wsign-compare -nostdlib -diff --git a/plat/ti/k3/platform.mk b/plat/ti/k3/platform.mk -index 65d5cc2a4..2de21aa7b 100644 ---- a/plat/ti/k3/platform.mk -+++ b/plat/ti/k3/platform.mk -@@ -11,4 +11,4 @@ include ${PLAT_PATH}/common/plat_common.mk - include ${PLAT_PATH}/board/${TARGET_BOARD}/board.mk - - # modify BUILD_PLAT to point to board specific build directory --BUILD_PLAT := ${BUILD_BASE}/${PLAT}/${TARGET_BOARD}/${BUILD_TYPE} -+BUILD_PLAT := $(abspath ${BUILD_BASE})/${PLAT}/${TARGET_BOARD}/${BUILD_TYPE} -diff --git a/tools/sptool/sp_mk_generator.py b/tools/sptool/sp_mk_generator.py -index 6b6fa1914..68fb82201 100755 ---- a/tools/sptool/sp_mk_generator.py -+++ b/tools/sptool/sp_mk_generator.py -@@ -53,8 +53,8 @@ with open(sys.argv[2],'r') as in_file: - data = json.load(in_file) - json_file = os.path.abspath(sys.argv[2]) - json_dir = os.path.dirname(json_file) --gen_file = sys.argv[1] --out_dir = sys.argv[3][2:] -+gen_file = os.path.abspath(sys.argv[1]) -+out_dir = os.path.abspath(sys.argv[3]) - dtb_dir = out_dir + "/fdts/" - print(dtb_dir) - --- -2.26.2 - diff --git a/recipes-bsp/trusted-firmware-a/files/0001-mv_ddr4_training-fix-gcc-warning-about-uninitialized.patch b/recipes-bsp/trusted-firmware-a/files/0001-mv_ddr4_training-fix-gcc-warning-about-uninitialized.patch deleted file mode 100644 index 9daa485..0000000 --- a/recipes-bsp/trusted-firmware-a/files/0001-mv_ddr4_training-fix-gcc-warning-about-uninitialized.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 1e4cd057a61000cf7d29f7047b68c2cade604465 Mon Sep 17 00:00:00 2001 -From: philhofer <[email protected]> -Date: Mon, 1 Jul 2019 16:09:28 -0700 -Subject: [PATCH] mv_ddr4_training: fix gcc warning about uninitialized data - -ATF builds with -Wuninitialized -Werror, which causes a build -failure with gcc 8.3.0 on line 455 of mv_ddr4_training_leveling.c - -Also, fix some nearby inconsistent indentation. - -Signed-off-by: philhofer <[email protected]> ---- - mv_ddr4_training_leveling.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/mv_ddr4_training_leveling.c b/mv_ddr4_training_leveling.c -index 144e21a..4c0c0ab 100644 ---- a/mv_ddr4_training_leveling.c -+++ b/mv_ddr4_training_leveling.c -@@ -368,7 +368,7 @@ static int mv_ddr4_dynamic_pb_wl_supp(u32 dev_num, enum mv_wl_supp_mode ecc_mode - u32 subphy_num = ddr3_tip_dev_attr_get(dev_num, MV_ATTR_OCTET_PER_INTERFACE); - u8 compare_result = 0; - u32 orig_phase; -- u32 rd_data, wr_data; -+ u32 rd_data, wr_data = 0; - u32 flag, step; - struct mv_ddr_topology_map *tm = mv_ddr_topology_map_get(); - u32 ecc_phy_access_id; -@@ -450,7 +450,7 @@ static int mv_ddr4_dynamic_pb_wl_supp(u32 dev_num, enum mv_wl_supp_mode ecc_mode - if (orig_phase > 1) - wr_data = (rd_data & ~0x1c0) | ((orig_phase - 2) << 6); - else if (orig_phase == 1) -- wr_data = (rd_data & ~0x1df); -+ wr_data = (rd_data & ~0x1df); - if (orig_phase >= 1) - ddr3_tip_bus_write(dev_num, ACCESS_TYPE_UNICAST, if_id, - ACCESS_TYPE_UNICAST, subphy_num, --- -2.16.4 - diff --git a/recipes-bsp/trusted-firmware-a/trusted-firmware-a-macchiatobin_2.3.bb b/recipes-bsp/trusted-firmware-a/trusted-firmware-a-macchiatobin_2.4.bb similarity index 77% rename from recipes-bsp/trusted-firmware-a/trusted-firmware-a-macchiatobin_2.3.bb rename to recipes-bsp/trusted-firmware-a/trusted-firmware-a-macchiatobin_2.4.bb index d5dced9..3133365 100644 --- a/recipes-bsp/trusted-firmware-a/trusted-firmware-a-macchiatobin_2.3.bb +++ b/recipes-bsp/trusted-firmware-a/trusted-firmware-a-macchiatobin_2.4.bb @@ -12,12 +12,11 @@ require trusted-firmware-a_${PV}.inc SRC_URI += " \ - git://github.com/MarvellEmbeddedProcessors/mv-ddr-marvell;protocol=https;branch=mv_ddr-armada-atf-mainline;rev=${MV_DDR_REV};destsuffix=mv-ddr-marvell \ + git://github.com/MarvellEmbeddedProcessors/mv-ddr-marvell;protocol=https;rev=${MV_DDR_REV};destsuffix=mv-ddr-marvell \ git://github.com/MarvellEmbeddedProcessors/binaries-marvell;protocol=https;branch=${MV_BIN_BRANCH};rev=${MV_BIN_REV};destsuffix=binaries-marvell \ - file://0001-mv_ddr4_training-fix-gcc-warning-about-uninitialized.patch;patchdir=${WORKDIR}/mv-ddr-marvell \ " -MV_DDR_REV="a881467ef0f0185e6570dd0483023fde93cbb5f5" +MV_DDR_REV="7c351731d19645f64d2826a47e8f4d9cd1c74db3" MV_BIN_BRANCH="binaries-marvell-armada-18.12" MV_BIN_REV="c6c529ea3d905a28cc77331964c466c3e2dc852e" @@ -30,5 +29,5 @@ TF_A_EXTRA_BUILDARGS = " \ MV_DDR_PATH=../mv-ddr-marvell \ SCP_BL2=../binaries-marvell/mrvl_scp_bl2.img \ BL33=/usr/lib/u-boot/macchiatobin/u-boot.bin \ - all fip" + mrvl_flash" TF_A_BINARIES = "release/flash-image.bin" diff --git a/recipes-bsp/trusted-firmware-a/trusted-firmware-a-pine64-plus_2.3.bb b/recipes-bsp/trusted-firmware-a/trusted-firmware-a-pine64-plus_2.4.bb similarity index 100% rename from recipes-bsp/trusted-firmware-a/trusted-firmware-a-pine64-plus_2.3.bb rename to recipes-bsp/trusted-firmware-a/trusted-firmware-a-pine64-plus_2.4.bb diff --git a/recipes-bsp/trusted-firmware-a/trusted-firmware-a-rpi4_2.3.bb b/recipes-bsp/trusted-firmware-a/trusted-firmware-a-rpi4_2.4.bb similarity index 100% rename from recipes-bsp/trusted-firmware-a/trusted-firmware-a-rpi4_2.3.bb rename to recipes-bsp/trusted-firmware-a/trusted-firmware-a-rpi4_2.4.bb diff --git a/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ultra96_2.3.bb b/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ultra96_2.4.bb similarity index 100% rename from recipes-bsp/trusted-firmware-a/trusted-firmware-a-ultra96_2.3.bb rename to recipes-bsp/trusted-firmware-a/trusted-firmware-a-ultra96_2.4.bb diff --git a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.inc b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.4.inc similarity index 65% rename from recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.inc rename to recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.4.inc index 06794c3..bd1e48e 100644 --- a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.inc +++ b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.4.inc @@ -1,7 +1,7 @@ # # Jailhouse, a Linux-based partitioning hypervisor # -# Copyright (c) Siemens AG, 2019-2020 +# Copyright (c) Siemens AG, 2019-2021 # # Authors: # Jan Kiszka <[email protected]> @@ -12,8 +12,6 @@ require recipes-bsp/trusted-firmware-a/trusted-firmware-a-custom.inc SRC_URI += "https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/snapshot/trusted-firmware-a-${PV}.tar.gz"; -SRC_URI[sha256sum] = "37f917922bcef181164908c470a2f941006791c0113d738c498d39d95d543b21" - -SRC_URI += "file://0001-Use-abspath-to-dereference-BUILD_BASE.patch" +SRC_URI[sha256sum] = "bf3eb3617a74cddd7fb0e0eacbfe38c3258ee07d4c8ed730deef7a175cc3d55b" S = "${WORKDIR}/trusted-firmware-a-${PV}" -- 2.26.2 -- You received this message because you are subscribed to the Google Groups "Jailhouse" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/jailhouse-dev/d06e61a7bef83b184b30c89d88f592f4852ac716.1618866389.git.jan.kiszka%40siemens.com.
