Skip to contentSkip to conversation

board: axs10x switch serial port and Ethernet to driver model

PATCH New Alexey Brodkin 2 participants 3 messages Nov 13, 2015 – Nov 17, 2015 Synopsys ARC architecture

lore
Share & tools
lore

Alexey Brodkin

author
#0 lore raw

PATCH 1/1 board: axs10x switch serial port and Ethernet to driver model

With this change Synopsys DesignWare SDP board is switched to driver model for both serial port (serial_dw) and Ethernet (Designware GMAC).

This simplifies include/configs/axs101.h and allows for reuse of Linux's Device Tree description.

For simplicity Linux's .dts files are not blindly copied but only very few extracts of them are really used (those that are supported in U-Boot at the moment).

Signed-off-by Alexey Brodkin <[email protected]>
Cc Masahiro Yamada <[email protected]>
Cc Simon Glass <[email protected]>
---
 arch/arc/dts/Makefile          |  1 +
 arch/arc/dts/axs10x.dts        | 45 ++++++++++++++++++++++++++++++++++++++++++
 board/synopsys/axs101/axs101.c | 12 -----------
 configs/axs101_defconfig       | 11 ++++++++++-
 configs/axs103_defconfig       | 11 ++++++++++-
 include/configs/axs101.h       | 31 ++++++-----------------------
 6 files changed, 72 insertions(+), 39 deletions(-)
 create mode 100644 arch/arc/dts/axs10x.dts
arch/arc/dts/Makefile +1 -0
index d481fcd..d4772ec 100644
@@ -2,6 +2,7 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
+dtb-$(CONFIG_TARGET_AXS101) +=  axs10x.dtb
 dtb-$(CONFIG_TARGET_ARCANGEL4) +=  arcangel4.dtb
 dtb-$(CONFIG_TARGET_TB100) +=  abilis_tb100.dtb
arch/arc/dts/axs10x.dts new file +45 -0

45 lines not on this page · raw message

board/synopsys/axs101/axs101.c +0 -12
index aa446b9..84ee2bf 100644
@@ -7,8 +7,6 @@
 #include <common.h>
 #include <dwmmc.h>
 #include <malloc.h>
-#include <netdev.h>
-#include <phy.h>
 #include "axs10x.h"
 
 DECLARE_GLOBAL_DATA_PTR;

@@ -35,16 +33,6 @@ int board_mmc_init(bd_t *bis)
 	return 0;
 }
 
-int board_eth_init(bd_t *bis)
-{
-	if (designware_initialize(ARC_DWGMAC_BASE,
-				  PHY_INTERFACE_MODE_RGMII) >= 0)
-		return 1;
-
-	return 0;
-}
-
-
 #define AXS_MB_CREG	0xE0011000
 
 int board_early_init_f(void)
configs/axs101_defconfig +10 -1
index fdb3149..8e5d2e5 100644
@@ -1,12 +1,21 @@
 CONFIG_ARC=y
 CONFIG_SYS_DCACHE_OFF=y
 CONFIG_ARC_CACHE_LINE_SHIFT=5
+CONFIG_DM_SERIAL=y
 CONFIG_SYS_CLK_FREQ=750000000
 CONFIG_SYS_TEXT_BASE=0x81000000
+CONFIG_DEFAULT_DEVICE_TREE="axs10x"
 CONFIG_SYS_PROMPT="AXS# "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_NETDEVICES=y
+CONFIG_CMD_DHCP=y
+CONFIG_CMD_PING=y
+CONFIG_OF_CONTROL=y
+CONFIG_OF_EMBED=y
+CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_DM=y
+CONFIG_CLK=y
+CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
configs/axs103_defconfig +10 -1
index b3dbb8d..cbd63fe 100644
@@ -1,11 +1,20 @@
 CONFIG_ARC=y
 CONFIG_ISA_ARCV2=y
+CONFIG_DM_SERIAL=y
 CONFIG_SYS_CLK_FREQ=50000000
 CONFIG_SYS_TEXT_BASE=0x81000000
+CONFIG_DEFAULT_DEVICE_TREE="axs10x"
 CONFIG_SYS_PROMPT="AXS# "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_NETDEVICES=y
+CONFIG_CMD_DHCP=y
+CONFIG_CMD_PING=y
+CONFIG_OF_CONTROL=y
+CONFIG_OF_EMBED=y
+CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_DM=y
+CONFIG_CLK=y
+CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
include/configs/axs101.h +6 -25
index 450291c..9a7e0dc 100644
@@ -39,6 +39,8 @@
 #define CONFIG_BOARD_TYPES
 #define CONFIG_BOARD_EARLY_INIT_F
 
