From ae5ce48fb23f6420af0266376ea88c1dc90fda80 Mon Sep 17 00:00:00 2001 From: Martin Sekera Date: Sun, 1 Aug 2021 01:20:16 +0200 Subject: [PATCH] bump sys-firmware/trusted-firmware-a --- .../files/0001-Fix-build-with-gcc-11.patch | 13 +++++++++++++ .../files/0001-dram-Fix-build-with-gcc-11.patch | 13 +++++++++++++ ...ros.S-Use-compatible-.asciz-asm-directive.patch | 14 ++++++++++++++ ...ot-mark-already-defined-functions-as-weak.patch | 13 +++++++++++++ .../files/serial-console-baudrate.patch | 13 +++++++++++++ ...-a-2.4.ebuild => trusted-firmware-a-2.5.ebuild} | 8 ++++++++ 6 files changed, 74 insertions(+) create mode 100644 sys-firmware/trusted-firmware-a/files/0001-Fix-build-with-gcc-11.patch create mode 100644 sys-firmware/trusted-firmware-a/files/0001-dram-Fix-build-with-gcc-11.patch create mode 100644 sys-firmware/trusted-firmware-a/files/0001-plat_macros.S-Use-compatible-.asciz-asm-directive.patch create mode 100644 sys-firmware/trusted-firmware-a/files/0001-pmu-Do-not-mark-already-defined-functions-as-weak.patch create mode 100644 sys-firmware/trusted-firmware-a/files/serial-console-baudrate.patch rename sys-firmware/trusted-firmware-a/{trusted-firmware-a-2.4.ebuild => trusted-firmware-a-2.5.ebuild} (75%) diff --git a/sys-firmware/trusted-firmware-a/files/0001-Fix-build-with-gcc-11.patch b/sys-firmware/trusted-firmware-a/files/0001-Fix-build-with-gcc-11.patch new file mode 100644 index 0000000..de3e927 --- /dev/null +++ b/sys-firmware/trusted-firmware-a/files/0001-Fix-build-with-gcc-11.patch @@ -0,0 +1,13 @@ +diff --git a/plat/rockchip/rk3399/drivers/dram/dram.h b/plat/rockchip/rk3399/drivers/dram/dram.h +index 0eb12cf29..5572b1612 100644 +--- a/plat/rockchip/rk3399/drivers/dram/dram.h ++++ b/plat/rockchip/rk3399/drivers/dram/dram.h +@@ -149,7 +149,7 @@ struct rk3399_sdram_params { + uint32_t rx_cal_dqs[2][4]; + }; + +-extern __sramdata struct rk3399_sdram_params sdram_config; ++extern struct rk3399_sdram_params sdram_config; + + void dram_init(void); + diff --git a/sys-firmware/trusted-firmware-a/files/0001-dram-Fix-build-with-gcc-11.patch b/sys-firmware/trusted-firmware-a/files/0001-dram-Fix-build-with-gcc-11.patch new file mode 100644 index 0000000..5a2caa8 --- /dev/null +++ b/sys-firmware/trusted-firmware-a/files/0001-dram-Fix-build-with-gcc-11.patch @@ -0,0 +1,13 @@ +diff --git a/plat/rockchip/rk3399/drivers/dram/dram_spec_timing.c b/plat/rockchip/rk3399/drivers/dram/dram_spec_timing.c +index 3cdb7a296..76bc5ee96 100644 +--- a/plat/rockchip/rk3399/drivers/dram/dram_spec_timing.c ++++ b/plat/rockchip/rk3399/drivers/dram/dram_spec_timing.c +@@ -778,7 +778,7 @@ static void lpddr3_get_parameter(struct timing_related_config *timing_config, + else if (twr_tmp <= 8) + twr_tmp = 8; + else if (twr_tmp <= 12) +- twr_tmp = twr_tmp; ++ ; /* do nothing */ + else if (twr_tmp <= 14) + twr_tmp = 14; + else diff --git a/sys-firmware/trusted-firmware-a/files/0001-plat_macros.S-Use-compatible-.asciz-asm-directive.patch b/sys-firmware/trusted-firmware-a/files/0001-plat_macros.S-Use-compatible-.asciz-asm-directive.patch new file mode 100644 index 0000000..5927137 --- /dev/null +++ b/sys-firmware/trusted-firmware-a/files/0001-plat_macros.S-Use-compatible-.asciz-asm-directive.patch @@ -0,0 +1,14 @@ +diff --git a/plat/rockchip/common/include/plat_macros.S b/plat/rockchip/common/include/plat_macros.S +index 691beeb44..c07be9ca9 100644 +--- a/plat/rockchip/common/include/plat_macros.S ++++ b/plat/rockchip/common/include/plat_macros.S +@@ -23,8 +23,7 @@ icc_regs: + + /* Registers common to both GICv2 and GICv3 */ + gicd_pend_reg: +- .asciz "gicd_ispendr regs (Offsets 0x200 - 0x278)\n" \ +- " Offset:\t\t\tvalue\n" ++ .asciz "gicd_ispendr regs (Offsets 0x200 - 0x278)\n Offset:\t\t\tvalue\n" + newline: + .asciz "\n" + spacer: diff --git a/sys-firmware/trusted-firmware-a/files/0001-pmu-Do-not-mark-already-defined-functions-as-weak.patch b/sys-firmware/trusted-firmware-a/files/0001-pmu-Do-not-mark-already-defined-functions-as-weak.patch new file mode 100644 index 0000000..846b972 --- /dev/null +++ b/sys-firmware/trusted-firmware-a/files/0001-pmu-Do-not-mark-already-defined-functions-as-weak.patch @@ -0,0 +1,13 @@ +diff --git a/plat/rockchip/common/drivers/pmu/pmu_com.h b/plat/rockchip/common/drivers/pmu/pmu_com.h +index 5359f73b4..3f9ce7df9 100644 +--- a/plat/rockchip/common/drivers/pmu/pmu_com.h ++++ b/plat/rockchip/common/drivers/pmu/pmu_com.h +@@ -32,8 +32,6 @@ enum pmu_pd_state { + }; + + #pragma weak plat_ic_get_pending_interrupt_id +-#pragma weak pmu_power_domain_ctr +-#pragma weak check_cpu_wfie + + static inline uint32_t pmu_power_domain_st(uint32_t pd) + { diff --git a/sys-firmware/trusted-firmware-a/files/serial-console-baudrate.patch b/sys-firmware/trusted-firmware-a/files/serial-console-baudrate.patch new file mode 100644 index 0000000..b32d546 --- /dev/null +++ b/sys-firmware/trusted-firmware-a/files/serial-console-baudrate.patch @@ -0,0 +1,13 @@ +diff --git a/plat/rockchip/rk3399/rk3399_def.h b/plat/rockchip/rk3399/rk3399_def.h +index ba83242eb..8d6ecfbe6 100644 +--- a/plat/rockchip/rk3399/rk3399_def.h ++++ b/plat/rockchip/rk3399/rk3399_def.h +@@ -17,7 +17,7 @@ + /************************************************************************** + * UART related constants + **************************************************************************/ +-#define RK3399_BAUDRATE 115200 ++#define RK3399_BAUDRATE 1500000 + #define RK3399_UART_CLOCK 24000000 + + /****************************************************************************** diff --git a/sys-firmware/trusted-firmware-a/trusted-firmware-a-2.4.ebuild b/sys-firmware/trusted-firmware-a/trusted-firmware-a-2.5.ebuild similarity index 75% rename from sys-firmware/trusted-firmware-a/trusted-firmware-a-2.4.ebuild rename to sys-firmware/trusted-firmware-a/trusted-firmware-a-2.5.ebuild index bb54ec1..d77e409 100644 --- a/sys-firmware/trusted-firmware-a/trusted-firmware-a-2.4.ebuild +++ b/sys-firmware/trusted-firmware-a/trusted-firmware-a-2.5.ebuild @@ -17,6 +17,14 @@ TFA_ALL_PLATFORMS=( rk3288 rk3399 sun50i_a64 ) IUSE="${TFA_ALL_PLATFORMS[@]/#/tfa_platforms_}" REQUIRED_USE="^^ ( ${IUSE} )" +PATCHES=( + "${FILESDIR}"/0001-dram-Fix-build-with-gcc-11.patch + "${FILESDIR}"/0001-Fix-build-with-gcc-11.patch + "${FILESDIR}"/0001-plat_macros.S-Use-compatible-.asciz-asm-directive.patch + "${FILESDIR}"/0001-pmu-Do-not-mark-already-defined-functions-as-weak.patch + "${FILESDIR}"/serial-console-baudrate.patch +) + tfa_get_plat() { local plat for plat in "${TFA_ALL_PLATFORMS[@]}"; do