mirror of
https://github.com/openwrt/openwrt.git
synced 2024-11-23 18:05:20 +08:00
tfa-layerscape: Bump to lf-6.6.3-1.0.0
This commit bumps tfa-layerscape package to version lf-6.6.3-1.0.0 Manually rebased: 001-fiptool-hostbuild-fixes.patch 004-plat-nxp-restore-ls1012afrdm-support.patch Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
This commit is contained in:
Pawel Dembicki
Hauke Mehrtens
parent
35efee1329
commit
9d44340952
@ -8,13 +8,13 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=tfa-layerscape
|
||||
PKG_VERSION:=lf-6.1.1-1.0.0
|
||||
PKG_VERSION:=6.6.3.1.0.0
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_URL:=https://github.com/nxp-qoriq/atf
|
||||
PKG_SOURCE_VERSION:=lf-6.1.1-1.0.0
|
||||
PKG_MIRROR_HASH:=e109ca87a0f432529ab4d1fcd019adc0cd0d3684c96cdf770aac113f9bbe4bd6
|
||||
PKG_SOURCE_VERSION:=lf-6.6.3-1.0.0
|
||||
PKG_MIRROR_HASH:=28b731c1c4cc3226ccaef2142c61127f213c03cbd219df556c1d191e95f8470c
|
||||
PKG_BUILD_DEPENDS:=tfa-layerscape/host
|
||||
|
||||
include $(INCLUDE_DIR)/host-build.mk
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -914,10 +914,6 @@ CRTTOOL ?= ${CRTTOOLPATH}/cert_create$
|
||||
@@ -953,10 +953,6 @@ CRTTOOL ?= ${CRTTOOLPATH}/cert_create$
|
||||
ENCTOOLPATH ?= tools/encrypt_fw
|
||||
ENCTOOL ?= ${ENCTOOLPATH}/encrypt_fw${BIN_EXT}
|
||||
|
||||
@ -10,8 +10,8 @@
|
||||
-
|
||||
# Variables for use with sptool
|
||||
SPTOOLPATH ?= tools/sptool
|
||||
SPTOOL ?= ${SPTOOLPATH}/sptool${BIN_EXT}
|
||||
@@ -1322,13 +1318,6 @@ endif
|
||||
SPTOOL ?= ${SPTOOLPATH}/sptool.py
|
||||
@@ -1409,13 +1405,6 @@ endif
|
||||
clean:
|
||||
@echo " CLEAN"
|
||||
$(call SHELL_REMOVE_DIR,${BUILD_PLAT})
|
||||
@ -25,7 +25,7 @@
|
||||
${Q}${MAKE} PLAT=${PLAT} --no-print-directory -C ${CRTTOOLPATH} clean
|
||||
${Q}${MAKE} PLAT=${PLAT} --no-print-directory -C ${ENCTOOLPATH} clean
|
||||
${Q}${MAKE} --no-print-directory -C ${ROMLIBPATH} clean
|
||||
@@ -1337,13 +1326,6 @@ realclean distclean:
|
||||
@@ -1424,13 +1413,6 @@ realclean distclean:
|
||||
@echo " REALCLEAN"
|
||||
$(call SHELL_REMOVE_DIR,${BUILD_BASE})
|
||||
$(call SHELL_DELETE_ALL, ${CURDIR}/cscope.*)
|
||||
@ -36,28 +36,28 @@
|
||||
-# to pass the gnumake flags to nmake.
|
||||
- ${Q}set MAKEFLAGS= && ${MSVC_NMAKE} /nologo /f ${FIPTOOLPATH}/Makefile.msvc FIPTOOLPATH=$(subst /,\,$(FIPTOOLPATH)) FIPTOOL=$(subst /,\,$(FIPTOOL)) realclean
|
||||
-endif
|
||||
${Q}${MAKE} --no-print-directory -C ${SPTOOLPATH} clean
|
||||
${Q}${MAKE} PLAT=${PLAT} --no-print-directory -C ${CRTTOOLPATH} clean
|
||||
${Q}${MAKE} PLAT=${PLAT} --no-print-directory -C ${CRTTOOLPATH} realclean
|
||||
${Q}${MAKE} PLAT=${PLAT} --no-print-directory -C ${ENCTOOLPATH} realclean
|
||||
@@ -1400,7 +1382,7 @@ certificates: ${CRT_DEPS} ${CRTTOOL}
|
||||
${Q}${MAKE} --no-print-directory -C ${ROMLIBPATH} clean
|
||||
@@ -1486,7 +1468,7 @@ certificates: ${CRT_DEPS} ${CRTTOOL}
|
||||
@${ECHO_BLANK_LINE}
|
||||
endif
|
||||
|
||||
-${BUILD_PLAT}/${FIP_NAME}: ${FIP_DEPS} ${FIPTOOL}
|
||||
+${BUILD_PLAT}/${FIP_NAME}: ${FIP_DEPS}
|
||||
$(eval ${CHECK_FIP_CMD})
|
||||
${Q}${FIPTOOL} create ${FIP_ARGS} $@
|
||||
${Q}${FIPTOOL} info $@
|
||||
@@ -1417,7 +1399,7 @@ fwu_certificates: ${FWU_CRT_DEPS} ${CRTT
|
||||
$(eval ${CHECK_FIP_CMD})
|
||||
${Q}${FIPTOOL} create ${FIP_ARGS} $@
|
||||
${Q}${FIPTOOL} info $@
|
||||
@@ -1503,7 +1485,7 @@ fwu_certificates: ${FWU_CRT_DEPS} ${CRTT
|
||||
@${ECHO_BLANK_LINE}
|
||||
endif
|
||||
|
||||
-${BUILD_PLAT}/${FWU_FIP_NAME}: ${FWU_FIP_DEPS} ${FIPTOOL}
|
||||
+${BUILD_PLAT}/${FWU_FIP_NAME}: ${FWU_FIP_DEPS}
|
||||
$(eval ${CHECK_FWU_FIP_CMD})
|
||||
${Q}${FIPTOOL} create ${FWU_FIP_ARGS} $@
|
||||
${Q}${FIPTOOL} info $@
|
||||
@@ -1425,19 +1407,9 @@ ${BUILD_PLAT}/${FWU_FIP_NAME}: ${FWU_FIP
|
||||
$(eval ${CHECK_FWU_FIP_CMD})
|
||||
${Q}${FIPTOOL} create ${FWU_FIP_ARGS} $@
|
||||
${Q}${FIPTOOL} info $@
|
||||
@@ -1511,19 +1493,9 @@ ${BUILD_PLAT}/${FWU_FIP_NAME}: ${FWU_FIP
|
||||
@echo "Built $@ successfully"
|
||||
@${ECHO_BLANK_LINE}
|
||||
|
||||
@ -67,29 +67,29 @@
|
||||
|
||||
-${FIPTOOL}: FORCE
|
||||
-ifdef UNIX_MK
|
||||
- ${Q}${MAKE} CPPFLAGS="-DVERSION='\"${VERSION_STRING}\"'" FIPTOOL=${FIPTOOL} --no-print-directory -C ${FIPTOOLPATH}
|
||||
- ${Q}${MAKE} CPPFLAGS="-DVERSION='\"${VERSION_STRING}\"'" FIPTOOL=${FIPTOOL} OPENSSL_DIR=${OPENSSL_DIR} DEBUG=${DEBUG} V=${V} --no-print-directory -C ${FIPTOOLPATH} all
|
||||
-else
|
||||
-# Clear the MAKEFLAGS as we do not want
|
||||
-# to pass the gnumake flags to nmake.
|
||||
- ${Q}set MAKEFLAGS= && ${MSVC_NMAKE} /nologo /f ${FIPTOOLPATH}/Makefile.msvc FIPTOOLPATH=$(subst /,\,$(FIPTOOLPATH)) FIPTOOL=$(subst /,\,$(FIPTOOL))
|
||||
-endif
|
||||
-
|
||||
sptool: ${SPTOOL}
|
||||
${SPTOOL}: FORCE
|
||||
${Q}${MAKE} CPPFLAGS="-DVERSION='\"${VERSION_STRING}\"'" SPTOOL=${SPTOOL} --no-print-directory -C ${SPTOOLPATH}
|
||||
romlib.bin: libraries FORCE
|
||||
${Q}${MAKE} PLAT_DIR=${PLAT_DIR} BUILD_PLAT=${BUILD_PLAT} ENABLE_BTI=${ENABLE_BTI} ARM_ARCH_MINOR=${ARM_ARCH_MINOR} INCLUDES='${INCLUDES}' DEFINES='${DEFINES}' --no-print-directory -C ${ROMLIBPATH} all
|
||||
|
||||
--- a/tools/fiptool/Makefile
|
||||
+++ b/tools/fiptool/Makefile
|
||||
@@ -48,7 +48,7 @@ all: ${PROJECT}
|
||||
@@ -67,7 +67,7 @@ all: ${PROJECT}
|
||||
|
||||
${PROJECT}: ${OBJECTS} Makefile
|
||||
${PROJECT}: --openssl ${OBJECTS} Makefile
|
||||
@echo " HOSTLD $@"
|
||||
- ${Q}${HOSTCC} ${OBJECTS} -o $@ ${LDLIBS}
|
||||
+ ${Q}${HOSTCC} ${OBJECTS} -o $@ ${LDLIBS} $(LDFLAGS)
|
||||
@${ECHO_BLANK_LINE}
|
||||
@echo "Built $@ successfully"
|
||||
@${ECHO_BLANK_LINE}
|
||||
--- a/tools/nxp/plat_fiptool/plat_fiptool.mk 2023-05-20 22:28:28.079945619 +0200
|
||||
+++ b/tools/nxp/plat_fiptool/plat_fiptool.mk 2023-05-20 22:26:59.443307771 +0200
|
||||
--- a/tools/nxp/plat_fiptool/plat_fiptool.mk
|
||||
+++ b/tools/nxp/plat_fiptool/plat_fiptool.mk
|
||||
@@ -22,11 +22,11 @@ INCLUDE_PATHS += -I${PLAT_DEF_UUID_OID_C
|
||||
$(shell rm ${PLAT_DEF_UUID_CONFIG_FILE_PATH}/${PLAT_DEF_UUID_CONFIG_FILE_NAME}.o)
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@ Subject: [PATCH] tfa-layerscape: Restore ls1012afrdm support
|
||||
Signed-off-by: Wojciech Dubowik <Wojciech.Dubowik@protonmail.ch>
|
||||
---
|
||||
plat/nxp/soc-ls1012a/ls1012afrdm/ddr_init.c | 34 +++++++
|
||||
plat/nxp/soc-ls1012a/ls1012afrdm/plat_def.h | 92 +++++++++++++++++++
|
||||
plat/nxp/soc-ls1012a/ls1012afrdm/plat_def.h | 83 +++++++++++++++++++
|
||||
plat/nxp/soc-ls1012a/ls1012afrdm/platform.mk | 25 +++++
|
||||
.../soc-ls1012a/ls1012afrdm/platform_def.h | 13 +++
|
||||
plat/nxp/soc-ls1012a/ls1012afrdm/policy.h | 16 ++++
|
||||
@ -17,9 +17,6 @@ Signed-off-by: Wojciech Dubowik <Wojciech.Dubowik@protonmail.ch>
|
||||
create mode 100644 plat/nxp/soc-ls1012a/ls1012afrdm/platform_def.h
|
||||
create mode 100644 plat/nxp/soc-ls1012a/ls1012afrdm/policy.h
|
||||
|
||||
diff --git a/plat/nxp/soc-ls1012a/ls1012afrdm/ddr_init.c b/plat/nxp/soc-ls1012a/ls1012afrdm/ddr_init.c
|
||||
new file mode 100644
|
||||
index 000000000..8cb518540
|
||||
--- /dev/null
|
||||
+++ b/plat/nxp/soc-ls1012a/ls1012afrdm/ddr_init.c
|
||||
@@ -0,0 +1,34 @@
|
||||
@ -57,12 +54,9 @@ index 000000000..8cb518540
|
||||
+
|
||||
+ return NXP_DRAM0_SIZE;
|
||||
+}
|
||||
diff --git a/plat/nxp/soc-ls1012a/ls1012afrdm/plat_def.h b/plat/nxp/soc-ls1012a/ls1012afrdm/plat_def.h
|
||||
new file mode 100644
|
||||
index 000000000..eb745a0a3
|
||||
--- /dev/null
|
||||
+++ b/plat/nxp/soc-ls1012a/ls1012afrdm/plat_def.h
|
||||
@@ -0,0 +1,92 @@
|
||||
@@ -0,0 +1,83 @@
|
||||
+/*
|
||||
+ * Copyright 2022 NXP
|
||||
+ *
|
||||
@ -129,15 +123,6 @@ index 000000000..eb745a0a3
|
||||
+#define MAX_FIP_DEVICES 1
|
||||
+#endif
|
||||
+
|
||||
+#ifdef PLAT_FIP_OFFSET
|
||||
+#undef PLAT_FIP_OFFSET
|
||||
+#endif
|
||||
+#ifdef PLAT_FIP_MAX_SIZE
|
||||
+#undef PLAT_FIP_MAX_SIZE
|
||||
+#endif
|
||||
+#define PLAT_FIP_OFFSET 0x60000
|
||||
+#define PLAT_FIP_MAX_SIZE 0x170000
|
||||
+
|
||||
+/*
|
||||
+ * ID of the secure physical generic timer interrupt used by the BL32.
|
||||
+ */
|
||||
@ -155,9 +140,6 @@ index 000000000..eb745a0a3
|
||||
+#define PLAT_LS_G0_IRQ_PROPS(grp)
|
||||
+
|
||||
+#endif
|
||||
diff --git a/plat/nxp/soc-ls1012a/ls1012afrdm/platform.mk b/plat/nxp/soc-ls1012a/ls1012afrdm/platform.mk
|
||||
new file mode 100644
|
||||
index 000000000..270e92420
|
||||
--- /dev/null
|
||||
+++ b/plat/nxp/soc-ls1012a/ls1012afrdm/platform.mk
|
||||
@@ -0,0 +1,25 @@
|
||||
@ -186,9 +168,6 @@ index 000000000..270e92420
|
||||
+
|
||||
+# Adding SoC build info
|
||||
+include plat/nxp/soc-ls1012a/soc.mk
|
||||
diff --git a/plat/nxp/soc-ls1012a/ls1012afrdm/platform_def.h b/plat/nxp/soc-ls1012a/ls1012afrdm/platform_def.h
|
||||
new file mode 100644
|
||||
index 000000000..7daf1c02c
|
||||
--- /dev/null
|
||||
+++ b/plat/nxp/soc-ls1012a/ls1012afrdm/platform_def.h
|
||||
@@ -0,0 +1,13 @@
|
||||
@ -205,9 +184,6 @@ index 000000000..7daf1c02c
|
||||
+#include <plat_default_def.h>
|
||||
+
|
||||
+#endif /* PLATFORM_DEF_H */
|
||||
diff --git a/plat/nxp/soc-ls1012a/ls1012afrdm/policy.h b/plat/nxp/soc-ls1012a/ls1012afrdm/policy.h
|
||||
new file mode 100644
|
||||
index 000000000..a782d01c7
|
||||
--- /dev/null
|
||||
+++ b/plat/nxp/soc-ls1012a/ls1012afrdm/policy.h
|
||||
@@ -0,0 +1,16 @@
|
||||
@ -227,6 +203,3 @@ index 000000000..a782d01c7
|
||||
+#define POLICY_SMMU_PAGESZ_64K 0x0
|
||||
+
|
||||
+#endif /* POLICY_H */
|
||||
--
|
||||
2.34.1
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user