From 0be1875e42b19c2862962298c2cdd0944b5a78f5 Mon Sep 17 00:00:00 2001 From: Wayne Ren Date: Thu, 23 Aug 2018 20:34:56 +0800 Subject: [PATCH] boards: cleanup and update the default config of arc boards apply to snps arc boards Signed-off-by: Wayne Ren --- arch/arc/defconfig | 1 - boards/arc/em_starterkit/Kconfig.defconfig | 18 +++++++++--------- .../arc/em_starterkit/em_starterkit_defconfig | 6 ------ .../em_starterkit_em11d_defconfig | 6 ------ .../em_starterkit/em_starterkit_em7d_defconfig | 6 ------ .../em_starterkit_em7d_v22_defconfig | 6 ------ boards/arc/nsim_em/Kconfig.defconfig | 14 ++++++++++++++ boards/arc/nsim_em/nsim_em_defconfig | 5 ----- boards/arc/nsim_em/nsim_sem_defconfig | 5 ----- 9 files changed, 23 insertions(+), 44 deletions(-) diff --git a/arch/arc/defconfig b/arch/arc/defconfig index b0182acfb8de4e..431b4f8d5c837c 100644 --- 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 index fc9cb76908f76a..969a1ea4302089 100644 --- 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 index 2d43dc5645eab1..4afa2b29f44949 100644 --- 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 index ad6ce55df39345..2f4d5c5978da23 100644 --- 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 index 9f753cb355a0cb..ab8c69d8339388 100644 --- 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 index 983f3d44165c4d..feb150c6892b4c 100644 --- 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 index bae78cb7e7edda..27807f298ee329 100644 --- 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 index c8ea7ccb2effd7..bb002d3b3b22d5 100644 --- 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 index 83868a0a08a9e5..0b954046746d31 100644 --- 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