bump sys-firmware/trusted-firmware-a

This commit is contained in:
Martin Sekera 2021-08-01 01:20:16 +02:00
parent cdca2294d5
commit ae5ce48fb2
6 changed files with 74 additions and 0 deletions

View file

@ -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);

View file

@ -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

View file

@ -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:

View file

@ -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)
{

View file

@ -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
/******************************************************************************

View file

@ -17,6 +17,14 @@ TFA_ALL_PLATFORMS=( rk3288 rk3399 sun50i_a64 )
IUSE="${TFA_ALL_PLATFORMS[@]/#/tfa_platforms_}" IUSE="${TFA_ALL_PLATFORMS[@]/#/tfa_platforms_}"
REQUIRED_USE="^^ ( ${IUSE} )" 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() { tfa_get_plat() {
local plat local plat
for plat in "${TFA_ALL_PLATFORMS[@]}"; do for plat in "${TFA_ALL_PLATFORMS[@]}"; do