From f68a7ee6dd346445e7f1ee2972f9cf6cc31069ed Mon Sep 17 00:00:00 2001 From: "dong.yang" Date: Wed, 28 Aug 2024 09:21:38 +0800 Subject: [PATCH] riscv: sophgo: change soc name to SG2044. --- platform/generic/Kconfig | 4 ++-- platform/generic/configs/defconfig | 2 +- platform/generic/sophgo/objects.mk | 4 ++-- platform/generic/sophgo/{sg2260.c => sg2044.c} | 16 ++++++++-------- 4 files changed, 13 insertions(+), 13 deletions(-) rename platform/generic/sophgo/{sg2260.c => sg2044.c} (66%) diff --git a/platform/generic/Kconfig b/platform/generic/Kconfig index 2e7549cfb8..c28ec88b1d 100644 --- a/platform/generic/Kconfig +++ b/platform/generic/Kconfig @@ -58,8 +58,8 @@ config PLATFORM_SOPHGO_SG2042 select THEAD_C9XX_PMU default n -config PLATFORM_SOPHGO_SG2260 - bool "Sophgo sg2260 support" +config PLATFORM_SOPHGO_SG2044 + bool "Sophgo sg2044 support" select THEAD_C9XX_PMU default n diff --git a/platform/generic/configs/defconfig b/platform/generic/configs/defconfig index aeb3fb09bc..dc563801de 100644 --- a/platform/generic/configs/defconfig +++ b/platform/generic/configs/defconfig @@ -4,7 +4,7 @@ CONFIG_PLATFORM_RENESAS_RZFIVE=y CONFIG_PLATFORM_SIFIVE_FU540=y CONFIG_PLATFORM_SIFIVE_FU740=y CONFIG_PLATFORM_SOPHGO_SG2042=y -CONFIG_PLATFORM_SOPHGO_SG2260=y +CONFIG_PLATFORM_SOPHGO_SG2044=y CONFIG_PLATFORM_STARFIVE_JH7110=y CONFIG_PLATFORM_THEAD=y CONFIG_FDT_GPIO=y diff --git a/platform/generic/sophgo/objects.mk b/platform/generic/sophgo/objects.mk index 1eb01a81a5..022f6a7e47 100644 --- a/platform/generic/sophgo/objects.mk +++ b/platform/generic/sophgo/objects.mk @@ -7,5 +7,5 @@ carray-platform_override_modules-$(CONFIG_PLATFORM_SOPHGO_SG2042) += sophgo_sg2042 platform-objs-$(CONFIG_PLATFORM_SOPHGO_SG2042) += sophgo/sg2042.o -carray-platform_override_modules-$(CONFIG_PLATFORM_SOPHGO_SG2260) += sophgo_sg2260 -platform-objs-$(CONFIG_PLATFORM_SOPHGO_SG2260) += sophgo/sg2260.o +carray-platform_override_modules-$(CONFIG_PLATFORM_SOPHGO_SG2044) += sophgo_sg2044 +platform-objs-$(CONFIG_PLATFORM_SOPHGO_SG2044) += sophgo/sg2044.o diff --git a/platform/generic/sophgo/sg2260.c b/platform/generic/sophgo/sg2044.c similarity index 66% rename from platform/generic/sophgo/sg2260.c rename to platform/generic/sophgo/sg2044.c index f2873a786e..9b1bd189eb 100644 --- a/platform/generic/sophgo/sg2260.c +++ b/platform/generic/sophgo/sg2044.c @@ -21,7 +21,7 @@ static u32 selected_hartid = -1; -static bool sg2260_cold_boot_allowed(u32 hartid, +static bool sg2044_cold_boot_allowed(u32 hartid, const struct fdt_match *match) { if (selected_hartid != -1) @@ -30,20 +30,20 @@ static bool sg2260_cold_boot_allowed(u32 hartid, return true; } -static int sg2260_extensions_init(const struct fdt_match *match, +static int sg2044_extensions_init(const struct fdt_match *match, struct sbi_hart_features *hfeatures) { thead_c9xx_register_pmu_device(); return 0; } -static const struct fdt_match sophgo_sg2260_match[] = { - { .compatible = "sophgo, sg2260" }, +static const struct fdt_match sophgo_sg2044_match[] = { + { .compatible = "sophgo,sg2044" }, { }, }; -const struct platform_override sophgo_sg2260 = { - .match_table = sophgo_sg2260_match, - .cold_boot_allowed = sg2260_cold_boot_allowed, - .extensions_init = sg2260_extensions_init, +const struct platform_override sophgo_sg2044 = { + .match_table = sophgo_sg2044_match, + .cold_boot_allowed = sg2044_cold_boot_allowed, + .extensions_init = sg2044_extensions_init, };