diff options
| author | Rosen Penev <rosenp@gmail.com> | 2021-09-19 19:30:37 -0700 |
|---|---|---|
| committer | Paul Spooren <mail@aparcar.org> | 2021-09-21 21:39:01 -1000 |
| commit | 50773c5c989dc921f9fc17bcc48d10293eaebe5a (patch) | |
| tree | 5272832b780ad4588967dc53fd90624738003795 /package | |
| parent | 96c7164acd80d07655c2d8dbb3dc4ce556a65e46 (diff) | |
| download | openwrt-50773c5c989dc921f9fc17bcc48d10293eaebe5a.tar.gz openwrt-50773c5c989dc921f9fc17bcc48d10293eaebe5a.tar.bz2 openwrt-50773c5c989dc921f9fc17bcc48d10293eaebe5a.zip | |
tfp-layerscape: update to LSDK-20.12
Fixes compilation with GCC11.
Kept PKG_VERSION as there's some bug that chops off the 12 at the end.
Refreshed other patch.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'package')
3 files changed, 23 insertions, 10 deletions
diff --git a/package/boot/tfa-layerscape/Makefile b/package/boot/tfa-layerscape/Makefile index 6285da6a15..6f0e175885 100644 --- a/package/boot/tfa-layerscape/Makefile +++ b/package/boot/tfa-layerscape/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tfa-layerscape -PKG_VERSION:=LSDK-20.04-update-290520 +PKG_VERSION:=LSDK-20.12 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://source.codeaurora.org/external/qoriq/qoriq-components/atf -PKG_SOURCE_VERSION:=7d748e6f0ec652ba7c43733dc67a3d0b0217390a -PKG_MIRROR_HASH:=d209c9ad18aac9f18375450b98b8dab00f0382ccb485df14623bf9b72ea1dd9b +PKG_SOURCE_VERSION:=LSDK-20.12 +PKG_MIRROR_HASH:=8e3a0bd33c00657beeb2df88a881b1831aeb790751cacd4c4fdf33ffa01e956e PKG_BUILD_DEPENDS:=tfa-layerscape/host include $(INCLUDE_DIR)/host-build.mk diff --git a/package/boot/tfa-layerscape/patches/003-plat-nxp-tools-fix-create_pbl-and-byte_swap-host-bui.patch b/package/boot/tfa-layerscape/patches/003-plat-nxp-tools-fix-create_pbl-and-byte_swap-host-bui.patch index ce4d9c48bf..2b19d53c71 100644 --- a/package/boot/tfa-layerscape/patches/003-plat-nxp-tools-fix-create_pbl-and-byte_swap-host-bui.patch +++ b/package/boot/tfa-layerscape/patches/003-plat-nxp-tools-fix-create_pbl-and-byte_swap-host-bui.patch @@ -11,8 +11,6 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com> plat/nxp/tools/pbl_ch3.mk | 5 ----- 2 files changed, 8 deletions(-) -diff --git a/plat/nxp/tools/pbl_ch2.mk b/plat/nxp/tools/pbl_ch2.mk -index afa43520..ff624dd9 100644 --- a/plat/nxp/tools/pbl_ch2.mk +++ b/plat/nxp/tools/pbl_ch2.mk @@ -20,8 +20,6 @@ ifeq ($(RCW),"") @@ -32,8 +30,6 @@ index afa43520..ff624dd9 100644 ${CREATE_PBL} -r ${RCW} -i ${BUILD_PLAT}/bl2.bin -b ${BOOT_MODE} -c ${SOC_NUM} -d ${BL2_BASE} -e ${BL2_BASE} \ -o ${BUILD_PLAT}/bl2_${BOOT_MODE}.pbl ; # Swapping of RCW is required for QSPi Chassis 2 devices -diff --git a/plat/nxp/tools/pbl_ch3.mk b/plat/nxp/tools/pbl_ch3.mk -index 944ae3bb..9aa8f635 100644 --- a/plat/nxp/tools/pbl_ch3.mk +++ b/plat/nxp/tools/pbl_ch3.mk @@ -27,9 +27,6 @@ else @@ -55,6 +51,3 @@ index 944ae3bb..9aa8f635 100644 # Add Block Copy command and populate boot loc ptrfor bl2.bin to RCW ${CREATE_PBL} -r ${RCW} -i ${BUILD_PLAT}/bl2.bin -b ${BOOT_MODE} -c ${SOC_NUM} -d ${BL2_BASE} -e ${BL2_BASE} \ -o ${BUILD_PLAT}/bl2_${BOOT_MODE}.pbl -f ${BL2_SRC_OFFSET}; --- -2.17.1 - diff --git a/package/boot/tfa-layerscape/patches/010-gcc11.patch b/package/boot/tfa-layerscape/patches/010-gcc11.patch new file mode 100644 index 0000000000..1cdc21a493 --- /dev/null +++ b/package/boot/tfa-layerscape/patches/010-gcc11.patch @@ -0,0 +1,20 @@ +--- a/common/runtime_svc.c ++++ b/common/runtime_svc.c +@@ -38,7 +38,7 @@ uintptr_t handle_runtime_svc(uint32_t smc_fid, + u_register_t x1, x2, x3, x4; + int index; + unsigned int idx; +- const rt_svc_desc_t *rt_svc_descs; ++ rt_svc_desc_t *rt_svc_descs = NULL; + + assert(handle); + idx = get_unique_oen_from_smc_fid(smc_fid); +@@ -48,7 +48,7 @@ uintptr_t handle_runtime_svc(uint32_t smc_fid, + if (index < 0 || index >= (int)RT_SVC_DECS_NUM) + SMC_RET1(handle, SMC_UNK); + +- rt_svc_descs = (rt_svc_desc_t *) RT_SVC_DESCS_START; ++ memcpy(rt_svc_descs, (rt_svc_desc_t *)RT_SVC_DESCS_START, MAX_RT_SVCS); + + get_smc_params_from_ctx(handle, x1, x2, x3, x4); + |