aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDuncan Bellamy <dunk@denkimushi.com>2022-10-02 08:11:40 +0000
committerBart Ribbers <bribbers@disroot.org>2022-11-24 07:11:41 +0000
commitc05c557af8d1def57ecf1429af79769c305f45a8 (patch)
tree58fbf91331441d61f96b315c8378b11fc4ca038d
parenteff06caa2faffbd431f0b0c83e518b04edf099f3 (diff)
downloadaports-c05c557af8d1def57ecf1429af79769c305f45a8.tar.gz
aports-c05c557af8d1def57ecf1429af79769c305f45a8.tar.bz2
aports-c05c557af8d1def57ecf1429af79769c305f45a8.tar.xz
main/arm-trusted-firmware: add comment to patch
-rw-r--r--main/arm-trusted-firmware/APKBUILD2
-rw-r--r--main/arm-trusted-firmware/rk3399.patch29
2 files changed, 30 insertions, 1 deletions
diff --git a/main/arm-trusted-firmware/APKBUILD b/main/arm-trusted-firmware/APKBUILD
index 3e7da79f6a..3e05130070 100644
--- a/main/arm-trusted-firmware/APKBUILD
+++ b/main/arm-trusted-firmware/APKBUILD
@@ -79,5 +79,5 @@ tools() {
sha512sums="
3e1e09bcc69a0f080f91b94d9c8da6dd0b27b86292599c280438d7b6f594017a896af7cfc58d9d22053f77b5daa2faecd51a59505c755eac8493e4e0fd1e9203 arm-trusted-firmware-v2.7.0.tar.gz
f2ff9b6d2b843123e9044af5ead00a1e927e5389e5ab6bdb05ef0eb3a23468a615d6203e14afd05b3e250c9b39836d0d33920833f1211b51671ae5cd3e7e0da8 key_t.patch
-3ab4f24357c9f92b72e99ee4d8c4e676e8a03dcc8fc12fcf698d7776cf8fbf00ed3db8e78b279f3262b740aff5a094ea7ee372a45921fcca93f56199c617c1b4 rk3399.patch
+4b26d06cc5f23cd73515927624c164745dd144a0255a717052d80d904a58e001cb7b334ce1fa20cf21ba18b6e0f024da011321cb2c53dfb44ddd52ee24e31a66 rk3399.patch
"
diff --git a/main/arm-trusted-firmware/rk3399.patch b/main/arm-trusted-firmware/rk3399.patch
index 375da9096b..ffbb475507 100644
--- a/main/arm-trusted-firmware/rk3399.patch
+++ b/main/arm-trusted-firmware/rk3399.patch
@@ -1,3 +1,6 @@
+
+
+
diff --git a/plat/rockchip/rk3399/drivers/m0/Makefile b/plat/rockchip/rk3399/drivers/m0/Makefile
index 79e09f0..5ab6d28 100644
--- a/plat/rockchip/rk3399/drivers/m0/Makefile
@@ -21,4 +24,30 @@ index 79e09f0..5ab6d28 100644
+OC := llvm-objcopy
OD := ${M0_CROSS_COMPILE}objdump
NM := ${M0_CROSS_COMPILE}nm
+
+
+Needed to stop linker errors with ldd:
+ld.lld: error: section .ARM.exidx virtual address range overlaps with .m0_bin
+489>>> .ARM.exidx range is [0x0, 0xF]
+490>>> .m0_bin range is [0x0, 0x267]
+491ld.lld: error: section .ARM.exidx load address range overlaps with .m0_bin
+492>>> .ARM.exidx range is [0x0, 0xF]
+493>>> .m0_bin range is [0x0, 0x267]
+494ld.lld: error: section .ARM.exidx virtual address range overlaps with .m0_bin
+495>>> .ARM.exidx range is [0x0, 0xF]
+496>>> .m0_bin range is [0x0, 0x347]
+497ld.lld: error: section .ARM.exidx load address range overlaps with .m0_bin
+498>>> .ARM.exidx range is [0x0, 0xF]
+499>>> .m0_bin range is [0x0, 0x347]
+diff --git a/plat/rockchip/rk3399/drivers/m0/src/rk3399m0.ld.S b/plat/rockchip/rk3399/drivers/m0/src/rk3399m0.ld.S
+index bfe054e..fedb012 100644
+--- a/plat/rockchip/rk3399/drivers/m0/src/rk3399m0.ld.S
++++ b/plat/rockchip/rk3399/drivers/m0/src/rk3399m0.ld.S
+@@ -22,5 +22,5 @@ SECTIONS {
+ *(.co_stack*)
+ }
+
+- /DISCARD/ : { *(.comment) *(.note*) }
++ /DISCARD/ : { *(.comment) *(.note*) *(.ARM.exidx) }
+ }