riscv: cpu: nx25: Rename as ax25
PATCH 1/4 riscv: cpu: nx25: Rename as ax25
From: Rick Chen <[email protected]>
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 <[email protected]>
Signed-off-by Rick Chen <[email protected]>
Cc Greentime Hu <[email protected]>
--- arch/riscv/Kconfig | 6 +- arch/riscv/cpu/ax25/Makefile | 10 ++ arch/riscv/cpu/ax25/cpu.c | 33 ++++ arch/riscv/cpu/ax25/start.S | 293 ++++++++++++++++++++++++++++++++++++ arch/riscv/cpu/ax25/u-boot.lds | 85 +++++++++++ arch/riscv/cpu/nx25/Makefile | 10 -- arch/riscv/cpu/nx25/cpu.c | 33 ---- arch/riscv/cpu/nx25/start.S | 293 ------------------------------------ arch/riscv/cpu/nx25/u-boot.lds | 85 ----------- arch/riscv/dts/Makefile | 2 +- arch/riscv/dts/ae250.dts | 97 ------------ arch/riscv/dts/ae350.dts | 97 ++++++++++++ arch/riscv/include/asm/mach-types.h | 10 +- 13 files changed, 527 insertions(+), 527 deletions(-) create mode 100644 arch/riscv/cpu/ax25/Makefile create mode 100644 arch/riscv/cpu/ax25/cpu.c create mode 100644 arch/riscv/cpu/ax25/start.S create mode 100644 arch/riscv/cpu/ax25/u-boot.lds delete mode 100644 arch/riscv/cpu/nx25/Makefile delete mode 100644 arch/riscv/cpu/nx25/cpu.c delete mode 100644 arch/riscv/cpu/nx25/start.S delete mode 100644 arch/riscv/cpu/nx25/u-boot.lds delete mode 100644 arch/riscv/dts/ae250.dts create mode 100644 arch/riscv/dts/ae350.dts
arch/riscv/Kconfig +3 -3
@@ -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"
arch/riscv/cpu/ax25/Makefile new file +10 -0
@@ -0,0 +1,10 @@ +# +# Copyright (C) 2017 Andes Technology Corporation +# Rick Chen, Andes Technology Corporation <[email protected]> +# +# SPDX-License-Identifier: GPL-2.0+ +# + +extra-y = start.o + +obj-y := cpu.o
arch/riscv/cpu/ax25/cpu.c new file +33 -0
@@ -0,0 +1,33 @@ +/* +* Copyright (C) 2017 Andes Technology Corporation +* Rick Chen, Andes Technology Corporation <[email protected]> +* +* SPDX-License-Identifier: GPL-2.0+ +*/ + +/* CPU specific code */ +#include <common.h> +#include <command.h> +#include <watchdog.h> +#include <asm/cache.h> + +/* +* cleanup_before_linux() is called just before we call linux +* it prepares the processor for linux +* +* we disable interrupt and caches. +*/ +int cleanup_before_linux (void ) +{ +disable_interrupts (); + +/* turn off I/D-cache */ + +return 0 ; +} + +int do_reset (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) +{ +disable_interrupts (); +panic ("ax25-ae350 wdt not support yet.\n" ); +}
arch/riscv/cpu/ax25/start.S new file +293 -0
293 lines not on this page · raw message
arch/riscv/cpu/ax25/u-boot.lds new file +85 -0
85 lines not on this page · raw message
arch/riscv/cpu/nx25/Makefile deleted +0 -10
@@ -1,10 +0,0 @@ -# -# Copyright (C) 2017 Andes Technology Corporation -# Rick Chen, Andes Technology Corporation <[email protected]> -# -# SPDX-License-Identifier: GPL-2.0+ -# - -extra-y = start.o - -obj-y := cpu.o
arch/riscv/cpu/nx25/cpu.c deleted +0 -33
@@ -1,33 +0,0 @@ -/* -* Copyright (C) 2017 Andes Technology Corporation -* Rick Chen, Andes Technology Corporation <[email protected]> -* -* SPDX-License-Identifier: GPL-2.0+ -*/ - -/* CPU specific code */ -#include <common.h> -#include <command.h> -#include <watchdog.h> -#include <asm/cache.h> - -/* -* cleanup_before_linux() is called just before we call linux -* it prepares the processor for linux -* -* we disable interrupt and caches. -*/ -int cleanup_before_linux (void ) -{ -disable_interrupts (); - -/* turn off I/D-cache */ - -return 0 ; -} - -int do_reset (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) -{ -disable_interrupts (); -panic ("nx25-ae250 wdt not support yet.\n" ); -}
arch/riscv/cpu/nx25/start.S deleted +0 -293
293 lines not on this page · raw message
arch/riscv/cpu/nx25/u-boot.lds deleted +0 -85
85 lines not on this page · raw message
arch/riscv/dts/Makefile +1 -1
@@ -2,7 +2,7 @@ # 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
arch/riscv/dts/ae250.dts deleted +0 -97
97 lines not on this page · raw message
arch/riscv/dts/ae350.dts new file +97 -0
97 lines not on this page · raw message
arch/riscv/include/asm/mach-types.h +5 -5
@@ -13,18 +13,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 */
Signature · 1 line
2.7.4