arc: Rename AXS101 board to more generic AXS10x

PATCH New Alexey Brodkin 2 participants 4 messages Aug 4, 2016 – Aug 5, 2016 Synopsys ARC architecture

lore

Share & tools

lore

Alexey Brodkin

author

2016-08-04 12:14 UTC #0 lore raw

PATCH 1/1 arc: Rename AXS101 board to more generic AXS10x

As of now we have 2 flavors of ARC SDP boards:
1) AXS101 - with ARC770 in ASIC
2) AXS103 - with ARC HS38 in FPGA

Both options share exactly the same base-board and only differ with CPU-tiles in use. That means all peripherals are the same (they are implemented in FPGA on the base-board) and so generic board could be used for both.

While at it:
* Recreated defconfigs with savedefconfig
* In include/configs/axs10x.h numerical sizes replaced with
defines from linux/sizes.h for better readability.

Signed-off-by Alexey Brodkin <[email protected]>

Cc Tom Rini <[email protected]>

---
 arch/arc/Kconfig                                    |  8 ++++----
 arch/arc/dts/Makefile                               |  2 +-
 board/synopsys/axs101/Makefile                      |  8 --------
 board/synopsys/{axs101 => axs10x}/Kconfig           |  6 +++---
 board/synopsys/{axs101 => axs10x}/MAINTAINERS       |  6 +++---
 board/synopsys/axs10x/Makefile                      |  8 ++++++++
 board/synopsys/{axs101/axs101.c => axs10x/axs10x.c} |  0
 board/synopsys/{axs101 => axs10x}/axs10x.h          |  0
 board/synopsys/{axs101 => axs10x}/nand.c            |  0
 configs/axs101_defconfig                            |  2 +-
 configs/axs103_defconfig                            |  2 +-
 include/configs/{axs101.h => axs10x.h}              | 19 ++++++++++---------
 12 files changed, 31 insertions(+), 30 deletions(-)
 delete mode 100644 board/synopsys/axs101/Makefile
 rename board/synopsys/{axs101 => axs10x}/Kconfig (62%)
 rename board/synopsys/{axs101 => axs10x}/MAINTAINERS (62%)
 create mode 100644 board/synopsys/axs10x/Makefile
 rename board/synopsys/{axs101/axs101.c => axs10x/axs10x.c} (100%)
 rename board/synopsys/{axs101 => axs10x}/axs10x.h (100%)
 rename board/synopsys/{axs101 => axs10x}/nand.c (100%)
 rename include/configs/{axs101.h => axs10x.h} (88%)

arch/arc/Kconfig +4 -4

index b81d0ca..4c5696b 100644
@@ -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

arch/arc/dts/Makefile +1 -1

index 196f882..1d94c08 100644
@@ -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

board/synopsys/axs101/Makefile deleted +0 -8

deleted file mode 100644
index f0965f7..0000000
@@ -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

board/synopsys/axs10x/Kconfig renamed from board/synopsys/axs101/Kconfig +3 -3

similarity index 62%
rename from board/synopsys/axs101/Kconfig
rename to board/synopsys/axs10x/Kconfig
index 79e5400..c60b6a2 100644
@@ -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

board/synopsys/axs10x/MAINTAINERS renamed from board/synopsys/axs101/MAINTAINERS +3 -3

similarity index 62%
rename from board/synopsys/axs101/MAINTAINERS
rename to board/synopsys/axs10x/MAINTAINERS
index 79fff8e..abb890b 100644
@@ -1,7 +1,7 @@
-AXS101 BOARD
+AXS10X BOARD
 M:	Alexey Brodkin <[email protected]>
 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

board/synopsys/axs10x/Makefile new file +8 -0

new file mode 100644
index 0000000..e29d520
@@ -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

board/synopsys/axs10x/axs10x.c renamed from board/synopsys/axs101/axs101.c +0 -0

similarity index 100%
rename from board/synopsys/axs101/axs101.c
rename to board/synopsys/axs10x/axs10x.c

