Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-21 03:54:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(plat/rcar3): fix version judgment for R-Car D3

Browse source 
Added the process of judgment and logging for R-Car D3 Ver.1.1 and Ver.1.0.

Signed-off-by: Hideyuki Nitta <hideyuki.nitta.jf@hitachi.com>
Signed-off-by: Toshiyuki Ogasahara <toshiyuki.ogasahara.bo@hitachi.com>
Signed-off-by: Yoshifumi Hosoya <yoshifumi.hosoya.wj@renesas.com>
Change-Id: I326aa42374b70b6a4a71893561a7eaa0b6eddef0
This commit is contained in:
Toshiyuki Ogasahara 2021-07-12 19:18:57 +09:00 • committed by Marek Vasut
parent fb3406b6b5
commit c3d192b8e5
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plat/renesas/common/include/rcar_def.h
View file

@ -151,6 +151,8 @@
/* Product register */ /* Product register */
#define RCAR_PRR U(0xFFF00044) #define RCAR_PRR U(0xFFF00044)
#define RCAR_M3_CUT_VER11 U(0x00000010) /* M3 Ver.1.1/Ver.1.2 */ #define RCAR_M3_CUT_VER11 U(0x00000010) /* M3 Ver.1.1/Ver.1.2 */
#define RCAR_D3_CUT_VER10 U(0x00000000) /* D3 Ver.1.0 */
#define RCAR_D3_CUT_VER11 U(0x00000010) /* D3 Ver.1.1 */
#define RCAR_MAJOR_MASK U(0x000000F0) #define RCAR_MAJOR_MASK U(0x000000F0)
#define RCAR_MINOR_MASK U(0x0000000F) #define RCAR_MINOR_MASK U(0x0000000F)
#define PRR_PRODUCT_SHIFT U(8) #define PRR_PRODUCT_SHIFT U(8)

8
plat/renesas/rcar/bl2_plat_setup.c
View file

@ -897,6 +897,14 @@ void bl2_el3_early_platform_setup(u_register_t arg1, u_register_t arg2,
str, str,
(reg & RCAR_MINOR_MASK) + RCAR_M3_MINOR_OFFSET); (reg & RCAR_MINOR_MASK) + RCAR_M3_MINOR_OFFSET);
} }
} else if (product == PRR_PRODUCT_D3) {
if (RCAR_D3_CUT_VER10 == (reg & PRR_CUT_MASK)) {
NOTICE("BL2: PRR is R-Car %s Ver.1.0\n", str);
} else if (RCAR_D3_CUT_VER11 == (reg & PRR_CUT_MASK)) {
NOTICE("BL2: PRR is R-Car %s Ver.1.1\n", str);
} else {
NOTICE("BL2: PRR is R-Car %s Ver.X.X\n", str);
}
} else { } else {
major = (reg & RCAR_MAJOR_MASK) >> RCAR_MAJOR_SHIFT; major = (reg & RCAR_MAJOR_MASK) >> RCAR_MAJOR_SHIFT;
major = major + RCAR_MAJOR_OFFSET; major = major + RCAR_MAJOR_OFFSET;