From 123bcb3f3889b3249678685a665ed9b5b2b22b04 Mon Sep 17 00:00:00 2001 From: Andre Przywara Date: Mon, 17 Sep 2018 00:03:09 +0100 Subject: [PATCH] allwinner: Introduce names for SoC IDs We will soon make more use of the Allwinner SoC ID, to differentiate the platform setup. Introduce definitions to avoid dealing with magic numbers and make the code more readable. Signed-off-by: Andre Przywara --- plat/allwinner/common/include/sunxi_def.h | 4 ++++ plat/allwinner/common/sunxi_bl31_setup.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/plat/allwinner/common/include/sunxi_def.h b/plat/allwinner/common/include/sunxi_def.h index e68fbe46..da87b238 100644 --- a/plat/allwinner/common/include/sunxi_def.h +++ b/plat/allwinner/common/include/sunxi_def.h @@ -14,4 +14,8 @@ #define SUNXI_UART0_BAUDRATE 115200 #define SUNXI_UART0_CLK_IN_HZ SUNXI_OSC24M_CLK_IN_HZ +#define SUNXI_SOC_A64 0x1689 +#define SUNXI_SOC_H5 0x1718 +#define SUNXI_SOC_H6 0x1728 + #endif /* __SUNXI_DEF_H__ */ diff --git a/plat/allwinner/common/sunxi_bl31_setup.c b/plat/allwinner/common/sunxi_bl31_setup.c index 7e11cecf..b56b9ee2 100644 --- a/plat/allwinner/common/sunxi_bl31_setup.c +++ b/plat/allwinner/common/sunxi_bl31_setup.c @@ -68,13 +68,13 @@ void bl31_platform_setup(void) uint16_t soc_id = sunxi_read_soc_id(); switch (soc_id) { - case 0x1689: + case SUNXI_SOC_A64: soc_name = "A64/H64/R18"; break; - case 0x1718: + case SUNXI_SOC_H5: soc_name = "H5"; break; - case 0x1728: + case SUNXI_SOC_H6: soc_name = "H6"; break; default: -- 2.30.2