Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

riscv: sophgo: change Soc names for SG2044. #32

Closed
wants to merge 1 commit into from
+13 −13
Closed

riscv: sophgo: change Soc names for SG2044. #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions platform/generic/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion platform/generic/configs/defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions platform/generic/sophgo/objects.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
16 changes: 8 additions & 8 deletions platform/generic/sophgo/sg2260.c → platform/generic/sophgo/sg2044.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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,
};