From 117f24f4589fb4009c2810620b71d50c48e95ef4 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Thu, 30 Mar 2017 12:14:58 -0500 Subject: [PATCH] arm: dts: Remove !HAS_DTS Kconfig bits For the SoCs in which all the boards for that platform are using dts we can remove the Kconfig bits that are now coming from device tree. Change-Id: Iccf4c84beb83fa1c516b6166f94de37b4a0162ae Signed-off-by: Kumar Gala --- .../soc/arm/beetle/Kconfig.defconfig.beetle_r0 | 16 ---------------- arch/arm/soc/arm/beetle/Kconfig.defconfig.series | 14 -------------- .../soc/nxp_kinetis/k6x/Kconfig.defconfig.series | 14 -------------- .../nxp_kinetis/kwx/Kconfig.defconfig.mkw41z4 | 8 -------- .../soc/nxp_kinetis/kwx/Kconfig.defconfig.series | 10 ---------- boards/arm/frdm_k64f/Kconfig.defconfig | 10 ---------- boards/arm/frdm_kw41z/Kconfig.defconfig | 9 --------- boards/arm/hexiwear_k64/Kconfig.defconfig | 10 ---------- 8 files changed, 91 deletions(-) diff --git a/arch/arm/soc/arm/beetle/Kconfig.defconfig.beetle_r0 b/arch/arm/soc/arm/beetle/Kconfig.defconfig.beetle_r0 index f3e5240a07d..ca734607f76 100644 --- a/arch/arm/soc/arm/beetle/Kconfig.defconfig.beetle_r0 +++ b/arch/arm/soc/arm/beetle/Kconfig.defconfig.beetle_r0 @@ -11,20 +11,4 @@ if SOC_BEETLE_R0 config SOC default beetle_r0 -if !HAS_DTS -# -# Beetle R0 has one SRAM bank: -# 128K @ 0x20000000 -# -config SRAM_SIZE - default 128 - -# -# Beetle R0 has 256K@0x0 of flash. -# -config FLASH_SIZE - default 256 - -endif # !HAS_DTS - endif # SOC_BEETLE_R0 diff --git a/arch/arm/soc/arm/beetle/Kconfig.defconfig.series b/arch/arm/soc/arm/beetle/Kconfig.defconfig.series index d32184bec85..735594c7ae9 100644 --- a/arch/arm/soc/arm/beetle/Kconfig.defconfig.series +++ b/arch/arm/soc/arm/beetle/Kconfig.defconfig.series @@ -17,20 +17,6 @@ config NUM_IRQS int default 45 -if !HAS_DTS - -config NUM_IRQ_PRIO_BITS - int - default 3 - -config SRAM_BASE_ADDRESS - default 0x20000000 - -config FLASH_BASE_ADDRESS - default 0x00000000 - -endif # !HAS_DTS - config SYS_CLOCK_HW_CYCLES_PER_SEC int default 24000000 diff --git a/arch/arm/soc/nxp_kinetis/k6x/Kconfig.defconfig.series b/arch/arm/soc/nxp_kinetis/k6x/Kconfig.defconfig.series index 29a7e2cc449..d2992c95af0 100644 --- a/arch/arm/soc/nxp_kinetis/k6x/Kconfig.defconfig.series +++ b/arch/arm/soc/nxp_kinetis/k6x/Kconfig.defconfig.series @@ -11,20 +11,6 @@ if SOC_SERIES_KINETIS_K6X config SOC_SERIES default k6x -if !HAS_DTS - -config SRAM_BASE_ADDRESS - default 0x20000000 - -config FLASH_BASE_ADDRESS - default 0x00000000 - -config NUM_IRQ_PRIO_BITS - int - default 4 - -endif # !HAS_DTS - config NUM_IRQS int # must be >= the highest interrupt number used diff --git a/arch/arm/soc/nxp_kinetis/kwx/Kconfig.defconfig.mkw41z4 b/arch/arm/soc/nxp_kinetis/kwx/Kconfig.defconfig.mkw41z4 index e03a2d23e41..b7bc09e2427 100644 --- a/arch/arm/soc/nxp_kinetis/kwx/Kconfig.defconfig.mkw41z4 +++ b/arch/arm/soc/nxp_kinetis/kwx/Kconfig.defconfig.mkw41z4 @@ -11,14 +11,6 @@ config SOC string default mkw41z4 -if !HAS_DTS - -config NUM_IRQ_PRIO_BITS - int - default 2 - -endif # !HAS_DTS - config NUM_IRQS int default 32 diff --git a/arch/arm/soc/nxp_kinetis/kwx/Kconfig.defconfig.series b/arch/arm/soc/nxp_kinetis/kwx/Kconfig.defconfig.series index 3c0e98ddde0..faf128e5053 100644 --- a/arch/arm/soc/nxp_kinetis/kwx/Kconfig.defconfig.series +++ b/arch/arm/soc/nxp_kinetis/kwx/Kconfig.defconfig.series @@ -10,16 +10,6 @@ if SOC_SERIES_KINETIS_KWX config SOC_SERIES default kwx -if !HAS_DTS - -config SRAM_BASE_ADDRESS - default 0x20000000 - -config FLASH_BASE_ADDRESS - default 0x00000000 - -endif # !HAS_DTS - source "arch/arm/soc/nxp_kinetis/kwx/Kconfig.defconfig.mk*" endif # SOC_SERIES_KINETIS_KWX diff --git a/boards/arm/frdm_k64f/Kconfig.defconfig b/boards/arm/frdm_k64f/Kconfig.defconfig index aac7f60451a..fb51f5e68d1 100644 --- a/boards/arm/frdm_k64f/Kconfig.defconfig +++ b/boards/arm/frdm_k64f/Kconfig.defconfig @@ -10,16 +10,6 @@ if BOARD_FRDM_K64F config BOARD default frdm_k64f -if !HAS_DTS - -config FLASH_SIZE - default 1024 - -config SRAM_SIZE - default 192 - -endif # !HAS_DTS - config OSC_XTAL0_FREQ default 50000000 diff --git a/boards/arm/frdm_kw41z/Kconfig.defconfig b/boards/arm/frdm_kw41z/Kconfig.defconfig index d4b69033247..899f5d20f3d 100644 --- a/boards/arm/frdm_kw41z/Kconfig.defconfig +++ b/boards/arm/frdm_kw41z/Kconfig.defconfig @@ -10,15 +10,6 @@ if BOARD_FRDM_KW41Z config BOARD default frdm_kw41z -if !HAS_DTS - -config FLASH_SIZE - default 512 - -config SRAM_SIZE - default 128 -endif # !HAS_DTS - config OSC_XTAL0_FREQ default 32000000 diff --git a/boards/arm/hexiwear_k64/Kconfig.defconfig b/boards/arm/hexiwear_k64/Kconfig.defconfig index 566d7a7d9fd..40f048d7674 100644 --- a/boards/arm/hexiwear_k64/Kconfig.defconfig +++ b/boards/arm/hexiwear_k64/Kconfig.defconfig @@ -10,16 +10,6 @@ if BOARD_HEXIWEAR_K64 config BOARD default hexiwear_k64 -if !HAS_DTS - -config FLASH_SIZE - default 1024 - -config SRAM_SIZE - default 192 - -endif # !HAS_DTS - config OSC_XTAL0_FREQ default 12000000