MIRRORS/meta-rockchip
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-rockchip.git synced 2025-07-19 12:49:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

trusted-firmware-a: Drop 0001-Fix-build-with-gcc-11.patch

Browse Source 
This has been included upstream see [1]

[1] f943b7c8e2%5E%21/#F0

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj 2021-12-08 11:54:04 -08:00 committed by Trevor Woerner
parent 26b758fc71
commit bd1899239b
2 changed files with 0 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
recipes-bsp/trusted-firmware-a/files/0001-Fix-build-with-gcc-11.patch
View File

@ -1,34 +0,0 @@
From d4c60a312271e000e8339f0b47a302c325313758 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 11 May 2021 11:46:30 -0700
Subject: [PATCH] Fix build with gcc 11
Fixes
plat/rockchip/rk3399/drivers/dram/dram.c:13:22: error: ignoring attribute 'section (".pmusram.data")' because it conflicts with previous 'section (".sram.data")' [-Werror=attributes]
See [1]
[1] https://developer.trustedfirmware.org/T925
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
plat/rockchip/rk3399/drivers/dram/dram.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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);
--
2.31.1

1
recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
View File

@ -8,7 +8,6 @@ COMPATIBLE_MACHINE:append:rk3328 = "|rk3328"
FILESEXTRAPATHS:prepend := "${THISDIR}/files:" FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
SRC_URI += "\ SRC_URI += "\
file://serial-console-baudrate.patch \ file://serial-console-baudrate.patch \
file://0001-Fix-build-with-gcc-11.patch \
file://0001-dram-Fix-build-with-gcc-11.patch \ file://0001-dram-Fix-build-with-gcc-11.patch \
file://0001-plat_macros.S-Use-compatible-.asciz-asm-directive.patch \ file://0001-plat_macros.S-Use-compatible-.asciz-asm-directive.patch \
file://0001-pmu-Do-not-mark-already-defined-functions-as-weak.patch \ file://0001-pmu-Do-not-mark-already-defined-functions-as-weak.patch \