+#define CONFIG_OF_LIBFDT
+
 /*
  * NAND Flash configuration
  */

@@ -48,28 +50,14 @@
 
 /*
  * UART configuration
- *
- * CONFIG_CONS_INDEX = 1 - Debug UART
- * CONFIG_CONS_INDEX = 4 - FPGA UART connected to FTDI/USB
  */
-#define CONFIG_CONS_INDEX		4
+#define CONFIG_DW_SERIAL
 #define CONFIG_SYS_NS16550
 #define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE	-4
-#if (CONFIG_CONS_INDEX == 1)
-	/* Debug UART */
-#	define CONFIG_SYS_NS16550_CLK		33333000
-#else
-	/* FPGA UARTs use different clock */
-#	define CONFIG_SYS_NS16550_CLK		33333333
-#endif
-#define CONFIG_SYS_NS16550_COM1		(ARC_APB_PERIPHERAL_BASE + 0x5000)
-#define CONFIG_SYS_NS16550_COM2		(ARC_FPGA_PERIPHERAL_BASE + 0x20000)
-#define CONFIG_SYS_NS16550_COM3		(ARC_FPGA_PERIPHERAL_BASE + 0x21000)
-#define CONFIG_SYS_NS16550_COM4		(ARC_FPGA_PERIPHERAL_BASE + 0x22000)
+#define CONFIG_SYS_NS16550_CLK		33333333
 #define CONFIG_SYS_NS16550_MEM32
-
 #define CONFIG_BAUDRATE			115200
+
 /*
  * I2C configuration
  */

@@ -119,18 +107,11 @@
 #define CONFIG_DW_AUTONEG
 
 /*
- * Command line configuration
+ * Commands still not supported in Kconfig
  */
-#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_FAT
-#define CONFIG_CMD_I2C
 #define CONFIG_CMD_MMC
 #define CONFIG_CMD_NAND
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_RARP
-
-#define CONFIG_OF_LIBFDT
 
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_MAXARGS		16
Signature · 1 line
2.4.3
#1 lore raw

PATCH 1/1 board: axs10x switch serial port and Ethernet to driver model

Quoted 13 lines · Alexey Brodkin

With this change Synopsys DesignWare SDP board is switched to driver model for both serial port (serial_dw) and Ethernet (Designware GMAC).

This simplifies include/configs/axs101.h and allows for reuse of Linux's Device Tree description.

For simplicity Linux's .dts files are not blindly copied but only very few extracts of them are really used (those that are supported in U-Boot at the moment).

Signed-off-by Alexey Brodkin <[email protected]>
Cc Masahiro Yamada <[email protected]>
Cc Simon Glass <[email protected]>
Quoted 9 lines
---
 arch/arc/dts/Makefile          |  1 +
 arch/arc/dts/axs10x.dts        | 45 ++++++++++++++++++++++++++++++++++++++++++
 board/synopsys/axs101/axs101.c | 12 -----------
 configs/axs101_defconfig       | 11 ++++++++++-
 configs/axs103_defconfig       | 11 ++++++++++-
 include/configs/axs101.h       | 31 ++++++-----------------------
 6 files changed, 72 insertions(+), 39 deletions(-)
 create mode 100644 arch/arc/dts/axs10x.dts
Reviewed-by Simon Glass <[email protected]>
author Applied
#2 lore raw

PATCH 1/1 board: axs10x switch serial port and Ethernet to driver model

Hi,

Quoted 25 lines · Simon Glass
Quoted 13 lines · Alexey Brodkin

With this change Synopsys DesignWare SDP board is switched to driver model for both serial port (serial_dw) and Ethernet (Designware GMAC).

This simplifies include/configs/axs101.h and allows for reuse of Linux's Device Tree description.

For simplicity Linux's .dts files are not blindly copied but only very few extracts of them are really used (those that are supported in U-Boot at the moment).

Signed-off-by Alexey Brodkin <[email protected]>
Cc Masahiro Yamada <[email protected]>
Cc Simon Glass <[email protected]>
Quoted 9 lines
---
 arch/arc/dts/Makefile          |  1 +
 arch/arc/dts/axs10x.dts        | 45 ++++++++++++++++++++++++++++++++++++++++++
 board/synopsys/axs101/axs101.c | 12 -----------
 configs/axs101_defconfig       | 11 ++++++++++-
 configs/axs103_defconfig       | 11 ++++++++++-
 include/configs/axs101.h       | 31 ++++++-----------------------
 6 files changed, 72 insertions(+), 39 deletions(-)
 create mode 100644 arch/arc/dts/axs10x.dts
Quoted 1 line
Reviewed-by Simon Glass <[email protected]>

Applied, thanks!

-Alexey