board/synopsys/axs10x/axs10x.h renamed from board/synopsys/axs101/axs10x.h +0 -0

similarity index 100%
rename from board/synopsys/axs101/axs10x.h
rename to board/synopsys/axs10x/axs10x.h

board/synopsys/axs10x/nand.c renamed from board/synopsys/axs101/nand.c +0 -0

similarity index 100%
rename from board/synopsys/axs101/nand.c
rename to board/synopsys/axs10x/nand.c

configs/axs101_defconfig +1 -1

index 10e802d..dd82581 100644
@@ -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

configs/axs103_defconfig +1 -1

index c8474de..8977f81 100644
@@ -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

include/configs/axs10x.h renamed from include/configs/axs101.h +10 -9

similarity index 88%
rename from include/configs/axs101.h
rename to include/configs/axs10x.h
index c0b68e2..b99248e 100644
@@ -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_ */

Signature · 1 line

2.7.4

Tom Rini

2016-08-04 15:02 UTC #1 lore raw

PATCH 1/1 arc: Rename AXS101 board to more generic AXS10x

Quoted 9 lines · Alexey Brodkin

As of now we have 2 flavors of ARC SDP boards:
1) AXS101 - with ARC770 in ASIC
2) AXS103 - with ARC HS38 in FPGA
Both options share exactly the same base-board and only differ with CPU-tiles in use. That means all peripherals are the same (they are implemented in FPGA on the base-board) and so generic board could be used for both.

Quoted 7 lines

While at it:
* Recreated defconfigs with savedefconfig
* In include/configs/axs10x.h numerical sizes replaced with
defines from linux/sizes.h for better readability.
Signed-off-by Alexey Brodkin <[email protected]>
Cc Tom Rini <[email protected]>

Reviewed-by Tom Rini <[email protected]>

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160804/be03217f/attachment.sig>

Alexey Brodkin

author

2016-08-05 09:59 UTC #2 lore raw

PATCH 1/1 arc: Rename AXS101 board to more generic AXS10x

Hi Tom,

Quoted 17 lines · Tom Rini

Quoted 15 lines · Alexey Brodkin
As of now we have 2 flavors of ARC SDP boards:
?1) AXS101 - with ARC770 in ASIC
?2) AXS103 - with ARC HS38 in FPGA
Both options share exactly the same base-board and only differ with CPU-tiles in use. That means all peripherals are the same (they are implemented in FPGA on the base-board) and so generic board could be used for both.
While at it:
?* Recreated defconfigs with savedefconfig
?* In include/configs/axs10x.h numerical sizes replaced with defines from linux/sizes.h for better readability.

Quoted 4 lines

Quoted 2 lines
Signed-off-by Alexey Brodkin <[email protected]>
Cc Tom Rini <[email protected]>
Reviewed-by Tom Rini <[email protected]>

I remember you once asked why do we still mention axs101 board when there's already axs103 and if there's a chance to combine them properly. And so this patch finally addresses your concern.

Thus you were in Cc list :)

-Alexey

Alexey Brodkin

author Applied

2016-08-05 10:36 UTC #3 lore raw

PATCH 1/1 arc: Rename AXS101 board to more generic AXS10x

In reply to Alexey Brodkin

Hi!

Quoted 9 lines · Alexey Brodkin

As of now we have 2 flavors of ARC SDP boards:
?1) AXS101 - with ARC770 in ASIC
?2) AXS103 - with ARC HS38 in FPGA
Both options share exactly the same base-board and only differ with CPU-tiles in use. That means all peripherals are the same (they are implemented in FPGA on the base-board) and so generic board could be used for both.

Quoted 7 lines

While at it:
?* Recreated defconfigs with savedefconfig
?* In include/configs/axs10x.h numerical sizes replaced with defines from linux/sizes.h for better readability.
Signed-off-by Alexey Brodkin <[email protected]>
Cc Tom Rini <[email protected]>

Applied,
Thanks!

-Alexey