leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

riscv: cpu: nx25: Rename as ax25

Browse Source 
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>
This commit is contained in:
Rick Chen 2018-05-29 09:54:40 +08:00 committed by Andes
parent 7215787c4e
commit 6f4dd62f33
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/riscv/Kconfig
View File

@ -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"

0
arch/riscv/cpu/nx25/Makefile → arch/riscv/cpu/ax25/Makefile
View File

2
arch/riscv/cpu/nx25/cpu.c → arch/riscv/cpu/ax25/cpu.c
View File

@ -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");
}

0
arch/riscv/cpu/nx25/start.S → arch/riscv/cpu/ax25/start.S
View File

2
arch/riscv/cpu/nx25/u-boot.lds → arch/riscv/cpu/ax25/u-boot.lds
View File

@ -11,7 +11,7 @@ SECTIONS
. = ALIGN(4);
.text :
{
arch/riscv/cpu/nx25/start.o (.text)
arch/riscv/cpu/ax25/start.o (.text)
*(.text)
}

2
arch/riscv/dts/Makefile
View File

@ -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

0
arch/riscv/dts/ae250.dts → arch/riscv/dts/ae350.dts
View File

10
arch/riscv/include/asm/mach-types.h
View File

@ -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 */