boards: cleanup and update the default config of arc boards

apply to snps arc boards Signed-off-by: Wayne Ren <[email protected]>
zephyrproject-rtos · Aug 24, 2018 · 0be1875 · 0be1875
1 parent 5c3198e
commit 0be1875
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 44 deletions.
diff --git a/arch/arc/defconfig b/arch/arc/defconfig
@@ -1,6 +1,5 @@
 CONFIG_ARC=y
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=32000000
 CONFIG_CPU_ARCEM4=y
-CONFIG_CPU_ARCV2=y
 CONFIG_ARCV2_INTERRUPT_UNIT=y
 CONFIG_ARCV2_TIMER=y
diff --git a/boards/arc/em_starterkit/Kconfig.defconfig b/boards/arc/em_starterkit/Kconfig.defconfig
@@ -4,6 +4,9 @@ if BOARD_EM_STARTERKIT
 config BOARD
 	default "em_starterkit"
 
+config CPU_ARCEM4
+	def_bool y
+
 if GPIO
 
 config GPIO_DW
@@ -47,22 +50,19 @@ endif # I2C_DW
 
 endif # I2C
 
-if UART_NS16550
-
-config UART_NS16550_PORT_0
-	def_bool n
+if SERIAL
 
-config UART_NS16550_PORT_1
+config UART_NS16550
 	def_bool y
 
-endif # UART_NS16550
+endif # SERIAL
 
 if UART_CONSOLE
 
-config UART_CONSOLE_ON_DEV_NAME
-	default "UART_1"
+config UART_NS16550_PORT_1
+	def_bool y
 
-endif
+endif # UART_CONSOLE
 
 if SPI
 

diff --git a/boards/arc/em_starterkit/em_starterkit_defconfig b/boards/arc/em_starterkit/em_starterkit_defconfig
@@ -7,16 +7,10 @@ CONFIG_SYS_CLOCK_TICKS_PER_SEC=100
 CONFIG_XIP=n
 CONFIG_BUILD_OUTPUT_BIN=n
 CONFIG_PRINTK=y
-CONFIG_CPU_ARCEM4=y
-CONFIG_CPU_ARCV2=y
 CONFIG_ARCV2_INTERRUPT_UNIT=y
 CONFIG_ARCV2_TIMER=y
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
 CONFIG_SERIAL=y
-CONFIG_SERIAL_HAS_DRIVER=y
-CONFIG_UART_NS16550=y
-CONFIG_UART_NS16550_PORT_1=y
-CONFIG_UART_NS16550_PORT_0=n
 CONFIG_UART_INTERRUPT_DRIVEN=y
 CONFIG_GPIO=y
diff --git a/boards/arc/em_starterkit/em_starterkit_em11d_defconfig b/boards/arc/em_starterkit/em_starterkit_em11d_defconfig
@@ -7,16 +7,10 @@ CONFIG_SYS_CLOCK_TICKS_PER_SEC=100
 CONFIG_XIP=n
 CONFIG_BUILD_OUTPUT_BIN=n
 CONFIG_PRINTK=y
-CONFIG_CPU_ARCEM4=y
-CONFIG_CPU_ARCV2=y
 CONFIG_ARCV2_INTERRUPT_UNIT=y
 CONFIG_ARCV2_TIMER=y
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
 CONFIG_SERIAL=y
-CONFIG_SERIAL_HAS_DRIVER=y
-CONFIG_UART_NS16550=y
-CONFIG_UART_NS16550_PORT_1=y
-CONFIG_UART_NS16550_PORT_0=n
 CONFIG_UART_INTERRUPT_DRIVEN=y
 CONFIG_GPIO=y
diff --git a/boards/arc/em_starterkit/em_starterkit_em7d_defconfig b/boards/arc/em_starterkit/em_starterkit_em7d_defconfig
@@ -7,17 +7,11 @@ CONFIG_SYS_CLOCK_TICKS_PER_SEC=100
 CONFIG_XIP=n
 CONFIG_BUILD_OUTPUT_BIN=n
 CONFIG_PRINTK=y
