riscv: cpu: nx25: Rename as ax25

Andes has rearranged the product combinations.
nx25 and ax25 both are RISC-V architecture cpu core.
But ax25 has MMU unit inside, and nx25 is not.

Cpu nx25 and platform ae250 are arranged in pairs.
Cpu ax25 and platform ae350 are arranged in pairs.

This patch will rename
nx25 as ax25
ae250 as ae350
nx25-ae250 as ax25-ae350
including filename, variable, string and definition.

Then u-boot can boot linux kernel in ae350
platform reasonably.

Signed-off-by: Rick Chen <rick@andestech.com>
Signed-off-by: Rick Chen <rickchen36@gmail.com>
Cc: Greentime Hu <green.hu@gmail.com>

diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index c50be37c9797af590cbe96fe7045a6feee9a8cbc..20a43d88e37b31d9ae7d71ecfe6755cc3aa99f1f 100644 (file)
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -8,12 +8,12 @@ choice
        prompt "Target select"
        optional
 
-config TARGET_NX25_AE250
-       bool "Support nx25-ae250"
+config TARGET_AX25_AE350
+       bool "Support ax25-ae350"
 
 endchoice
 
-source "board/AndesTech/nx25-ae250/Kconfig"
+source "board/AndesTech/ax25-ae350/Kconfig"
 
 choice
        prompt "CPU selection"

diff --git a/arch/riscv/cpu/nx25/Makefile b/arch/riscv/cpu/ax25/Makefile
similarity index 100%
rename from arch/riscv/cpu/nx25/Makefile
rename to arch/riscv/cpu/ax25/Makefile

diff --git a/arch/riscv/cpu/nx25/cpu.c b/arch/riscv/cpu/ax25/cpu.c
similarity index 93%
rename from arch/riscv/cpu/nx25/cpu.c
rename to arch/riscv/cpu/ax25/cpu.c
index 091e9ef59e0178c6525f144b6d74f2e2f5ea9c14..ab05b57d4fb7005c15405f355e55e478dce09774 100644 (file)
--- a/arch/riscv/cpu/nx25/cpu.c
+++ b/arch/riscv/cpu/ax25/cpu.c
@@ -28,5 +28,5 @@ int cleanup_before_linux(void)
 int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        disable_interrupts();
-       panic("nx25-ae250 wdt not support yet.\n");
+       panic("ax25-ae350 wdt not support yet.\n");
 }

diff --git a/arch/riscv/cpu/nx25/start.S b/arch/riscv/cpu/ax25/start.S
similarity index 100%
rename from arch/riscv/cpu/nx25/start.S
rename to arch/riscv/cpu/ax25/start.S

diff --git a/arch/riscv/cpu/nx25/u-boot.lds b/arch/riscv/cpu/ax25/u-boot.lds
similarity index 97%
rename from arch/riscv/cpu/nx25/u-boot.lds
rename to arch/riscv/cpu/ax25/u-boot.lds
index c53829a07ce93f97a5ae954e08907cb9bdb6c1ee..1589babf6c3e8ed45e8b164b7be0b113bd7da5bf 100644 (file)
--- a/arch/riscv/cpu/nx25/u-boot.lds
+++ b/arch/riscv/cpu/ax25/u-boot.lds
@@ -11,7 +11,7 @@ SECTIONS
        . = ALIGN(4);
        .text :
        {
-               arch/riscv/cpu/nx25/start.o     (.text)
+               arch/riscv/cpu/ax25/start.o     (.text)
                *(.text)
        }
 

diff --git a/arch/riscv/dts/Makefile b/arch/riscv/dts/Makefile
index 793677524a3493cf16a26e819b04ad899079e421..a1b06ffc6f0e27d3b143840265fa32db33a6423d 100644 (file)
--- a/arch/riscv/dts/Makefile
+++ b/arch/riscv/dts/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0+
 
-dtb-$(CONFIG_TARGET_NX25_AE250) += ae250.dtb
+dtb-$(CONFIG_TARGET_AX25_AE350) += ae350.dtb
 targets += $(dtb-y)
 
 DTC_FLAGS += -R 4 -p 0x1000

diff --git a/arch/riscv/dts/ae250.dts b/arch/riscv/dts/ae350.dts
similarity index 100%
rename from arch/riscv/dts/ae250.dts
rename to arch/riscv/dts/ae350.dts

diff --git a/arch/riscv/include/asm/mach-types.h b/arch/riscv/include/asm/mach-types.h
index 93afff70b350b13dc8edbe57dcf93b36d3a522cc..f219cedfd3100d98702d79f550d099d0f7bb2286 100644 (file)
--- a/arch/riscv/include/asm/mach-types.h
+++ b/arch/riscv/include/asm/mach-types.h
@@ -12,18 +12,18 @@
 extern unsigned int __machine_arch_type;
 #endif
 
-#define MACH_TYPE_AE250                1
+#define MACH_TYPE_AE350                1
 
-#ifdef CONFIG_ARCH_AE250
+#ifdef CONFIG_ARCH_AE350
 # ifdef machine_arch_type
 #  undef machine_arch_type
 #  define machine_arch_type __machine_arch_type
 # else
-#  define machine_arch_type MACH_TYPE_AE250
+#  define machine_arch_type MACH_TYPE_AE350
 # endif
-# define machine_is_ae250() (machine_arch_type == MACH_TYPE_AE250)
+# define machine_is_ae350() (machine_arch_type == MACH_TYPE_AE350)
 #else
-# define machine_is_ae250() (1)
+# define machine_is_ae350() (1)
 #endif
 
 #endif /* __ASM_RISCV_MACH_TYPE_H */