From 311e6b9e3e2bbf296d736057937c3a2bcdc752af Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Wed, 14 Mar 2018 19:16:40 -0500 Subject: [PATCH] arch: arc: Use DTS for all ARC SoCs Now that all ARC SoCs we can remove code associated with !HAS_DTS and select HAS_DTS at the architecture level. Signed-off-by: Kumar Gala --- arch/Kconfig | 1 + arch/arc/Kconfig | 58 ------------------- .../soc/quark_se_c1000_ss/Kconfig.defconfig | 35 ----------- boards/arc/arduino_101_sss/Kconfig.board | 1 - boards/arc/arduino_101_sss/Kconfig.defconfig | 9 --- boards/arc/em_starterkit/Kconfig.board | 1 - .../quark_se_c1000_ss_devboard/Kconfig.board | 1 - 7 files changed, 1 insertion(+), 105 deletions(-) diff --git a/arch/Kconfig b/arch/Kconfig index ae4603412a..df3caa2529 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -15,6 +15,7 @@ choice config ARC bool "ARC architecture" + select HAS_DTS config ARM bool "ARM architecture" diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig index 5941a87ccf..92df391f2f 100644 --- a/arch/arc/Kconfig +++ b/arch/arc/Kconfig @@ -172,64 +172,6 @@ source "arch/arc/core/mpu/Kconfig" endmenu -if !HAS_DTS -config ICCM_SIZE - int "ICCM Size in kB" - help - This option specifies the size of the ICCM in kB. It is normally set by - the board's defconfig file and the user should generally avoid modifying - it via the menu configuration. - -config ICCM_BASE_ADDRESS - hex "ICCM Base Address" - help - This option specifies the base address of the ICCM on the board. It is - normally set by the board's defconfig file and the user should generally - avoid modifying it via the menu configuration. - -config DCCM_SIZE - int "DCCM Size in kB" - help - This option specifies the size of the DCCM in kB. It is normally set by - the board's defconfig file and the user should generally avoid modifying - it via the menu configuration. - -config DCCM_BASE_ADDRESS - hex "DCCM Base Address" - help - This option specifies the base address of the DCCM on the board. It is - normally set by the board's defconfig file and the user should generally - avoid modifying it via the menu configuration. - -config SRAM_SIZE - int "SRAM Size in kB" - help - This option specifies the size of the SRAM in kB. It is normally set by - the board's defconfig file and the user should generally avoid modifying - it via the menu configuration. - -config SRAM_BASE_ADDRESS - hex "SRAM Base Address" - help - This option specifies the base address of the SRAM on the board. It is - normally set by the board's defconfig file and the user should generally - avoid modifying it via the menu configuration. - -config FLASH_SIZE - int "Flash Size in kB" - help - This option specifies the size of the flash in kB. It is normally set by - the board's defconfig file and the user should generally avoid modifying - it via the menu configuration. - -config FLASH_BASE_ADDRESS - hex "Flash Base Address" - help - This option specifies the base address of the flash on the board. It is - normally set by the board's defconfig file and the user should generally - avoid modifying it via the menu configuration. -endif - config CACHE_LINE_SIZE_DETECT bool prompt "Detect d-cache line size at runtime" diff --git a/arch/arc/soc/quark_se_c1000_ss/Kconfig.defconfig b/arch/arc/soc/quark_se_c1000_ss/Kconfig.defconfig index 2c2ce3f2f4..22d9acd188 100644 --- a/arch/arc/soc/quark_se_c1000_ss/Kconfig.defconfig +++ b/arch/arc/soc/quark_se_c1000_ss/Kconfig.defconfig @@ -28,34 +28,6 @@ config SYS_CLOCK_HW_CYCLES_PER_SEC config HARVARD def_bool n -if !HAS_DTS -config FLASH_BASE_ADDRESS - default 0x40000000 - -config FLASH_SIZE - default 152 - -config SRAM_BASE_ADDRESS - default 0x4000 if NSIM - default 0xa8000400 - -config SRAM_SIZE - default 16 if NSIM - default 27 - -config ICCM_BASE_ADDRESS - default 0xFFFFFFFF - -config ICCM_SIZE - default 0 - -config DCCM_BASE_ADDRESS - default 0x80000000 - -config DCCM_SIZE - default 8 -endif - config QMSI def_bool y @@ -244,13 +216,6 @@ endif # UART_QMSI_1 endif # UART_QMSI -if UART_CONSOLE && !HAS_DTS - -config UART_CONSOLE_ON_DEV_NAME - default "UART_1" - -endif - if SPI config SPI_QMSI diff --git a/boards/arc/arduino_101_sss/Kconfig.board b/boards/arc/arduino_101_sss/Kconfig.board index b22c1923d6..009befbab2 100644 --- a/boards/arc/arduino_101_sss/Kconfig.board +++ b/boards/arc/arduino_101_sss/Kconfig.board @@ -2,5 +2,4 @@ config BOARD_ARDUINO_101_SSS bool "Arduino 101 Sensor Sub System" depends on SOC_QUARK_SE_C1000_SS - select HAS_DTS select HAS_DTS_I2C diff --git a/boards/arc/arduino_101_sss/Kconfig.defconfig b/boards/arc/arduino_101_sss/Kconfig.defconfig index 40eba04bb5..f7e9970b8a 100644 --- a/boards/arc/arduino_101_sss/Kconfig.defconfig +++ b/boards/arc/arduino_101_sss/Kconfig.defconfig @@ -4,15 +4,6 @@ if BOARD_ARDUINO_101_SSS config BOARD default "arduino_101_sss" -if !HAS_DTS -config FLASH_SIZE - default 128 - - -config FLASH_BASE_ADDRESS - default 0x40034000 -endif - if GPIO_QMSI && BMI160 && BMI160_TRIGGER config BMI160_GPIO_DEV_NAME diff --git a/boards/arc/em_starterkit/Kconfig.board b/boards/arc/em_starterkit/Kconfig.board index 849f47bb7e..5eaff7cb94 100644 --- a/boards/arc/em_starterkit/Kconfig.board +++ b/boards/arc/em_starterkit/Kconfig.board @@ -7,7 +7,6 @@ config BOARD_EM_STARTERKIT bool "ARC EM Starter Kit" depends on (SOC_EM7D || SOC_EM9D || SOC_EM11D) - select HAS_DTS help The DesignWare ARC EM Starter Kit board is a board that can host up to 3 different SOC FPGA bit files. diff --git a/boards/arc/quark_se_c1000_ss_devboard/Kconfig.board b/boards/arc/quark_se_c1000_ss_devboard/Kconfig.board index f02f201ace..466345ab68 100644 --- a/boards/arc/quark_se_c1000_ss_devboard/Kconfig.board +++ b/boards/arc/quark_se_c1000_ss_devboard/Kconfig.board @@ -2,5 +2,4 @@ config BOARD_QUARK_SE_C1000_DEVBOARD_SS bool "Quark SE C1000 - Sensor Sub System" depends on SOC_QUARK_SE_C1000_SS - select HAS_DTS select HAS_DTS_I2C