diff options
| -rw-r--r-- | arch/arc/Kconfig | 8 | ||||
| -rw-r--r-- | arch/arc/dts/Makefile | 2 | ||||
| -rw-r--r-- | board/synopsys/axs101/Makefile | 8 | ||||
| -rw-r--r-- | board/synopsys/axs10x/Kconfig (renamed from board/synopsys/axs101/Kconfig) | 6 | ||||
| -rw-r--r-- | board/synopsys/axs10x/MAINTAINERS (renamed from board/synopsys/axs101/MAINTAINERS) | 6 | ||||
| -rw-r--r-- | board/synopsys/axs10x/Makefile | 8 | ||||
| -rw-r--r-- | board/synopsys/axs10x/axs10x.c (renamed from board/synopsys/axs101/axs101.c) | 0 | ||||
| -rw-r--r-- | board/synopsys/axs10x/axs10x.h (renamed from board/synopsys/axs101/axs10x.h) | 0 | ||||
| -rw-r--r-- | board/synopsys/axs10x/nand.c (renamed from board/synopsys/axs101/nand.c) | 0 | ||||
| -rw-r--r-- | configs/axs101_defconfig | 2 | ||||
| -rw-r--r-- | configs/axs103_defconfig | 2 | ||||
| -rw-r--r-- | include/configs/axs10x.h (renamed from include/configs/axs101.h) | 19 |
12 files changed, 31 insertions, 30 deletions
diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig index b81d0ca3c3..4c5696be1c 100644 --- a/arch/arc/Kconfig +++ b/arch/arc/Kconfig @@ -118,7 +118,7 @@ config SYS_DCACHE_OFF choice prompt "Target select" - default TARGET_AXS101 + default TARGET_AXS10X config TARGET_TB100 bool "Support tb100" @@ -126,13 +126,13 @@ config TARGET_TB100 config TARGET_NSIM bool "Support standalone nSIM & Free nSIM" -config TARGET_AXS101 - bool "Support axs101" +config TARGET_AXS10X + bool "Support Synopsys Designware SDP board (AXS101 & AXS103)" endchoice source "board/abilis/tb100/Kconfig" source "board/synopsys/Kconfig" -source "board/synopsys/axs101/Kconfig" +source "board/synopsys/axs10x/Kconfig" endmenu diff --git a/arch/arc/dts/Makefile b/arch/arc/dts/Makefile index 196f882963..1d94c082ab 100644 --- a/arch/arc/dts/Makefile +++ b/arch/arc/dts/Makefile @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-2.0+ # -dtb-$(CONFIG_TARGET_AXS101) += axs10x.dtb +dtb-$(CONFIG_TARGET_AXS10X) += axs10x.dtb dtb-$(CONFIG_TARGET_NSIM) += nsim.dtb dtb-$(CONFIG_TARGET_TB100) += abilis_tb100.dtb diff --git a/board/synopsys/axs101/Makefile b/board/synopsys/axs101/Makefile deleted file mode 100644 index f0965f7841..0000000000 --- a/board/synopsys/axs101/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# -# Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y += axs101.o -obj-$(CONFIG_CMD_NAND) += nand.o diff --git a/board/synopsys/axs101/Kconfig b/board/synopsys/axs10x/Kconfig index 79e5400ea8..c60b6a2047 100644 --- a/board/synopsys/axs101/Kconfig +++ b/board/synopsys/axs10x/Kconfig @@ -1,12 +1,12 @@ -if TARGET_AXS101 +if TARGET_AXS10X config SYS_BOARD - default "axs101" + default "axs10x" config SYS_VENDOR default "synopsys" config SYS_CONFIG_NAME - default "axs101" + default "axs10x" endif diff --git a/board/synopsys/axs101/MAINTAINERS b/board/synopsys/axs10x/MAINTAINERS index 79fff8eb3e..abb890b714 100644 --- a/board/synopsys/axs101/MAINTAINERS +++ b/board/synopsys/axs10x/MAINTAINERS @@ -1,7 +1,7 @@ -AXS101 BOARD +AXS10X BOARD M: Alexey Brodkin <abrodkin@synopsys.com> S: Maintained -F: board/synopsys/axs101/ -F: include/configs/axs101.h +F: board/synopsys/axs10x/ +F: include/configs/axs10x.h F: configs/axs101_defconfig F: configs/axs103_defconfig diff --git a/board/synopsys/axs10x/Makefile b/board/synopsys/axs10x/Makefile new file mode 100644 index 0000000000..e29d52046f --- /dev/null +++ b/board/synopsys/axs10x/Makefile @@ -0,0 +1,8 @@ +# +# Copyright (C) 2013-2016 Synopsys, Inc. All rights reserved. +# +# SPDX-License-Identifier: GPL-2.0+ +# + +obj-y += axs10x.o +obj-$(CONFIG_CMD_NAND) += nand.o diff --git a/board/synopsys/axs101/axs101.c b/board/synopsys/axs10x/axs10x.c index a5e774b2cf..a5e774b2cf 100644 --- a/board/synopsys/axs101/axs101.c +++ b/board/synopsys/axs10x/axs10x.c diff --git a/board/synopsys/axs101/axs10x.h b/board/synopsys/axs10x/axs10x.h index 8e8c41f865..8e8c41f865 100644 --- a/board/synopsys/axs101/axs10x.h +++ b/board/synopsys/axs10x/axs10x.h diff --git a/board/synopsys/axs101/nand.c b/board/synopsys/axs10x/nand.c index 4be52e22c0..4be52e22c0 100644 --- a/board/synopsys/axs101/nand.c +++ b/board/synopsys/axs10x/nand.c diff --git a/configs/axs101_defconfig b/configs/axs101_defconfig index 10e802d655..dd82581feb 100644 --- a/configs/axs101_defconfig +++ b/configs/axs101_defconfig @@ -1,7 +1,7 @@ CONFIG_ARC=y CONFIG_SYS_DCACHE_OFF=y -CONFIG_DM_SERIAL=y CONFIG_SYS_CLK_FREQ=750000000 +CONFIG_DM_SERIAL=y CONFIG_SYS_TEXT_BASE=0x81000000 CONFIG_DEFAULT_DEVICE_TREE="axs10x" CONFIG_BOOTDELAY=3 diff --git a/configs/axs103_defconfig b/configs/axs103_defconfig index c8474de3c4..8977f81c39 100644 --- a/configs/axs103_defconfig +++ b/configs/axs103_defconfig @@ -1,7 +1,7 @@ CONFIG_ARC=y CONFIG_ISA_ARCV2=y -CONFIG_DM_SERIAL=y CONFIG_SYS_CLK_FREQ=100000000 +CONFIG_DM_SERIAL=y CONFIG_SYS_TEXT_BASE=0x81000000 CONFIG_DEFAULT_DEVICE_TREE="axs10x" CONFIG_BOOTDELAY=3 diff --git a/include/configs/axs101.h b/include/configs/axs10x.h index c0b68e2277..b99248ec98 100644 --- a/include/configs/axs101.h +++ b/include/configs/axs10x.h @@ -1,12 +1,13 @@ /* - * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. + * Copyright (C) 2013-2016 Synopsys, Inc. All rights reserved. * * SPDX-License-Identifier: GPL-2.0+ */ -#ifndef _CONFIG_AXS101_H_ -#define _CONFIG_AXS101_H_ +#ifndef _CONFIG_AXS10X_H_ +#define _CONFIG_AXS10X_H_ +#include <linux/sizes.h> /* * CPU configuration */ @@ -24,13 +25,13 @@ #define CONFIG_SYS_DDR_SDRAM_BASE 0x80000000 #define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE -#define CONFIG_SYS_SDRAM_SIZE 0x20000000 /* 512 Mb */ +#define CONFIG_SYS_SDRAM_SIZE SZ_512M #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_SDRAM_BASE + 0x1000 - GENERATED_GBL_DATA_SIZE) -#define CONFIG_SYS_MALLOC_LEN 0x200000 /* 2 MB */ -#define CONFIG_SYS_BOOTM_LEN 0x2000000 /* 32 MB */ +#define CONFIG_SYS_MALLOC_LEN SZ_2M +#define CONFIG_SYS_BOOTM_LEN SZ_32M #define CONFIG_SYS_LOAD_ADDR 0x82000000 /* @@ -113,7 +114,7 @@ * Environment settings */ #define CONFIG_ENV_IS_IN_EEPROM -#define CONFIG_ENV_SIZE 0x00200 /* 512 bytes */ +#define CONFIG_ENV_SIZE SZ_512 #define CONFIG_ENV_OFFSET 0 /* @@ -127,7 +128,7 @@ * Console configuration */ #define CONFIG_SYS_LONGHELP -#define CONFIG_SYS_CBSIZE 256 +#define CONFIG_SYS_CBSIZE SZ_256 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ sizeof(CONFIG_SYS_PROMPT) + 16) @@ -137,4 +138,4 @@ */ #define CONFIG_BOUNCE_BUFFER -#endif /* _CONFIG_AXS101_H_ */ +#endif /* _CONFIG_AXS10X_H_ */ |