-CONFIG_CPU_ARCEM4=y
-CONFIG_CPU_ARCV2=y
 CONFIG_ARCV2_INTERRUPT_UNIT=y
 CONFIG_ARCV2_TIMER=y
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
 CONFIG_SERIAL=y
-CONFIG_SERIAL_HAS_DRIVER=y
-CONFIG_UART_NS16550=y
-CONFIG_UART_NS16550_PORT_1=y
-CONFIG_UART_NS16550_PORT_0=n
 CONFIG_UART_INTERRUPT_DRIVEN=y
 CONFIG_GPIO=y
 CONFIG_ARC_MPU_ENABLE=y
diff --git a/boards/arc/em_starterkit/em_starterkit_em7d_v22_defconfig b/boards/arc/em_starterkit/em_starterkit_em7d_v22_defconfig
@@ -7,17 +7,11 @@ CONFIG_SYS_CLOCK_TICKS_PER_SEC=100
 CONFIG_XIP=n
 CONFIG_BUILD_OUTPUT_BIN=n
 CONFIG_PRINTK=y
-CONFIG_CPU_ARCEM4=y
-CONFIG_CPU_ARCV2=y
 CONFIG_ARCV2_INTERRUPT_UNIT=y
 CONFIG_ARCV2_TIMER=y
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
 CONFIG_SERIAL=y
-CONFIG_SERIAL_HAS_DRIVER=y
-CONFIG_UART_NS16550=y
-CONFIG_UART_NS16550_PORT_1=y
-CONFIG_UART_NS16550_PORT_0=n
 CONFIG_UART_INTERRUPT_DRIVEN=y
 CONFIG_GPIO=y
 CONFIG_ARC_MPU_ENABLE=y
diff --git a/boards/arc/nsim_em/Kconfig.defconfig b/boards/arc/nsim_em/Kconfig.defconfig
@@ -4,4 +4,18 @@ if BOARD_NSIM_EM
 config BOARD
 	default "nsim_em"
 
+config CPU_ARCEM4
+	def_bool y
+
+if SERIAL
+
+config UART_NSIM
+	def_bool y
+
+config UART_NSIM_PORT_0_BASE_ADDR
+	default 0xf0000000
+
+endif # SERIAL
+
+
 endif # BOARD_NSIM_EM
diff --git a/boards/arc/nsim_em/nsim_em_defconfig b/boards/arc/nsim_em/nsim_em_defconfig
@@ -6,14 +6,9 @@ CONFIG_SYS_CLOCK_TICKS_PER_SEC=100
 CONFIG_XIP=n
 CONFIG_BUILD_OUTPUT_BIN=n
 CONFIG_PRINTK=y
-CONFIG_CPU_ARCEM4=y
-CONFIG_CPU_ARCV2=y
 CONFIG_ARCV2_INTERRUPT_UNIT=y
 CONFIG_ARCV2_TIMER=y
 CONFIG_ARC_MPU_ENABLE=y
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
 CONFIG_SERIAL=y
-CONFIG_SERIAL_HAS_DRIVER=y
-CONFIG_UART_NSIM=y
-CONFIG_UART_NSIM_PORT_0_BASE_ADDR=0xf0000000
diff --git a/boards/arc/nsim_em/nsim_sem_defconfig b/boards/arc/nsim_em/nsim_sem_defconfig
@@ -6,14 +6,9 @@ CONFIG_SYS_CLOCK_TICKS_PER_SEC=100
 CONFIG_XIP=n
 CONFIG_BUILD_OUTPUT_BIN=n
 CONFIG_PRINTK=y
-CONFIG_CPU_ARCEM4=y
-CONFIG_CPU_ARCV2=y
 CONFIG_ARCV2_INTERRUPT_UNIT=y
 CONFIG_ARCV2_TIMER=y
 CONFIG_ARC_MPU_ENABLE=y
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
 CONFIG_SERIAL=y
-CONFIG_SERIAL_HAS_DRIVER=y
-CONFIG_UART_NSIM=y
-CONFIG_UART_NSIM_PORT_0_BASE_ADDR=0xf0000000