diff --git a/Makefile b/Makefile index c4ecf3c2640..9ec27fb8fbf 100644 --- a/Makefile +++ b/Makefile @@ -333,19 +333,18 @@ endif # Use USERINCLUDE when you must reference the UAPI directories only. USERINCLUDE := -include $(CURDIR)/include/generated/autoconf.h -PLATFORM_NAME = $(subst $(DQUOTE),,$(CONFIG_PLATFORM)) SOC_NAME = $(subst $(DQUOTE),,$(CONFIG_SOC)) ARCH = $(subst $(DQUOTE),,$(CONFIG_ARCH)) BOARD_NAME = $(subst $(DQUOTE),,$(CONFIG_BOARD)) KERNEL_NAME = $(subst $(DQUOTE),,$(CONFIG_KERNEL_BIN_NAME)) KERNEL_ELF_NAME = $(KERNEL_NAME).elf -export PLATFORM_NAME SOC_NAME BOARD_NAME ARCH KERNEL_NAME KERNEL_ELF_NAME +export SOC_NAME BOARD_NAME ARCH KERNEL_NAME KERNEL_ELF_NAME # Use ZEPHYRINCLUDE when you must reference the include/ directory. # Needed to be compatible with the O= option ZEPHYRINCLUDE = \ -I$(srctree)/arch/$(ARCH)/include \ - -I$(srctree)/arch/$(ARCH)/platforms/$(PLATFORM_NAME) \ + -I$(srctree)/arch/$(ARCH)/soc/$(SOC_NAME) \ -I$(srctree)/boards/$(BOARD_NAME) \ $(if $(KBUILD_SRC), -I$(srctree)/include) \ -I$(srctree)/include \ @@ -739,7 +738,7 @@ export KBUILD_ZEPHYR_MAIN := $(drivers-y) $(core-y) $(libs-y) $(app-y) ifdef CONFIG_HAVE_CUSTOM_LINKER_SCRIPT export KBUILD_LDS := $(subst $(DQUOTE),,$(CONFIG_CUSTOM_LINKER_SCRIPT)) else -export KBUILD_LDS := $(srctree)/arch/$(ARCH)/platforms/$(PLATFORM_NAME)/linker.cmd +export KBUILD_LDS := $(srctree)/arch/$(ARCH)/soc/$(SOC_NAME)/linker.cmd endif export LDFLAGS_zephyr # used by scripts/pacmage/Makefile @@ -950,7 +949,7 @@ help: @echo '* zephyr - Build the bare kernel' @echo ' qemu - Build the bare kernel and runs the emulation with qemu' @echo '' - @echo 'Supported platforms:' + @echo 'Supported Boards:' @echo '' @$(if $(boards), \ $(foreach b, $(boards), \ diff --git a/arch/Kconfig b/arch/Kconfig index d74c1f9aef8..aa450f5be74 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -39,11 +39,6 @@ config ARCH System architecture string. config SOC - string - help - SOC being used. - -config PLATFORM string help This option holds the directory name used by the build system to locate diff --git a/arch/arc/Kbuild b/arch/arc/Kbuild index 7d7c0ec1fed..75b2acdb8e3 100644 --- a/arch/arc/Kbuild +++ b/arch/arc/Kbuild @@ -3,4 +3,4 @@ subdir-ccflags-y +=-I$(srctree)/drivers subdir-asflags-y += $(subdir-ccflags-y) obj-y = core/ -obj-y += platforms/$(PLATFORM_NAME)/ +obj-y += soc/$(SOC_NAME)/ diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig index 4e134f6f53f..6b2dd3b60dd 100644 --- a/arch/arc/Kconfig +++ b/arch/arc/Kconfig @@ -26,10 +26,8 @@ config ARCH_DEFCONFIG default "arch/arc/defconfig" choice -prompt "Platform Selection" -default PLATFORM_GENERIC_ARC - -source "arch/arc/platforms/*/Kconfig.platform" +prompt "SoC Selection" +source "arch/arc/soc/*/Kconfig.soc" endchoice menu "ARC EM4 processor options" @@ -248,6 +246,6 @@ config ARCH_HAS_NANO_FIBER_ABORT endmenu -source "arch/arc/platforms/*/Kconfig" +source "arch/arc/soc/*/Kconfig" endmenu diff --git a/arch/arc/defconfig b/arch/arc/defconfig index ffcdc2468a5..9d085f6f881 100644 --- a/arch/arc/defconfig +++ b/arch/arc/defconfig @@ -1,6 +1,6 @@ CONFIG_ARC=y CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=32000000 -CONFIG_PLATFORM_GENERIC_ARC=y +CONFIG_SOC_GENERIC_ARC=y CONFIG_CPU_ARCEM4=y CONFIG_CPU_ARCV2=y CONFIG_RAM_START=0xa8000000 diff --git a/arch/arc/platforms/generic_arc/Kconfig.platform b/arch/arc/platforms/generic_arc/Kconfig.platform deleted file mode 100644 index 76016b6a7cd..00000000000 --- a/arch/arc/platforms/generic_arc/Kconfig.platform +++ /dev/null @@ -1,3 +0,0 @@ - -config PLATFORM_GENERIC_ARC - bool "Minimum configuration for generic arc" diff --git a/arch/arc/platforms/quark_se_ss/Kconfig.platform b/arch/arc/platforms/quark_se_ss/Kconfig.platform deleted file mode 100644 index 80ac45275af..00000000000 --- a/arch/arc/platforms/quark_se_ss/Kconfig.platform +++ /dev/null @@ -1,3 +0,0 @@ - -config PLATFORM_QUARK_SE_SS - bool "Minimum configuration for Quark SE Sensor Subsystem" diff --git a/arch/arc/platforms/generic_arc/Kconfig b/arch/arc/soc/generic_arc/Kconfig similarity index 97% rename from arch/arc/platforms/generic_arc/Kconfig rename to arch/arc/soc/generic_arc/Kconfig index 957f2ac890c..2422d2b53b5 100644 --- a/arch/arc/platforms/generic_arc/Kconfig +++ b/arch/arc/soc/generic_arc/Kconfig @@ -14,8 +14,8 @@ # limitations under the License. # -if PLATFORM_GENERIC_ARC -config PLATFORM +if SOC_GENERIC_ARC +config SOC default generic_arc config NUM_IRQ_PRIO_LEVELS diff --git a/arch/arc/soc/generic_arc/Kconfig.soc b/arch/arc/soc/generic_arc/Kconfig.soc new file mode 100644 index 00000000000..c154106a8f3 --- /dev/null +++ b/arch/arc/soc/generic_arc/Kconfig.soc @@ -0,0 +1,3 @@ + +config SOC_GENERIC_ARC + bool diff --git a/arch/arc/platforms/generic_arc/Makefile b/arch/arc/soc/generic_arc/Makefile similarity index 84% rename from arch/arc/platforms/generic_arc/Makefile rename to arch/arc/soc/generic_arc/Makefile index 082b4e9acd3..661956280d1 100644 --- a/arch/arc/platforms/generic_arc/Makefile +++ b/arch/arc/soc/generic_arc/Makefile @@ -1,3 +1,3 @@ -obj-y = platform.o +obj-y = soc.o obj-$(CONFIG_IRQ_VECTOR_TABLE_BSP) += irq_vector_table.o obj-$(CONFIG_SW_ISR_TABLE_BSP) += sw_isr_table.o diff --git a/arch/arc/platforms/generic_arc/irq_vector_table.c b/arch/arc/soc/generic_arc/irq_vector_table.c similarity index 100% rename from arch/arc/platforms/generic_arc/irq_vector_table.c rename to arch/arc/soc/generic_arc/irq_vector_table.c diff --git a/arch/arc/platforms/generic_arc/linker.cmd b/arch/arc/soc/generic_arc/linker.cmd similarity index 100% rename from arch/arc/platforms/generic_arc/linker.cmd rename to arch/arc/soc/generic_arc/linker.cmd diff --git a/arch/arc/platforms/generic_arc/platform.c b/arch/arc/soc/generic_arc/soc.c similarity index 98% rename from arch/arc/platforms/generic_arc/platform.c rename to arch/arc/soc/generic_arc/soc.c index d74c0dbd09b..a06a7533287 100644 --- a/arch/arc/platforms/generic_arc/platform.c +++ b/arch/arc/soc/generic_arc/soc.c @@ -23,7 +23,7 @@ */ #include -#include "platform.h" +#include "soc.h" #include #include diff --git a/arch/arc/platforms/generic_arc/platform.h b/arch/arc/soc/generic_arc/soc.h similarity index 100% rename from arch/arc/platforms/generic_arc/platform.h rename to arch/arc/soc/generic_arc/soc.h diff --git a/arch/arc/platforms/generic_arc/sw_isr_table.c b/arch/arc/soc/generic_arc/sw_isr_table.c similarity index 100% rename from arch/arc/platforms/generic_arc/sw_isr_table.c rename to arch/arc/soc/generic_arc/sw_isr_table.c diff --git a/arch/arc/platforms/quark_se_ss/Kconfig b/arch/arc/soc/quark_se_ss/Kconfig similarity index 97% rename from arch/arc/platforms/quark_se_ss/Kconfig rename to arch/arc/soc/quark_se_ss/Kconfig index d3f1253f8a1..018cadbae6a 100644 --- a/arch/arc/platforms/quark_se_ss/Kconfig +++ b/arch/arc/soc/quark_se_ss/Kconfig @@ -14,9 +14,9 @@ # limitations under the License. # -if PLATFORM_QUARK_SE_SS +if SOC_QUARK_SE_SS -config PLATFORM +config SOC default quark_se_ss config NUM_IRQ_PRIO_LEVELS @@ -166,4 +166,4 @@ config GPIO_DW_INIT_PRIORITY config I2C_INIT_PRIORITY default 60 -endif #PLATFORM_QUARK_SE_ARC +endif #SOC_QUARK_SE_ARC diff --git a/arch/arc/soc/quark_se_ss/Kconfig.soc b/arch/arc/soc/quark_se_ss/Kconfig.soc new file mode 100644 index 00000000000..6781da4315e --- /dev/null +++ b/arch/arc/soc/quark_se_ss/Kconfig.soc @@ -0,0 +1,3 @@ + +config SOC_QUARK_SE_SS + bool "Intel Quark SE - Sensor Sub System" diff --git a/arch/arc/platforms/quark_se_ss/Makefile b/arch/arc/soc/quark_se_ss/Makefile similarity index 77% rename from arch/arc/platforms/quark_se_ss/Makefile rename to arch/arc/soc/quark_se_ss/Makefile index b00bfa2ad36..da37ac8bbdd 100644 --- a/arch/arc/platforms/quark_se_ss/Makefile +++ b/arch/arc/soc/quark_se_ss/Makefile @@ -1,4 +1,4 @@ -ccflags-y +=-I$(srctree)/arch/x86/platforms/ +ccflags-y +=-I$(srctree)/arch/x86/soc/ ccflags-y +=-I$(srctree)/include ccflags-y +=-I$(srctree)/include/drivers ccflags-y +=-I$(srctree)/drivers @@ -6,6 +6,6 @@ ccflags-$(CONFIG_ADC) +=-I$(srctree)/drivers/adc asflags-y := ${ccflags-y} -obj-y = platform.o platform_config.o +obj-y = soc.o soc_config.o obj-$(CONFIG_IRQ_VECTOR_TABLE_BSP) += irq_vector_table.o obj-$(CONFIG_SW_ISR_TABLE_BSP) += sw_isr_table.o diff --git a/arch/arc/platforms/quark_se_ss/irq_vector_table.c b/arch/arc/soc/quark_se_ss/irq_vector_table.c similarity index 100% rename from arch/arc/platforms/quark_se_ss/irq_vector_table.c rename to arch/arc/soc/quark_se_ss/irq_vector_table.c diff --git a/arch/arc/platforms/quark_se_ss/linker.cmd b/arch/arc/soc/quark_se_ss/linker.cmd similarity index 100% rename from arch/arc/platforms/quark_se_ss/linker.cmd rename to arch/arc/soc/quark_se_ss/linker.cmd diff --git a/arch/arc/platforms/quark_se_ss/platform.c b/arch/arc/soc/quark_se_ss/soc.c similarity index 98% rename from arch/arc/platforms/quark_se_ss/platform.c rename to arch/arc/soc/quark_se_ss/soc.c index 7b49c211da0..08fcb70eea4 100644 --- a/arch/arc/platforms/quark_se_ss/platform.c +++ b/arch/arc/soc/quark_se_ss/soc.c @@ -22,7 +22,7 @@ */ #include -#include "platform.h" +#include "soc.h" #include #include diff --git a/arch/arc/platforms/quark_se_ss/platform.h b/arch/arc/soc/quark_se_ss/soc.h similarity index 100% rename from arch/arc/platforms/quark_se_ss/platform.h rename to arch/arc/soc/quark_se_ss/soc.h diff --git a/arch/arc/platforms/quark_se_ss/platform_config.c b/arch/arc/soc/quark_se_ss/soc_config.c similarity index 99% rename from arch/arc/platforms/quark_se_ss/platform_config.c rename to arch/arc/soc/quark_se_ss/soc_config.c index e947cae4811..6563a1aaa27 100644 --- a/arch/arc/platforms/quark_se_ss/platform_config.c +++ b/arch/arc/soc/quark_se_ss/soc_config.c @@ -16,7 +16,7 @@ #include #include -#include "platform.h" +#include "soc.h" #if CONFIG_IPM_QUARK_SE #include diff --git a/arch/arc/platforms/quark_se_ss/sw_isr_table.S b/arch/arc/soc/quark_se_ss/sw_isr_table.S similarity index 100% rename from arch/arc/platforms/quark_se_ss/sw_isr_table.S rename to arch/arc/soc/quark_se_ss/sw_isr_table.S diff --git a/arch/arm/Kbuild b/arch/arm/Kbuild index 1e7a4f93c5f..064be38f054 100644 --- a/arch/arm/Kbuild +++ b/arch/arm/Kbuild @@ -3,4 +3,4 @@ subdir-ccflags-y +=-I$(srctree)/drivers subdir-asflags-y := ${subdir-ccflags-y} obj-y += core/ -obj-y += platforms/$(PLATFORM_NAME)/ +obj-y += soc/$(SOC_NAME)/ diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 08e3a4a88b5..5a91b21bc5c 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -30,11 +30,9 @@ config ARCH_DEFCONFIG menu "General Platform Configuration" choice -prompt "Platform Selection" -default PLATFORM_FSL_FRDM_K64F - -source "arch/arm/platforms/*/Kconfig.platform" - +prompt "SoC Selection" +default SOC_FSL_FRDM_K64F +source "arch/arm/soc/*/Kconfig.soc" endchoice @@ -71,6 +69,6 @@ source "arch/arm/core/Kconfig" endmenu -source "arch/arm/platforms/*/Kconfig" +source "arch/arm/soc/*/Kconfig" endmenu diff --git a/arch/arm/core/cortex_m/Kconfig b/arch/arm/core/cortex_m/Kconfig index ffdcb218e21..b8e5ade470e 100644 --- a/arch/arm/core/cortex_m/Kconfig +++ b/arch/arm/core/cortex_m/Kconfig @@ -195,7 +195,7 @@ config IRQ_VECTOR_TABLE_CUSTOM - ISRs must notify the kernel manually by invoking _IntExit() when then are about to return. -config IRQ_VECTOR_TABLE_PLATFORM +config IRQ_VECTOR_TABLE_SOC bool # omit prompt to signify a "hidden" option depends on SW_ISR_TABLE || !IRQ_VECTOR_TABLE_CUSTOM diff --git a/arch/arm/core/cortex_m/Makefile b/arch/arm/core/cortex_m/Makefile index dabba99c941..b22b38b004f 100644 --- a/arch/arm/core/cortex_m/Makefile +++ b/arch/arm/core/cortex_m/Makefile @@ -1,5 +1,5 @@ ccflags-y +=-I$(srctree)/include/drivers -ccflags-y +=-I$(srctree)/arch/$(ARCH)/platforms/$(PLATFORM_NAME) +ccflags-y +=-I$(srctree)/arch/$(ARCH)/platforms/$(SOC_NAME) asflags-y = $(ccflags-y) diff --git a/arch/arm/defconfig b/arch/arm/defconfig index 5b5ce6b72cd..71976f6271f 100644 --- a/arch/arm/defconfig +++ b/arch/arm/defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=12000000 -CONFIG_PLATFORM_QEMU_ARM=y +CONFIG_SOC_TI_LM3S6965=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_UART_CONSOLE_ON_DEV_NAME="UART_0" diff --git a/arch/arm/platforms/fsl_frdm_k64f/Kconfig.platform b/arch/arm/platforms/fsl_frdm_k64f/Kconfig.platform deleted file mode 100644 index 86f8b021e6d..00000000000 --- a/arch/arm/platforms/fsl_frdm_k64f/Kconfig.platform +++ /dev/null @@ -1,5 +0,0 @@ - -config PLATFORM_FSL_FRDM_K64F - bool "FSL FRDM K64F" - select CPU_CORTEX_M - select CPU_CORTEX_M4 diff --git a/arch/arm/platforms/fsl_frdm_k64f/Makefile b/arch/arm/platforms/fsl_frdm_k64f/Makefile deleted file mode 100644 index 5b7efb315ce..00000000000 --- a/arch/arm/platforms/fsl_frdm_k64f/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -obj-y += platform_config.o -obj-y += platform.o -obj-y += nmi_on_reset.o -obj-y += wdog.o - -obj-$(CONFIG_IRQ_VECTOR_TABLE_PLATFORM) += irq_vector_table.o diff --git a/arch/arm/platforms/ti_lm3s6965/Makefile b/arch/arm/platforms/ti_lm3s6965/Makefile deleted file mode 100644 index 8a7d75edda1..00000000000 --- a/arch/arm/platforms/ti_lm3s6965/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -obj-y += platform_config.o -obj-y += platform.o -obj-y += nmi_on_reset.o -obj-y += scp.o - -obj-$(CONFIG_IRQ_VECTOR_TABLE_PLATFORM) += irq_vector_table.o diff --git a/arch/arm/platforms/fsl_frdm_k64f/Kconfig b/arch/arm/soc/fsl_frdm_k64f/Kconfig similarity index 98% rename from arch/arm/platforms/fsl_frdm_k64f/Kconfig rename to arch/arm/soc/fsl_frdm_k64f/Kconfig index 409decd487f..0569ed93ba8 100644 --- a/arch/arm/platforms/fsl_frdm_k64f/Kconfig +++ b/arch/arm/soc/fsl_frdm_k64f/Kconfig @@ -16,8 +16,8 @@ # limitations under the License. # -if PLATFORM_FSL_FRDM_K64F -config PLATFORM +if SOC_FSL_FRDM_K64F +config SOC default fsl_frdm_k64f config NUM_IRQ_PRIO_BITS diff --git a/arch/arm/soc/fsl_frdm_k64f/Kconfig.soc b/arch/arm/soc/fsl_frdm_k64f/Kconfig.soc new file mode 100644 index 00000000000..dc2b7885254 --- /dev/null +++ b/arch/arm/soc/fsl_frdm_k64f/Kconfig.soc @@ -0,0 +1,5 @@ + +config SOC_FSL_FRDM_K64F + bool "Freescale FRDM-K64F" + select CPU_CORTEX_M + select CPU_CORTEX_M4 diff --git a/arch/arm/soc/fsl_frdm_k64f/Makefile b/arch/arm/soc/fsl_frdm_k64f/Makefile new file mode 100644 index 00000000000..0d2604c5b24 --- /dev/null +++ b/arch/arm/soc/fsl_frdm_k64f/Makefile @@ -0,0 +1,6 @@ +obj-y += soc_config.o +obj-y += soc.o +obj-y += nmi_on_reset.o +obj-y += wdog.o + +obj-$(CONFIG_IRQ_VECTOR_TABLE_SOC) += irq_vector_table.o diff --git a/arch/arm/platforms/fsl_frdm_k64f/README.txt b/arch/arm/soc/fsl_frdm_k64f/README.txt similarity index 100% rename from arch/arm/platforms/fsl_frdm_k64f/README.txt rename to arch/arm/soc/fsl_frdm_k64f/README.txt diff --git a/arch/arm/platforms/fsl_frdm_k64f/irq_vector_table.c b/arch/arm/soc/fsl_frdm_k64f/irq_vector_table.c similarity index 98% rename from arch/arm/platforms/fsl_frdm_k64f/irq_vector_table.c rename to arch/arm/soc/fsl_frdm_k64f/irq_vector_table.c index 52c98833789..d36abca5792 100644 --- a/arch/arm/platforms/fsl_frdm_k64f/irq_vector_table.c +++ b/arch/arm/soc/fsl_frdm_k64f/irq_vector_table.c @@ -32,12 +32,12 @@ #include #if defined(CONFIG_CONSOLE_HANDLER) -#include +#include #include #endif /* CONFIG_CONSOLE_HANDLER */ #if defined(CONFIG_BLUETOOTH_UART) -#include +#include #include #endif /* CONFIG_BLUETOOTH_UART */ diff --git a/arch/arm/platforms/fsl_frdm_k64f/linker.cmd b/arch/arm/soc/fsl_frdm_k64f/linker.cmd similarity index 100% rename from arch/arm/platforms/fsl_frdm_k64f/linker.cmd rename to arch/arm/soc/fsl_frdm_k64f/linker.cmd diff --git a/arch/arm/platforms/fsl_frdm_k64f/nmi_on_reset.S b/arch/arm/soc/fsl_frdm_k64f/nmi_on_reset.S similarity index 100% rename from arch/arm/platforms/fsl_frdm_k64f/nmi_on_reset.S rename to arch/arm/soc/fsl_frdm_k64f/nmi_on_reset.S diff --git a/arch/arm/platforms/fsl_frdm_k64f/platform.c b/arch/arm/soc/fsl_frdm_k64f/soc.c similarity index 99% rename from arch/arm/platforms/fsl_frdm_k64f/platform.c rename to arch/arm/soc/fsl_frdm_k64f/soc.c index 77ec873a864..ff4de8e5322 100644 --- a/arch/arm/platforms/fsl_frdm_k64f/platform.c +++ b/arch/arm/soc/fsl_frdm_k64f/soc.c @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/arm/platforms/fsl_frdm_k64f/platform.h b/arch/arm/soc/fsl_frdm_k64f/soc.h similarity index 98% rename from arch/arm/platforms/fsl_frdm_k64f/platform.h rename to arch/arm/soc/fsl_frdm_k64f/soc.h index 38c37401cc8..cb17500fd87 100644 --- a/arch/arm/platforms/fsl_frdm_k64f/platform.h +++ b/arch/arm/soc/fsl_frdm_k64f/soc.h @@ -22,8 +22,8 @@ * 'fsl_frdm_k64f' platform. */ -#ifndef _PLATFORM__H_ -#define _PLATFORM__H_ +#ifndef _SOC__H_ +#define _SOC__H_ #include @@ -163,4 +163,4 @@ #endif /* !_ASMLANGUAGE */ -#endif /* _PLATFORM__H_ */ +#endif /* _SOC__H_ */ diff --git a/arch/arm/platforms/fsl_frdm_k64f/platform_config.c b/arch/arm/soc/fsl_frdm_k64f/soc_config.c similarity index 99% rename from arch/arm/platforms/fsl_frdm_k64f/platform_config.c rename to arch/arm/soc/fsl_frdm_k64f/soc_config.c index af6a87e6805..d0c0c93bc30 100644 --- a/arch/arm/platforms/fsl_frdm_k64f/platform_config.c +++ b/arch/arm/soc/fsl_frdm_k64f/soc_config.c @@ -23,7 +23,7 @@ #include -#include "platform.h" +#include "soc.h" #ifdef CONFIG_UART_K20 #include diff --git a/arch/arm/platforms/fsl_frdm_k64f/wdog.S b/arch/arm/soc/fsl_frdm_k64f/wdog.S similarity index 98% rename from arch/arm/platforms/fsl_frdm_k64f/wdog.S rename to arch/arm/soc/fsl_frdm_k64f/wdog.S index a0b34b1920d..9b52fd1c04b 100644 --- a/arch/arm/platforms/fsl_frdm_k64f/wdog.S +++ b/arch/arm/soc/fsl_frdm_k64f/wdog.S @@ -23,7 +23,7 @@ #define _ASMLANGUAGE -#include +#include #include #include diff --git a/arch/arm/platforms/ti_lm3s6965/Kconfig b/arch/arm/soc/ti_lm3s6965/Kconfig similarity index 97% rename from arch/arm/platforms/ti_lm3s6965/Kconfig rename to arch/arm/soc/ti_lm3s6965/Kconfig index 51fc455224e..65170e3bfe2 100644 --- a/arch/arm/platforms/ti_lm3s6965/Kconfig +++ b/arch/arm/soc/ti_lm3s6965/Kconfig @@ -16,8 +16,8 @@ # limitations under the License. # -if PLATFORM_TI_LM3S6965 -config PLATFORM +if SOC_TI_LM3S6965 +config SOC default ti_lm3s6965 config NUM_IRQ_PRIO_BITS @@ -30,7 +30,7 @@ config NUM_IRQS # - include the UART interrupts default 34 -config PLATFORM_TI_LM3S6965_QEMU +config SOC_TI_LM3S6965_QEMU def_bool y # Platform has only been tested on QEMU, not on real hardware, so always # assume it is used for a QEMU target. diff --git a/arch/arm/platforms/ti_lm3s6965/Kconfig.platform b/arch/arm/soc/ti_lm3s6965/Kconfig.soc similarity index 69% rename from arch/arm/platforms/ti_lm3s6965/Kconfig.platform rename to arch/arm/soc/ti_lm3s6965/Kconfig.soc index abcd60436e6..7350588f845 100644 --- a/arch/arm/platforms/ti_lm3s6965/Kconfig.platform +++ b/arch/arm/soc/ti_lm3s6965/Kconfig.soc @@ -1,5 +1,5 @@ -config PLATFORM_TI_LM3S6965 +config SOC_TI_LM3S6965 bool "TI LM3S6965" select CPU_CORTEX_M select CPU_CORTEX_M3 diff --git a/arch/arm/soc/ti_lm3s6965/Makefile b/arch/arm/soc/ti_lm3s6965/Makefile new file mode 100644 index 00000000000..960566a8c72 --- /dev/null +++ b/arch/arm/soc/ti_lm3s6965/Makefile @@ -0,0 +1,6 @@ +obj-y += soc_config.o +obj-y += soc.o +obj-y += nmi_on_reset.o +obj-y += scp.o + +obj-$(CONFIG_IRQ_VECTOR_TABLE_SOC) += irq_vector_table.o diff --git a/arch/arm/platforms/ti_lm3s6965/irq_vector_table.c b/arch/arm/soc/ti_lm3s6965/irq_vector_table.c similarity index 98% rename from arch/arm/platforms/ti_lm3s6965/irq_vector_table.c rename to arch/arm/soc/ti_lm3s6965/irq_vector_table.c index 52c98833789..d36abca5792 100644 --- a/arch/arm/platforms/ti_lm3s6965/irq_vector_table.c +++ b/arch/arm/soc/ti_lm3s6965/irq_vector_table.c @@ -32,12 +32,12 @@ #include #if defined(CONFIG_CONSOLE_HANDLER) -#include +#include #include #endif /* CONFIG_CONSOLE_HANDLER */ #if defined(CONFIG_BLUETOOTH_UART) -#include +#include #include #endif /* CONFIG_BLUETOOTH_UART */ diff --git a/arch/arm/platforms/ti_lm3s6965/linker.cmd b/arch/arm/soc/ti_lm3s6965/linker.cmd similarity index 100% rename from arch/arm/platforms/ti_lm3s6965/linker.cmd rename to arch/arm/soc/ti_lm3s6965/linker.cmd diff --git a/arch/arm/platforms/ti_lm3s6965/nmi_on_reset.S b/arch/arm/soc/ti_lm3s6965/nmi_on_reset.S similarity index 100% rename from arch/arm/platforms/ti_lm3s6965/nmi_on_reset.S rename to arch/arm/soc/ti_lm3s6965/nmi_on_reset.S diff --git a/arch/arm/platforms/ti_lm3s6965/scp.c b/arch/arm/soc/ti_lm3s6965/scp.c similarity index 100% rename from arch/arm/platforms/ti_lm3s6965/scp.c rename to arch/arm/soc/ti_lm3s6965/scp.c diff --git a/arch/arm/platforms/ti_lm3s6965/scp.h b/arch/arm/soc/ti_lm3s6965/scp.h similarity index 100% rename from arch/arm/platforms/ti_lm3s6965/scp.h rename to arch/arm/soc/ti_lm3s6965/scp.h diff --git a/arch/arm/platforms/ti_lm3s6965/platform.c b/arch/arm/soc/ti_lm3s6965/soc.c similarity index 98% rename from arch/arm/platforms/ti_lm3s6965/platform.c rename to arch/arm/soc/ti_lm3s6965/soc.c index 8db867d65d1..3a53843f250 100644 --- a/arch/arm/platforms/ti_lm3s6965/platform.c +++ b/arch/arm/soc/ti_lm3s6965/soc.c @@ -25,7 +25,7 @@ #include #include #include -#include +#include #ifdef CONFIG_RUNTIME_NMI extern void _NmiInit(void); diff --git a/arch/arm/platforms/ti_lm3s6965/platform.h b/arch/arm/soc/ti_lm3s6965/soc.h similarity index 100% rename from arch/arm/platforms/ti_lm3s6965/platform.h rename to arch/arm/soc/ti_lm3s6965/soc.h diff --git a/arch/arm/platforms/ti_lm3s6965/platform_config.c b/arch/arm/soc/ti_lm3s6965/soc_config.c similarity index 98% rename from arch/arm/platforms/ti_lm3s6965/platform_config.c rename to arch/arm/soc/ti_lm3s6965/soc_config.c index 0a82c57e2a5..874305d792c 100644 --- a/arch/arm/platforms/ti_lm3s6965/platform_config.c +++ b/arch/arm/soc/ti_lm3s6965/soc_config.c @@ -23,7 +23,7 @@ #include -#include "platform.h" +#include "soc.h" #ifdef CONFIG_UART_STELLARIS #include diff --git a/arch/x86/Kbuild b/arch/x86/Kbuild index d5179097fc3..f838d675c19 100644 --- a/arch/x86/Kbuild +++ b/arch/x86/Kbuild @@ -1,2 +1,2 @@ obj-y += core/ -obj-y += platforms/$(PLATFORM_NAME)/ +obj-y += soc/$(SOC_NAME)/ diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 5346033dedb..02b3519f118 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -42,12 +42,10 @@ config ARCH_DEFCONFIG source "arch/x86/core/Kconfig" choice -prompt "Platform Selection" -default PLATFORM_IA32_PCI -source "arch/x86/platforms/*/Kconfig.platform" +prompt "SoC Selection" +source "arch/x86/soc/*/Kconfig.soc" endchoice - choice prompt "Intel Processor" default CPU_MINUTEIA @@ -280,6 +278,6 @@ endmenu -source "arch/x86/platforms/*/Kconfig" +source "arch/x86/soc/*/Kconfig" endmenu diff --git a/arch/x86/defconfig b/arch/x86/defconfig index 6079af6ca7a..45aa3ec1a24 100644 --- a/arch/x86/defconfig +++ b/arch/x86/defconfig @@ -1,5 +1,5 @@ CONFIG_X86=y -CONFIG_PLATFORM_IA32=y +CONFIG_SOC_IA32=y CONFIG_CPU_MINUTEIA=y CONFIG_IOAPIC=y CONFIG_LOAPIC_TIMER=y diff --git a/arch/x86/include/nano_private.h b/arch/x86/include/nano_private.h index c8d6bea7d0d..735cfd0516b 100644 --- a/arch/x86/include/nano_private.h +++ b/arch/x86/include/nano_private.h @@ -117,7 +117,7 @@ #define IA32_P5_MC_TYPE_MSR 0x0001 #define IA32_MONITOR_FILTER_SIZE_MSR 0x0006 #define IA32_TIME_STAMP_COUNTER_MSR 0x0010 -#define IA32_IA32_PLATFORM_ID_MSR 0x0017 +#define IA32_IA32_SOC_ID_MSR 0x0017 #define IA32_APIC_BASE_MSR 0x001b #define IA32_FEATURE_CONTROL_MSR 0x003a #define IA32_BIOS_SIGN_MSR 0x008b @@ -149,7 +149,7 @@ #define IA32_DEBUGCTL_MSR 0x01d9 #define IA32_SMRR_PHYSBASE_MSR 0x01f2 #define IA32_SMRR_PHYSMASK_MSR 0x01f3 -#define IA32_PLATFORM_DCA_CAP_MSR 0x01f8 +#define IA32_SOC_DCA_CAP_MSR 0x01f8 #define IA32_CPU_DCA_CAP_MSR 0x01f9 #define IA32_DCA_0_CAP_MSR 0x01fa #define IA32_MTRR_PHYSBASE0_MSR 0x0200 diff --git a/arch/x86/platforms/ia32/Kconfig.platform b/arch/x86/platforms/ia32/Kconfig.platform deleted file mode 100644 index c9ad624042c..00000000000 --- a/arch/x86/platforms/ia32/Kconfig.platform +++ /dev/null @@ -1,5 +0,0 @@ - - -config PLATFORM_IA32 - bool "IA32" - select BOOTLOADER_UNKNOWN diff --git a/arch/x86/platforms/atom/Kconfig b/arch/x86/soc/atom/Kconfig similarity index 98% rename from arch/x86/platforms/atom/Kconfig rename to arch/x86/soc/atom/Kconfig index 570f390edd1..c9b7f5ffa97 100644 --- a/arch/x86/platforms/atom/Kconfig +++ b/arch/x86/soc/atom/Kconfig @@ -16,9 +16,9 @@ # limitations under the License. # -if PLATFORM_ATOM +if SOC_ATOM -config PLATFORM +config SOC default atom config PHYS_LOAD_ADDR diff --git a/arch/x86/platforms/atom/Kconfig.platform b/arch/x86/soc/atom/Kconfig.soc similarity index 76% rename from arch/x86/platforms/atom/Kconfig.platform rename to arch/x86/soc/atom/Kconfig.soc index 015152b9c60..6c269220443 100644 --- a/arch/x86/platforms/atom/Kconfig.platform +++ b/arch/x86/soc/atom/Kconfig.soc @@ -1,6 +1,6 @@ -config PLATFORM_ATOM +config SOC_ATOM bool "Intel ATOM SoC" select CPU_ATOM select BOOTLOADER_UNKNOWN diff --git a/arch/x86/platforms/atom/Makefile b/arch/x86/soc/atom/Makefile similarity index 87% rename from arch/x86/platforms/atom/Makefile rename to arch/x86/soc/atom/Makefile index c167e02f4e1..cb15a8ef4f2 100644 --- a/arch/x86/platforms/atom/Makefile +++ b/arch/x86/soc/atom/Makefile @@ -3,4 +3,4 @@ ccflags-y +=-I$(srctree)/include/drivers ccflags-y +=-I$(srctree)/drivers asflags-y := ${ccflags-y} -obj-y += platform.o +obj-y += soc.o diff --git a/arch/x86/platforms/atom/linker.cmd b/arch/x86/soc/atom/linker.cmd similarity index 100% rename from arch/x86/platforms/atom/linker.cmd rename to arch/x86/soc/atom/linker.cmd diff --git a/arch/x86/platforms/ia32/platform.c b/arch/x86/soc/atom/soc.c similarity index 97% rename from arch/x86/platforms/ia32/platform.c rename to arch/x86/soc/atom/soc.c index 66c4f053523..0e254304a27 100644 --- a/arch/x86/platforms/ia32/platform.c +++ b/arch/x86/soc/atom/soc.c @@ -23,7 +23,7 @@ */ #include -#include "platform.h" +#include "soc.h" #include #include #include diff --git a/arch/x86/platforms/ia32/platform.h b/arch/x86/soc/atom/soc.h similarity index 95% rename from arch/x86/platforms/ia32/platform.h rename to arch/x86/soc/atom/soc.h index 253416346b5..aafd1562868 100644 --- a/arch/x86/platforms/ia32/platform.h +++ b/arch/x86/soc/atom/soc.h @@ -22,8 +22,8 @@ * the 'ia32' platform. */ -#ifndef __PLATFORM_H_ -#define __PLATFORM_H_ +#ifndef __SOC_H_ +#define __SOC_H_ #include @@ -47,4 +47,4 @@ #define INT_VEC_IRQ0 0x20 /* vector number for IRQ0 */ -#endif /* __PLATFORM_H_ */ +#endif /* __SOC_H_ */ diff --git a/arch/x86/platforms/ia32/Kconfig b/arch/x86/soc/ia32/Kconfig similarity index 98% rename from arch/x86/platforms/ia32/Kconfig rename to arch/x86/soc/ia32/Kconfig index 05b22427567..f9916baac96 100644 --- a/arch/x86/platforms/ia32/Kconfig +++ b/arch/x86/soc/ia32/Kconfig @@ -16,9 +16,9 @@ # limitations under the License. # -if PLATFORM_IA32 +if SOC_IA32 -config PLATFORM +config SOC default ia32 config PHYS_LOAD_ADDR diff --git a/arch/x86/soc/ia32/Kconfig.soc b/arch/x86/soc/ia32/Kconfig.soc new file mode 100644 index 00000000000..ff19ba5f480 --- /dev/null +++ b/arch/x86/soc/ia32/Kconfig.soc @@ -0,0 +1,5 @@ + + +config SOC_IA32 + bool "Generic IA32 SoC" + select BOOTLOADER_UNKNOWN diff --git a/arch/x86/platforms/ia32/Makefile b/arch/x86/soc/ia32/Makefile similarity index 87% rename from arch/x86/platforms/ia32/Makefile rename to arch/x86/soc/ia32/Makefile index c167e02f4e1..cb15a8ef4f2 100644 --- a/arch/x86/platforms/ia32/Makefile +++ b/arch/x86/soc/ia32/Makefile @@ -3,4 +3,4 @@ ccflags-y +=-I$(srctree)/include/drivers ccflags-y +=-I$(srctree)/drivers asflags-y := ${ccflags-y} -obj-y += platform.o +obj-y += soc.o diff --git a/arch/x86/platforms/ia32/linker.cmd b/arch/x86/soc/ia32/linker.cmd similarity index 100% rename from arch/x86/platforms/ia32/linker.cmd rename to arch/x86/soc/ia32/linker.cmd diff --git a/arch/x86/platforms/atom/platform.c b/arch/x86/soc/ia32/soc.c similarity index 97% rename from arch/x86/platforms/atom/platform.c rename to arch/x86/soc/ia32/soc.c index 66c4f053523..0e254304a27 100644 --- a/arch/x86/platforms/atom/platform.c +++ b/arch/x86/soc/ia32/soc.c @@ -23,7 +23,7 @@ */ #include -#include "platform.h" +#include "soc.h" #include #include #include diff --git a/arch/x86/platforms/atom/platform.h b/arch/x86/soc/ia32/soc.h similarity index 95% rename from arch/x86/platforms/atom/platform.h rename to arch/x86/soc/ia32/soc.h index 253416346b5..aafd1562868 100644 --- a/arch/x86/platforms/atom/platform.h +++ b/arch/x86/soc/ia32/soc.h @@ -22,8 +22,8 @@ * the 'ia32' platform. */ -#ifndef __PLATFORM_H_ -#define __PLATFORM_H_ +#ifndef __SOC_H_ +#define __SOC_H_ #include @@ -47,4 +47,4 @@ #define INT_VEC_IRQ0 0x20 /* vector number for IRQ0 */ -#endif /* __PLATFORM_H_ */ +#endif /* __SOC_H_ */ diff --git a/arch/x86/platforms/ia32_pci/Kconfig b/arch/x86/soc/ia32_pci/Kconfig similarity index 98% rename from arch/x86/platforms/ia32_pci/Kconfig rename to arch/x86/soc/ia32_pci/Kconfig index 2ae473557f3..36cb40a2638 100644 --- a/arch/x86/platforms/ia32_pci/Kconfig +++ b/arch/x86/soc/ia32_pci/Kconfig @@ -16,9 +16,9 @@ # limitations under the License. # -if PLATFORM_IA32_PCI +if SOC_IA32_PCI -config PLATFORM +config SOC default ia32_pci config PHYS_LOAD_ADDR diff --git a/arch/x86/platforms/ia32_pci/Kconfig.platform b/arch/x86/soc/ia32_pci/Kconfig.soc similarity index 52% rename from arch/x86/platforms/ia32_pci/Kconfig.platform rename to arch/x86/soc/ia32_pci/Kconfig.soc index a85243a90a4..a1d5980d19d 100644 --- a/arch/x86/platforms/ia32_pci/Kconfig.platform +++ b/arch/x86/soc/ia32_pci/Kconfig.soc @@ -1,6 +1,6 @@ -config PLATFORM_IA32_PCI - bool "IA32 with PCI" +config SOC_IA32_PCI + bool "Generic IA32 SoC with PCI" select HPET_TIMER select BOOTLOADER_UNKNOWN select PCI diff --git a/arch/x86/platforms/ia32_pci/Makefile b/arch/x86/soc/ia32_pci/Makefile similarity index 83% rename from arch/x86/platforms/ia32_pci/Makefile rename to arch/x86/soc/ia32_pci/Makefile index 2fa68de8884..f1dc2646e3a 100644 --- a/arch/x86/platforms/ia32_pci/Makefile +++ b/arch/x86/soc/ia32_pci/Makefile @@ -3,4 +3,4 @@ ccflags-y += -I$(srctree)/drivers asflags-y := ${ccflags-y} -obj-y += platform.o +obj-y += soc.o diff --git a/arch/x86/platforms/ia32_pci/linker.cmd b/arch/x86/soc/ia32_pci/linker.cmd similarity index 100% rename from arch/x86/platforms/ia32_pci/linker.cmd rename to arch/x86/soc/ia32_pci/linker.cmd diff --git a/arch/x86/platforms/ia32_pci/platform.c b/arch/x86/soc/ia32_pci/soc.c similarity index 98% rename from arch/x86/platforms/ia32_pci/platform.c rename to arch/x86/soc/ia32_pci/soc.c index 2c602007961..80f81e3a2b1 100644 --- a/arch/x86/platforms/ia32_pci/platform.c +++ b/arch/x86/soc/ia32_pci/soc.c @@ -30,7 +30,7 @@ #include #include #include -#include "platform.h" +#include "soc.h" #include #include #include diff --git a/arch/x86/platforms/ia32_pci/platform.h b/arch/x86/soc/ia32_pci/soc.h similarity index 97% rename from arch/x86/platforms/ia32_pci/platform.h rename to arch/x86/soc/ia32_pci/soc.h index 7ea5b714e2e..4509887b18b 100644 --- a/arch/x86/platforms/ia32_pci/platform.h +++ b/arch/x86/soc/ia32_pci/soc.h @@ -22,8 +22,8 @@ * the 'ia32_pci' platform. */ -#ifndef __PLATFORM_H_ -#define __PLATFORM_H_ +#ifndef __SOC_H_ +#define __SOC_H_ #include @@ -117,4 +117,4 @@ static inline int pci_irq2pin(int irq) return irq - NUM_STD_IRQS + 1; } -#endif /* __PLATFORM_H_ */ +#endif /* __SOC_H_ */ diff --git a/arch/x86/platforms/quark_d2000/Kconfig b/arch/x86/soc/quark_d2000/Kconfig similarity index 97% rename from arch/x86/platforms/quark_d2000/Kconfig rename to arch/x86/soc/quark_d2000/Kconfig index 48a572d0dd4..3c46538f90d 100644 --- a/arch/x86/platforms/quark_d2000/Kconfig +++ b/arch/x86/soc/quark_d2000/Kconfig @@ -14,8 +14,8 @@ # limitations under the License. # -if PLATFORM_QUARK_D2000 -config PLATFORM +if SOC_QUARK_D2000 +config SOC default quark_d2000 config SYS_CLOCK_HW_CYCLES_PER_SEC @@ -182,4 +182,4 @@ config I2C_DW_0_INT_PRIORITY default 0 endif -endif # PLATFORM_QUARK_D2000 +endif # SOC_QUARK_D2000 diff --git a/arch/x86/platforms/quark_d2000/Kconfig.platform b/arch/x86/soc/quark_d2000/Kconfig.soc similarity index 67% rename from arch/x86/platforms/quark_d2000/Kconfig.platform rename to arch/x86/soc/quark_d2000/Kconfig.soc index 0b72c360bef..129e297e8eb 100644 --- a/arch/x86/platforms/quark_d2000/Kconfig.platform +++ b/arch/x86/soc/quark_d2000/Kconfig.soc @@ -1,6 +1,6 @@ -config PLATFORM_QUARK_D2000 - bool "Minimum configuration for Quark D2000" +config SOC_QUARK_D2000 + bool "Quark D2000" select CPU_MINUTEIA select LOAPIC_TIMER select EOI_HANDLER_SUPPORTED diff --git a/arch/x86/platforms/quark_d2000/Makefile b/arch/x86/soc/quark_d2000/Makefile similarity index 73% rename from arch/x86/platforms/quark_d2000/Makefile rename to arch/x86/soc/quark_d2000/Makefile index 3a129d28de3..a5b6c28e846 100644 --- a/arch/x86/platforms/quark_d2000/Makefile +++ b/arch/x86/soc/quark_d2000/Makefile @@ -3,4 +3,4 @@ ccflags-y +=-I$(srctree)/include/drivers ccflags-y +=-I$(srctree)/drivers asflags-y := ${ccflags-y} -obj-$(CONFIG_PLATFORM_QUARK_D2000) = platform.o +obj-$(CONFIG_SOC_QUARK_D2000) = soc.o diff --git a/arch/x86/platforms/quark_d2000/linker.cmd b/arch/x86/soc/quark_d2000/linker.cmd similarity index 100% rename from arch/x86/platforms/quark_d2000/linker.cmd rename to arch/x86/soc/quark_d2000/linker.cmd diff --git a/arch/x86/platforms/quark_d2000/platform.c b/arch/x86/soc/quark_d2000/soc.c similarity index 98% rename from arch/x86/platforms/quark_d2000/platform.c rename to arch/x86/soc/quark_d2000/soc.c index b853e3ef25e..b1274d29acd 100644 --- a/arch/x86/platforms/quark_d2000/platform.c +++ b/arch/x86/soc/quark_d2000/soc.c @@ -26,7 +26,7 @@ #include #include #include -#include "platform.h" +#include "soc.h" #include #include diff --git a/arch/x86/platforms/quark_d2000/platform.h b/arch/x86/soc/quark_d2000/soc.h similarity index 98% rename from arch/x86/platforms/quark_d2000/platform.h rename to arch/x86/soc/quark_d2000/soc.h index 16d43d24fae..460f8bc7316 100644 --- a/arch/x86/platforms/quark_d2000/platform.h +++ b/arch/x86/soc/quark_d2000/soc.h @@ -20,8 +20,8 @@ * the Quark D2000 Platform. */ -#ifndef __PLATFORM_H_ -#define __PLATFORM_H_ +#ifndef __SOC_H_ +#define __SOC_H_ #include #include @@ -148,4 +148,4 @@ struct scss_interrupt { #endif #endif /* CONFIG_MVIC */ -#endif /* __PLATFORM_H_ */ +#endif /* __SOC_H_ */ diff --git a/arch/x86/platforms/quark_se/Kconfig b/arch/x86/soc/quark_se/Kconfig similarity index 98% rename from arch/x86/platforms/quark_se/Kconfig rename to arch/x86/soc/quark_se/Kconfig index da552f0a102..2194ee19a7a 100644 --- a/arch/x86/platforms/quark_se/Kconfig +++ b/arch/x86/soc/quark_se/Kconfig @@ -16,8 +16,8 @@ # limitations under the License. # -if PLATFORM_QUARK_SE -config PLATFORM +if SOC_QUARK_SE +config SOC default quark_se config PHYS_RAM_ADDR @@ -299,4 +299,4 @@ config UART_PIPE_IRQ_PRI endif -endif #PLATFORM_QUARK_SE_X86 +endif #SOC_QUARK_SE_X86 diff --git a/arch/x86/platforms/quark_se/Kconfig.platform b/arch/x86/soc/quark_se/Kconfig.soc similarity index 71% rename from arch/x86/platforms/quark_se/Kconfig.platform rename to arch/x86/soc/quark_se/Kconfig.soc index 45382814bf5..27b6b102ad6 100644 --- a/arch/x86/platforms/quark_se/Kconfig.platform +++ b/arch/x86/soc/quark_se/Kconfig.soc @@ -1,7 +1,7 @@ -config PLATFORM_QUARK_SE - bool "Minimum configuration for Quark SE" +config SOC_QUARK_SE + bool "Intel Quark SE" select CPU_MINUTEIA select IOAPIC select LOAPIC diff --git a/arch/x86/platforms/quark_se/Makefile b/arch/x86/soc/quark_se/Makefile similarity index 66% rename from arch/x86/platforms/quark_se/Makefile rename to arch/x86/soc/quark_se/Makefile index ef1eb71f356..40bffc009df 100644 --- a/arch/x86/platforms/quark_se/Makefile +++ b/arch/x86/soc/quark_se/Makefile @@ -3,4 +3,4 @@ ccflags-y +=-I$(srctree)/include/drivers ccflags-y +=-I$(srctree)/drivers asflags-y := ${ccflags-y} -obj-$(CONFIG_PLATFORM_QUARK_SE) = platform.o platform_config.o eoi.o +obj-$(CONFIG_SOC_QUARK_SE) = soc.o soc_config.o eoi.o diff --git a/arch/x86/platforms/quark_se/eoi.c b/arch/x86/soc/quark_se/eoi.c similarity index 100% rename from arch/x86/platforms/quark_se/eoi.c rename to arch/x86/soc/quark_se/eoi.c diff --git a/arch/x86/platforms/quark_se/linker.cmd b/arch/x86/soc/quark_se/linker.cmd similarity index 100% rename from arch/x86/platforms/quark_se/linker.cmd rename to arch/x86/soc/quark_se/linker.cmd diff --git a/arch/x86/platforms/quark_se/shared_mem.h b/arch/x86/soc/quark_se/shared_mem.h similarity index 100% rename from arch/x86/platforms/quark_se/shared_mem.h rename to arch/x86/soc/quark_se/shared_mem.h diff --git a/arch/x86/platforms/quark_se/platform.c b/arch/x86/soc/quark_se/soc.c similarity index 99% rename from arch/x86/platforms/quark_se/platform.c rename to arch/x86/soc/quark_se/soc.c index c954118bcf5..6332916529e 100644 --- a/arch/x86/platforms/quark_se/platform.c +++ b/arch/x86/soc/quark_se/soc.c @@ -25,7 +25,7 @@ #include #include #include -#include "platform.h" +#include "soc.h" #include #include #include "shared_mem.h" diff --git a/arch/x86/platforms/quark_se/platform.h b/arch/x86/soc/quark_se/soc.h similarity index 98% rename from arch/x86/platforms/quark_se/platform.h rename to arch/x86/soc/quark_se/soc.h index a92b00fc655..70d4bd0d4a6 100644 --- a/arch/x86/platforms/quark_se/platform.h +++ b/arch/x86/soc/quark_se/soc.h @@ -20,8 +20,8 @@ * the Quark SE Platform. */ -#ifndef __PLATFORM_H_ -#define __PLATFORM_H_ +#ifndef __SOC_H_ +#define __SOC_H_ #include #include @@ -198,4 +198,4 @@ struct scss_interrupt { #endif /* _ASMLANGUAGE */ -#endif /* __PLATFORM_H_ */ +#endif /* __SOC_H_ */ diff --git a/arch/x86/platforms/quark_se/platform_config.c b/arch/x86/soc/quark_se/soc_config.c similarity index 100% rename from arch/x86/platforms/quark_se/platform_config.c rename to arch/x86/soc/quark_se/soc_config.c diff --git a/arch/x86/platforms/quark_x1000/Kconfig b/arch/x86/soc/quark_x1000/Kconfig similarity index 99% rename from arch/x86/platforms/quark_x1000/Kconfig rename to arch/x86/soc/quark_x1000/Kconfig index 85c41381f90..ed7514d3406 100644 --- a/arch/x86/platforms/quark_x1000/Kconfig +++ b/arch/x86/soc/quark_x1000/Kconfig @@ -16,8 +16,8 @@ # limitations under the License. # -if PLATFORM_QUARK_X1000 -config PLATFORM +if SOC_QUARK_X1000 +config SOC default quark_x1000 config PHYS_LOAD_ADDR @@ -361,4 +361,4 @@ config BLUETOOTH_UART_IRQ_PRI endif -endif # PLATFORM_QUARK_X1000 +endif # SOC_QUARK_X1000 diff --git a/arch/x86/platforms/quark_x1000/Kconfig.platform b/arch/x86/soc/quark_x1000/Kconfig.soc similarity index 79% rename from arch/x86/platforms/quark_x1000/Kconfig.platform rename to arch/x86/soc/quark_x1000/Kconfig.soc index 2b3c6c503d6..a94cf9f49f9 100644 --- a/arch/x86/platforms/quark_x1000/Kconfig.platform +++ b/arch/x86/soc/quark_x1000/Kconfig.soc @@ -1,5 +1,5 @@ -config PLATFORM_QUARK_X1000 +config SOC_QUARK_X1000 bool "Quark X1000" select HPET_TIMER select BOOTLOADER_UNKNOWN diff --git a/arch/x86/platforms/quark_x1000/Makefile b/arch/x86/soc/quark_x1000/Makefile similarity index 83% rename from arch/x86/platforms/quark_x1000/Makefile rename to arch/x86/soc/quark_x1000/Makefile index 2fa68de8884..f1dc2646e3a 100644 --- a/arch/x86/platforms/quark_x1000/Makefile +++ b/arch/x86/soc/quark_x1000/Makefile @@ -3,4 +3,4 @@ ccflags-y += -I$(srctree)/drivers asflags-y := ${ccflags-y} -obj-y += platform.o +obj-y += soc.o diff --git a/arch/x86/platforms/quark_x1000/linker.cmd b/arch/x86/soc/quark_x1000/linker.cmd similarity index 100% rename from arch/x86/platforms/quark_x1000/linker.cmd rename to arch/x86/soc/quark_x1000/linker.cmd diff --git a/arch/x86/platforms/quark_x1000/platform.c b/arch/x86/soc/quark_x1000/soc.c similarity index 98% rename from arch/x86/platforms/quark_x1000/platform.c rename to arch/x86/soc/quark_x1000/soc.c index c1166b5b014..66eb5239e61 100644 --- a/arch/x86/platforms/quark_x1000/platform.c +++ b/arch/x86/soc/quark_x1000/soc.c @@ -30,7 +30,7 @@ #include #include #include -#include "platform.h" +#include "soc.h" #include #include #include diff --git a/arch/x86/platforms/quark_x1000/platform.h b/arch/x86/soc/quark_x1000/soc.h similarity index 97% rename from arch/x86/platforms/quark_x1000/platform.h rename to arch/x86/soc/quark_x1000/soc.h index c1116778fe8..43da62b275e 100644 --- a/arch/x86/platforms/quark_x1000/platform.h +++ b/arch/x86/soc/quark_x1000/soc.h @@ -22,8 +22,8 @@ * the Quark X1000 SoC. */ -#ifndef __PLATFORM_H_ -#define __PLATFORM_H_ +#ifndef __SOC_H_ +#define __SOC_H_ #include @@ -117,4 +117,4 @@ static inline int pci_irq2pin(int irq) return irq - NUM_STD_IRQS + 1; } -#endif /* __PLATFORM_H_ */ +#endif /* __SOC_H_ */ diff --git a/boards/arduino_101/Kconfig.board b/boards/arduino_101/Kconfig.board index 9d1beb75334..b921b99f730 100644 --- a/boards/arduino_101/Kconfig.board +++ b/boards/arduino_101/Kconfig.board @@ -1,5 +1,5 @@ config BOARD_ARDUINO_101 bool "Arduino 101 Board" - select PLATFORM_QUARK_SE + select SOC_QUARK_SE depends on X86 diff --git a/boards/arduino_101/arduino_101_defconfig b/boards/arduino_101/arduino_101_defconfig index d072191be7a..d811ceb0ba7 100644 --- a/boards/arduino_101/arduino_101_defconfig +++ b/boards/arduino_101/arduino_101_defconfig @@ -1,5 +1,5 @@ CONFIG_X86=y -CONFIG_PLATFORM_QUARK_SE=y +CONFIG_SOC_QUARK_SE=y CONFIG_BOARD_ARDUINO_101=y CONFIG_CPU_MINUTEIA=y CONFIG_CONSOLE=y diff --git a/boards/arduino_101/board.h b/boards/arduino_101/board.h index 5c3b00b81cd..55029f6e450 100644 --- a/boards/arduino_101/board.h +++ b/boards/arduino_101/board.h @@ -17,6 +17,6 @@ #ifndef __INC_BOARD_H #define __INC_BOARD_H -#include +#include #endif /* __INC_BOARD_H */ diff --git a/boards/arduino_101_sss/Kconfig.board b/boards/arduino_101_sss/Kconfig.board index 3fe99fa2a7f..6e04b83ae1c 100644 --- a/boards/arduino_101_sss/Kconfig.board +++ b/boards/arduino_101_sss/Kconfig.board @@ -1,5 +1,5 @@ config BOARD_ARDUINO_101_SSS bool "Arduino 101 Sensor Sub System" - select PLATFORM_QUARK_SE_SS + select SOC_QUARK_SE_SS depends on ARC diff --git a/boards/arduino_101_sss/board.h b/boards/arduino_101_sss/board.h index 5c3b00b81cd..55029f6e450 100644 --- a/boards/arduino_101_sss/board.h +++ b/boards/arduino_101_sss/board.h @@ -17,6 +17,6 @@ #ifndef __INC_BOARD_H #define __INC_BOARD_H -#include +#include #endif /* __INC_BOARD_H */ diff --git a/boards/basic_cortex_m3/Kconfig.board b/boards/basic_cortex_m3/Kconfig.board index d6ce344aa8d..9aa245312ba 100644 --- a/boards/basic_cortex_m3/Kconfig.board +++ b/boards/basic_cortex_m3/Kconfig.board @@ -1,5 +1,5 @@ config BOARD_BASIC_CORTEX_M3 bool "Baic Cortex-M3 Board" - select PLATFORM_TI_LM3S6965 + select SOC_TI_LM3S6965 depends on ARM diff --git a/boards/basic_cortex_m3/basic_cortex_m3_defconfig b/boards/basic_cortex_m3/basic_cortex_m3_defconfig index f7f58e14807..942482ee9b4 100644 --- a/boards/basic_cortex_m3/basic_cortex_m3_defconfig +++ b/boards/basic_cortex_m3/basic_cortex_m3_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_BOARD_BASIC_CORTEX_M3=y -CONFIG_PLATFORM_TI_LM3S6965=y +CONFIG_SOC_TI_LM3S6965=y CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=12000000 CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y diff --git a/boards/basic_cortex_m3/board.h b/boards/basic_cortex_m3/board.h index 5c3b00b81cd..55029f6e450 100644 --- a/boards/basic_cortex_m3/board.h +++ b/boards/basic_cortex_m3/board.h @@ -17,6 +17,6 @@ #ifndef __INC_BOARD_H #define __INC_BOARD_H -#include +#include #endif /* __INC_BOARD_H */ diff --git a/boards/basic_minuteia/Kconfig.board b/boards/basic_minuteia/Kconfig.board index 87e4007cb07..86e531baac6 100644 --- a/boards/basic_minuteia/Kconfig.board +++ b/boards/basic_minuteia/Kconfig.board @@ -1,5 +1,5 @@ config BOARD_BASIC_MINUTEIA bool "Basic Minute-IA Board" - select PLATFORM_IA32 + select SOC_IA32 depends on X86 diff --git a/boards/basic_minuteia/basic_atom_defconfig b/boards/basic_minuteia/basic_atom_defconfig index a484c47ba2f..afe0a5898dc 100644 --- a/boards/basic_minuteia/basic_atom_defconfig +++ b/boards/basic_minuteia/basic_atom_defconfig @@ -1,5 +1,5 @@ CONFIG_X86=y -CONFIG_PLATFORM_IA32=y +CONFIG_SOC_IA32=y CONFIG_BOARD_BASIC_ATOM=y CONFIG_CPU_ATOM=y CONFIG_IA32_LEGACY_IO_PORTS=y diff --git a/boards/basic_minuteia/basic_minuteia_defconfig b/boards/basic_minuteia/basic_minuteia_defconfig index 30cf4bb87ec..b7190aae6b0 100644 --- a/boards/basic_minuteia/basic_minuteia_defconfig +++ b/boards/basic_minuteia/basic_minuteia_defconfig @@ -1,5 +1,5 @@ CONFIG_X86=y -CONFIG_PLATFORM_IA32=y +CONFIG_SOC_IA32=y CONFIG_CPU_MINUTEIA=y CONFIG_IA32_LEGACY_IO_PORTS=y CONFIG_HPET_TIMER=y diff --git a/boards/basic_minuteia/board.h b/boards/basic_minuteia/board.h index 5c3b00b81cd..55029f6e450 100644 --- a/boards/basic_minuteia/board.h +++ b/boards/basic_minuteia/board.h @@ -17,6 +17,6 @@ #ifndef __INC_BOARD_H #define __INC_BOARD_H -#include +#include #endif /* __INC_BOARD_H */ diff --git a/boards/fsl_frdm_k64f/Kconfig.board b/boards/fsl_frdm_k64f/Kconfig.board index 0b3120d0cf5..de0b6799928 100644 --- a/boards/fsl_frdm_k64f/Kconfig.board +++ b/boards/fsl_frdm_k64f/Kconfig.board @@ -1,5 +1,5 @@ config BOARD_FSL_FRDM_K64F bool "Freescale FRDM-K64F" - select PLATFORM_FSL_FRDM_K64F + select SOC_FSL_FRDM_K64F depends on ARM diff --git a/boards/fsl_frdm_k64f/board.h b/boards/fsl_frdm_k64f/board.h index 5c3b00b81cd..55029f6e450 100644 --- a/boards/fsl_frdm_k64f/board.h +++ b/boards/fsl_frdm_k64f/board.h @@ -17,6 +17,6 @@ #ifndef __INC_BOARD_H #define __INC_BOARD_H -#include +#include #endif /* __INC_BOARD_H */ diff --git a/boards/fsl_frdm_k64f/fsl_frdm_k64f_defconfig b/boards/fsl_frdm_k64f/fsl_frdm_k64f_defconfig index 523ed4122ca..f862cd13f83 100644 --- a/boards/fsl_frdm_k64f/fsl_frdm_k64f_defconfig +++ b/boards/fsl_frdm_k64f/fsl_frdm_k64f_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=120000000 -CONFIG_PLATFORM_FSL_FRDM_K64F=y +CONFIG_SOC_FSL_FRDM_K64F=y CONFIG_BOARD_FSL_FRDM_K64F=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y diff --git a/boards/galileo/Kconfig.board b/boards/galileo/Kconfig.board index 8fc8b514b99..d40b15484b1 100644 --- a/boards/galileo/Kconfig.board +++ b/boards/galileo/Kconfig.board @@ -1,7 +1,7 @@ config BOARD_GALILEO bool "Galileo Gen2" - select PLATFORM_QUARK_X1000 + select SOC_QUARK_X1000 depends on X86 help The Intel Galileo Gen 2 development board is a microcontroller board diff --git a/boards/galileo/board.h b/boards/galileo/board.h index 5c3b00b81cd..55029f6e450 100644 --- a/boards/galileo/board.h +++ b/boards/galileo/board.h @@ -17,6 +17,6 @@ #ifndef __INC_BOARD_H #define __INC_BOARD_H -#include +#include #endif /* __INC_BOARD_H */ diff --git a/boards/galileo/galileo_defconfig b/boards/galileo/galileo_defconfig index 3f6636e4b12..a5341a181b2 100644 --- a/boards/galileo/galileo_defconfig +++ b/boards/galileo/galileo_defconfig @@ -1,7 +1,7 @@ CONFIG_NANO_TIMERS=y CONFIG_NANO_TIMEOUTS=y CONFIG_X86=y -CONFIG_PLATFORM_QUARK_X1000=y +CONFIG_SOC_QUARK_X1000=y CONFIG_BOARD_GALILEO=y CONFIG_CPU_MINUTEIA=y CONFIG_PCI_LEGACY_BRIDGE=y diff --git a/boards/minnowboard/Kconfig.board b/boards/minnowboard/Kconfig.board index 2736c6d555d..4768b75d83f 100644 --- a/boards/minnowboard/Kconfig.board +++ b/boards/minnowboard/Kconfig.board @@ -1,5 +1,5 @@ config BOARD_MINNOWBOARD bool "Minnowboard Max" - select PLATFORM_ATOM + select SOC_ATOM depends on X86 diff --git a/boards/minnowboard/board.h b/boards/minnowboard/board.h index 5c3b00b81cd..55029f6e450 100644 --- a/boards/minnowboard/board.h +++ b/boards/minnowboard/board.h @@ -17,6 +17,6 @@ #ifndef __INC_BOARD_H #define __INC_BOARD_H -#include +#include #endif /* __INC_BOARD_H */ diff --git a/boards/minnowboard/minnowboard_defconfig b/boards/minnowboard/minnowboard_defconfig index 0b482975b8b..e6d4410923a 100644 --- a/boards/minnowboard/minnowboard_defconfig +++ b/boards/minnowboard/minnowboard_defconfig @@ -1,7 +1,7 @@ CONFIG_X86=y +CONFIG_SOC_ATOM=y CONFIG_BOARD_MINNOWBOARD=y CONFIG_CPU_ATOM=y -CONFIG_PLATFORM_ATOM=y CONFIG_IA32_LEGACY_IO_PORTS=y CONFIG_HPET_TIMER=y CONFIG_HPET_TIMER_IRQ=2 diff --git a/boards/qemu_cortex_m3/Kconfig.board b/boards/qemu_cortex_m3/Kconfig.board index 5eada17c00d..d0b89be6dd6 100644 --- a/boards/qemu_cortex_m3/Kconfig.board +++ b/boards/qemu_cortex_m3/Kconfig.board @@ -1,5 +1,5 @@ config BOARD_QEMU_CORTEX_M3 bool "Cortex-M3 Emulation (Qemu)" - select PLATFORM_TI_LM3S6965 + select SOC_TI_LM3S6965 depends on ARM diff --git a/boards/qemu_cortex_m3/board.h b/boards/qemu_cortex_m3/board.h index 5c3b00b81cd..55029f6e450 100644 --- a/boards/qemu_cortex_m3/board.h +++ b/boards/qemu_cortex_m3/board.h @@ -17,6 +17,6 @@ #ifndef __INC_BOARD_H #define __INC_BOARD_H -#include +#include #endif /* __INC_BOARD_H */ diff --git a/boards/qemu_cortex_m3/qemu_cortex_m3_defconfig b/boards/qemu_cortex_m3/qemu_cortex_m3_defconfig index 6a097956922..0f541aa1cc7 100644 --- a/boards/qemu_cortex_m3/qemu_cortex_m3_defconfig +++ b/boards/qemu_cortex_m3/qemu_cortex_m3_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=12000000 -CONFIG_PLATFORM_TI_LM3S6965=y +CONFIG_SOC_TI_LM3S6965=y CONFIG_BOARD_QEMU_CORTEX_M3=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y diff --git a/boards/qemu_x86/Kconfig.board b/boards/qemu_x86/Kconfig.board index 0ce23ea2969..778e9284fee 100644 --- a/boards/qemu_x86/Kconfig.board +++ b/boards/qemu_x86/Kconfig.board @@ -1,5 +1,5 @@ config BOARD_QEMU_X86 bool "QEMU x86" - select PLATFORM_IA32 + select SOC_IA32 depends on X86 diff --git a/boards/qemu_x86/board.h b/boards/qemu_x86/board.h index 5c3b00b81cd..55029f6e450 100644 --- a/boards/qemu_x86/board.h +++ b/boards/qemu_x86/board.h @@ -17,6 +17,6 @@ #ifndef __INC_BOARD_H #define __INC_BOARD_H -#include +#include #endif /* __INC_BOARD_H */ diff --git a/boards/qemu_x86/qemu_x86_defconfig b/boards/qemu_x86/qemu_x86_defconfig index d0ce00742d4..3512df91e17 100644 --- a/boards/qemu_x86/qemu_x86_defconfig +++ b/boards/qemu_x86/qemu_x86_defconfig @@ -1,5 +1,5 @@ CONFIG_X86=y -CONFIG_PLATFORM_IA32=y +CONFIG_SOC_IA32=y CONFIG_BOARD_QEMU_X86=y CONFIG_CPU_MINUTEIA=y CONFIG_IA32_LEGACY_IO_PORTS=y diff --git a/boards/quark_d2000_crb/Kconfig.board b/boards/quark_d2000_crb/Kconfig.board index 1eb64a53032..01d5d5091b9 100644 --- a/boards/quark_d2000_crb/Kconfig.board +++ b/boards/quark_d2000_crb/Kconfig.board @@ -1,5 +1,5 @@ config BOARD_QUARK_D2000_CRB bool "Quark D2000 CRB" - select PLATFORM_QUARK_D2000 + select SOC_QUARK_D2000 depends on X86 diff --git a/boards/quark_d2000_crb/board.h b/boards/quark_d2000_crb/board.h index 5c3b00b81cd..55029f6e450 100644 --- a/boards/quark_d2000_crb/board.h +++ b/boards/quark_d2000_crb/board.h @@ -17,6 +17,6 @@ #ifndef __INC_BOARD_H #define __INC_BOARD_H -#include +#include #endif /* __INC_BOARD_H */ diff --git a/boards/quark_d2000_crb/quark_d2000_crb_defconfig b/boards/quark_d2000_crb/quark_d2000_crb_defconfig index 0a7a6902aa2..c914730fb40 100644 --- a/boards/quark_d2000_crb/quark_d2000_crb_defconfig +++ b/boards/quark_d2000_crb/quark_d2000_crb_defconfig @@ -1,5 +1,5 @@ CONFIG_X86=y -CONFIG_PLATFORM_QUARK_D2000=y +CONFIG_SOC_QUARK_D2000=y CONFIG_BOARD_QUARK_D2000_CRB=y CONFIG_CPU_MINUTEIA=y CONFIG_IDT_NUM_VECTORS=64 diff --git a/boards/quark_se_ctb/Kconfig.board b/boards/quark_se_ctb/Kconfig.board index bc84d5af7f1..cfc8f0ae1c3 100644 --- a/boards/quark_se_ctb/Kconfig.board +++ b/boards/quark_se_ctb/Kconfig.board @@ -1,5 +1,5 @@ config BOARD_QUARK_SE_CTB bool "Quark SE Test Board" - select PLATFORM_QUARK_SE + select SOC_QUARK_SE depends on X86 diff --git a/boards/quark_se_ctb/board.h b/boards/quark_se_ctb/board.h index 5c3b00b81cd..55029f6e450 100644 --- a/boards/quark_se_ctb/board.h +++ b/boards/quark_se_ctb/board.h @@ -17,6 +17,6 @@ #ifndef __INC_BOARD_H #define __INC_BOARD_H -#include +#include #endif /* __INC_BOARD_H */ diff --git a/boards/quark_se_ctb/quark_se_ctb_defconfig b/boards/quark_se_ctb/quark_se_ctb_defconfig index ac23abe367d..d3ba112bf51 100644 --- a/boards/quark_se_ctb/quark_se_ctb_defconfig +++ b/boards/quark_se_ctb/quark_se_ctb_defconfig @@ -1,5 +1,5 @@ CONFIG_X86=y -CONFIG_PLATFORM_QUARK_SE=y +CONFIG_SOC_QUARK_SE=y CONFIG_BOARD_QUARK_SE_CTB=y CONFIG_CPU_MINUTEIA=y CONFIG_CONSOLE=y diff --git a/boards/quark_se_sss_ctb/Kconfig.board b/boards/quark_se_sss_ctb/Kconfig.board index e3e15b12639..ac13724885b 100644 --- a/boards/quark_se_sss_ctb/Kconfig.board +++ b/boards/quark_se_sss_ctb/Kconfig.board @@ -1,5 +1,5 @@ config BOARD_QUARK_SE_SSS_CTB bool "Quark SE Test Board - Sensor Sub System" - select PLATFORM_QUARK_SE_SS + select SOC_QUARK_SE_SS depends on ARC diff --git a/boards/quark_se_sss_ctb/board.h b/boards/quark_se_sss_ctb/board.h index 5c3b00b81cd..55029f6e450 100644 --- a/boards/quark_se_sss_ctb/board.h +++ b/boards/quark_se_sss_ctb/board.h @@ -17,6 +17,6 @@ #ifndef __INC_BOARD_H #define __INC_BOARD_H -#include +#include #endif /* __INC_BOARD_H */ diff --git a/boards/quark_se_sss_ctb/quark_se_sss_ctb_defconfig b/boards/quark_se_sss_ctb/quark_se_sss_ctb_defconfig index 51b6553ce93..cf8e9bc9656 100644 --- a/boards/quark_se_sss_ctb/quark_se_sss_ctb_defconfig +++ b/boards/quark_se_sss_ctb/quark_se_sss_ctb_defconfig @@ -1,5 +1,5 @@ CONFIG_ARC=y -CONFIG_PLATFORM_QUARK_SE_SS=y +CONFIG_SOC_QUARK_SE_SS=y CONFIG_BOARD_QUARK_SE_SSS_CTB=y CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=32000000 diff --git a/doc/kernel/common/common_kernel_clocks.rst b/doc/kernel/common/common_kernel_clocks.rst index bc76ca40dc0..616bb20a633 100644 --- a/doc/kernel/common/common_kernel_clocks.rst +++ b/doc/kernel/common/common_kernel_clocks.rst @@ -19,7 +19,7 @@ The kernel supports two distinct clocks. * A 32-bit *hardware clock*, which is used as the source of the ticks for the system clock. This clock is a counter measured in unspecified units (called *cycles*), and increments at a frequency - determined by the platform hardware. + determined by the soc.hardware. The kernel allows this clock to be accessed directly by reading the timer. diff --git a/doc/kernel/nanokernel/nanokernel_interrupts.rst b/doc/kernel/nanokernel/nanokernel_interrupts.rst index 4a93e756741..2c1e614621e 100644 --- a/doc/kernel/nanokernel/nanokernel_interrupts.rst +++ b/doc/kernel/nanokernel/nanokernel_interrupts.rst @@ -14,7 +14,7 @@ allowing the response to occur with very low overhead. When an ISR completes its normal task and fiber execution resumes. Any number of ISRs can be utilized in a Zephyr project, subject to -any hardware constraints imposed by the underlying platform hardware. +any hardware constraints imposed by the underlying hardware. Each ISR has the following properties: * The :abbr:`IRQ (Interrupt ReQuest)` signal that triggers the ISR. diff --git a/drivers/adc/adc_dw.c b/drivers/adc/adc_dw.c index 24376adfde0..1a045cf3037 100644 --- a/drivers/adc/adc_dw.c +++ b/drivers/adc/adc_dw.c @@ -49,7 +49,7 @@ #define SEQ_MUX_ODD_POS 16 #define SEQ_DELAY_ODD_POS 21 -#ifdef CONFIG_PLATFORM_QUARK_SE_SS +#ifdef CONFIG_SOC_QUARK_SE_SS #define int_unmask(__mask) \ sys_write32(sys_read32((__mask)) & ENABLE_SSS_INTERRUPTS, (__mask)) #else diff --git a/drivers/clock_control/Kconfig b/drivers/clock_control/Kconfig index 19853201a11..5f6f67dcfa1 100644 --- a/drivers/clock_control/Kconfig +++ b/drivers/clock_control/Kconfig @@ -38,7 +38,7 @@ config CLOCK_CONTROL_DEBUG config CLOCK_CONTROL_QUARK_SE bool prompt "Quark SE Clock controller support" - depends on CLOCK_CONTROL && PLATFORM_QUARK_SE + depends on CLOCK_CONTROL && SOC_QUARK_SE default n help Enable support for the Quark SE clock driver. diff --git a/drivers/gpio/gpio_dw.c b/drivers/gpio/gpio_dw.c index ef4ef4bb770..d15fb674735 100644 --- a/drivers/gpio/gpio_dw.c +++ b/drivers/gpio/gpio_dw.c @@ -115,7 +115,7 @@ static inline void _gpio_dw_clock_off(struct device *port) #define _gpio_dw_clock_off(...) #endif -#ifdef CONFIG_PLATFORM_QUARK_SE_SS +#ifdef CONFIG_SOC_QUARK_SE_SS static inline void dw_set_both_edges(uint32_t base_addr, uint32_t pin) { ARG_UNUSED(base_addr); @@ -292,7 +292,7 @@ static inline int gpio_dw_resume_port(struct device *port) return 0; } -#ifdef CONFIG_PLATFORM_QUARK_SE +#ifdef CONFIG_SOC_QUARK_SE static inline void gpio_dw_unmask_int(struct device *port) { sys_write32(sys_read32(GPIO_INT_MASK) & INT_UNMASK_IA, GPIO_INT_MASK); @@ -392,10 +392,10 @@ int gpio_dw_initialize(struct device *port) base_addr = config->base_addr; -#ifdef CONFIG_PLATFORM_QUARK_SE_SS +#ifdef CONFIG_SOC_QUARK_SE_SS /* Need to enable clock for GPIO controller */ dw_set_bit(base_addr, INT_CLOCK_SYNC, CLK_ENA_POS, 1); -#endif /* CONFIG_PLATFORM_QUARK_SE_SS */ +#endif /* CONFIG_SOC_QUARK_SE_SS */ /* interrupts in sync with system clock */ dw_set_bit(base_addr, INT_CLOCK_SYNC, LS_SYNC_POS, 1); @@ -412,12 +412,12 @@ int gpio_dw_initialize(struct device *port) config->config_func(port); gpio_dw_unmask_int(port); -#ifdef CONFIG_PLATFORM_QUARK_SE_SS +#ifdef CONFIG_SOC_QUARK_SE_SS /* ARC needs this to work, or else the parameter * passed to ISR is null. */ irq_connect(config->irq_num, 1, gpio_dw_isr, port, 0); -#endif /* CONFIG_PLATFORM_QUARK_SE_SS */ +#endif /* CONFIG_SOC_QUARK_SE_SS */ return 0; } diff --git a/drivers/gpio/gpio_dw_registers.h b/drivers/gpio/gpio_dw_registers.h index 505da5bf994..c2598a6f16d 100644 --- a/drivers/gpio/gpio_dw_registers.h +++ b/drivers/gpio/gpio_dw_registers.h @@ -16,7 +16,7 @@ * limitations under the License. */ -#ifdef CONFIG_PLATFORM_QUARK_SE_SS +#ifdef CONFIG_SOC_QUARK_SE_SS #define SWPORTA_DR 0x00 #define SWPORTA_DDR 0x01 #define INTEN 0x03 diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig index ca747a419ce..957f4417a58 100644 --- a/drivers/i2c/Kconfig +++ b/drivers/i2c/Kconfig @@ -236,7 +236,7 @@ config I2C_DEBUG config I2C_QUARK_SE_SS bool "Enable I2C Support on Quark SE Sensor Subsystem (SS)" default n - depends on PLATFORM_QUARK_SE_SS + depends on SOC_QUARK_SE_SS depends on I2C help This option enables the driver to support the I2C on Quark SE Sensor diff --git a/drivers/ipm/ipm_quark_se.h b/drivers/ipm/ipm_quark_se.h index 76eba9c3241..94f90cc7a9c 100644 --- a/drivers/ipm/ipm_quark_se.h +++ b/drivers/ipm/ipm_quark_se.h @@ -29,14 +29,14 @@ #define QUARK_SE_IPM_OUTBOUND 0 #define QUARK_SE_IPM_INBOUND 1 -#if defined(CONFIG_PLATFORM_QUARK_SE) +#if defined(CONFIG_SOC_QUARK_SE) /* First byte of the QUARK_SE_IPM_MASK register is for the Lakemont */ #define QUARK_SE_IPM_MASK_START_BIT 0 #define QUARK_SE_IPM_INTERRUPT 21 #define QUARK_SE_IPM_ARC_LMT_DIR QUARK_SE_IPM_INBOUND #define QUARK_SE_IPM_LMT_ARC_DIR QUARK_SE_IPM_OUTBOUND -#elif defined(CONFIG_PLATFORM_QUARK_SE_SS) +#elif defined(CONFIG_SOC_QUARK_SE_SS) /* Second byte is for ARC */ #define QUARK_SE_IPM_MASK_START_BIT 8 #define QUARK_SE_IPM_INTERRUPT 57 diff --git a/drivers/serial/Kconfig.ns16550 b/drivers/serial/Kconfig.ns16550 index d570f894cec..c875105fc87 100644 --- a/drivers/serial/Kconfig.ns16550 +++ b/drivers/serial/Kconfig.ns16550 @@ -20,7 +20,7 @@ config UART_NS16550_PCI choice prompt "Controller Registers Access Method" depends on UART_NS16550 - default UART_NS16550_ACCESS_IOPORT if PLATFORM_IA32 + default UART_NS16550_ACCESS_IOPORT if SOC_IA32 default UART_NS16550_ACCESS_MMIO config UART_NS16550_ACCESS_MMIO diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index 975d5091f96..66a2f284ce2 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -249,7 +249,7 @@ endchoice config SPI_DW_CLOCK_GATE bool "Enable glock gating" - depends on SPI_DW && PLATFORM_QUARK_SE + depends on SPI_DW && SOC_QUARK_SE select CLOCK_CONTROL default n diff --git a/drivers/spi/dw_spi.c b/drivers/spi/dw_spi.c index 11180cf8a0c..172644ec3e2 100644 --- a/drivers/spi/dw_spi.c +++ b/drivers/spi/dw_spi.c @@ -96,7 +96,7 @@ DEFINE_TEST_BIT_OP(sr_tfnf, DW_SPI_REG_SR, DW_SPI_SR_TFNF_BIT) DEFINE_TEST_BIT_OP(sr_rfne, DW_SPI_REG_SR, DW_SPI_SR_RFNE_BIT) DEFINE_TEST_BIT_OP(icr, DW_SPI_REG_ICR, DW_SPI_SR_ICR_BIT) -#ifdef CONFIG_PLATFORM_QUARK_SE +#ifdef CONFIG_SOC_QUARK_SE #define int_unmask(__mask) \ sys_write32(sys_read32(__mask) & INT_UNMASK_IA, __mask) #else diff --git a/drivers/watchdog/wdt_dw.c b/drivers/watchdog/wdt_dw.c index 9b56c2d1de4..9fffaeacd54 100644 --- a/drivers/watchdog/wdt_dw.c +++ b/drivers/watchdog/wdt_dw.c @@ -71,7 +71,7 @@ static void wdt_dw_enable(struct device *dev) { _wdt_dw_clock_on(dev); -#if defined(CONFIG_PLATFORM_QUARK_SE) || defined(CONFIG_PLATFORM_QUARK_D2000) +#if defined(CONFIG_SOC_QUARK_SE) || defined(CONFIG_SOC_QUARK_D2000) sys_set_bit(SCSS_PERIPHERAL_BASE + SCSS_PERIPH_CFG0, 1); #endif } @@ -80,7 +80,7 @@ static void wdt_dw_disable(struct device *dev) { _wdt_dw_clock_off(dev); -#if defined(CONFIG_PLATFORM_QUARK_SE) || defined(CONFIG_PLATFORM_QUARK_D2000) +#if defined(CONFIG_SOC_QUARK_SE) || defined(CONFIG_SOC_QUARK_D2000) sys_clear_bit(SCSS_PERIPHERAL_BASE + SCSS_PERIPH_CFG0, 1); #endif } diff --git a/include/arch/arm/cortex_m/nvic.h b/include/arch/arm/cortex_m/nvic.h index 178531d15df..0315c691367 100644 --- a/include/arch/arm/cortex_m/nvic.h +++ b/include/arch/arm/cortex_m/nvic.h @@ -211,7 +211,7 @@ static inline uint32_t _NvicIrqPrioGet(unsigned int irq) static inline void _NvicSwInterruptTrigger(unsigned int irq) { -#if defined(CONFIG_PLATFORM_TI_LM3S6965_QEMU) +#if defined(CONFIG_SOC_TI_LM3S6965_QEMU) /* the QEMU does not simulate the STIR register: this is a workaround */ _NvicIrqPend(irq); #else diff --git a/samples/bluetooth/beacon/testcase.ini b/samples/bluetooth/beacon/testcase.ini index 7946e54c26a..2eaa2890ced 100644 --- a/samples/bluetooth/beacon/testcase.ini +++ b/samples/bluetooth/beacon/testcase.ini @@ -3,7 +3,7 @@ tags = bluetooth build_only = true arch_whitelist = x86 # FIXME Doesn't work for ia32_pci -config_whitelist = CONFIG_PLATFORM="ia32" +config_whitelist = CONFIG_SOC="ia32" [test_arm] tags = bluetooth diff --git a/samples/bluetooth/central/testcase.ini b/samples/bluetooth/central/testcase.ini index add8fc46cd0..3206e889370 100644 --- a/samples/bluetooth/central/testcase.ini +++ b/samples/bluetooth/central/testcase.ini @@ -3,7 +3,7 @@ tags = bluetooth build_only = true arch_whitelist = x86 # FIXME Doesn't work for ia32_pci -config_whitelist = CONFIG_PLATFORM="ia32" +config_whitelist = CONFIG_SOC="ia32" [test_arm] tags = bluetooth diff --git a/samples/bluetooth/central_hr/testcase.ini b/samples/bluetooth/central_hr/testcase.ini index 84e8d8ee478..8fe3950e49d 100644 --- a/samples/bluetooth/central_hr/testcase.ini +++ b/samples/bluetooth/central_hr/testcase.ini @@ -3,5 +3,5 @@ tags = bluetooth build_only = true arch_whitelist = x86 # FIXME Doesn't work for ia32_pci -config_whitelist = CONFIG_PLATFORM="ia32" +config_whitelist = CONFIG_SOC="ia32" diff --git a/samples/bluetooth/init/testcase.ini b/samples/bluetooth/init/testcase.ini index 4ea5f6e01e3..2d14db30c0c 100644 --- a/samples/bluetooth/init/testcase.ini +++ b/samples/bluetooth/init/testcase.ini @@ -3,5 +3,5 @@ tags = bluetooth build_only = true arch_whitelist = x86 # Doesn't work for ia32_pci -config_whitelist = CONFIG_PLATFORM="ia32" +config_whitelist = CONFIG_SOC="ia32" diff --git a/samples/bluetooth/init_h5/testcase.ini b/samples/bluetooth/init_h5/testcase.ini index c8f655d5162..88db3c61e65 100644 --- a/samples/bluetooth/init_h5/testcase.ini +++ b/samples/bluetooth/init_h5/testcase.ini @@ -3,4 +3,4 @@ tags = bluetooth build_only = true arch_whitelist = x86 # Doesn't work for ia32_pci -config_whitelist = CONFIG_PLATFORM="ia32" +config_whitelist = CONFIG_SOC="ia32" diff --git a/samples/bluetooth/ipsp/src/main.c b/samples/bluetooth/ipsp/src/main.c index bd35f3a7bf9..6b20d3166ca 100644 --- a/samples/bluetooth/ipsp/src/main.c +++ b/samples/bluetooth/ipsp/src/main.c @@ -96,7 +96,7 @@ static struct bt_gatt_attr attrs[] = { BT_GATT_PRIMARY_SERVICE(BT_UUID_DIS), BT_GATT_CHARACTERISTIC(BT_UUID_DIS_MODEL_NUMBER, BT_GATT_CHRC_READ), BT_GATT_DESCRIPTOR(BT_UUID_DIS_MODEL_NUMBER, BT_GATT_PERM_READ, - read_model, NULL, CONFIG_PLATFORM), + read_model, NULL, CONFIG_SOC), BT_GATT_CHARACTERISTIC(BT_UUID_DIS_MANUFACTURER_NAME, BT_GATT_CHRC_READ), BT_GATT_DESCRIPTOR(BT_UUID_DIS_MANUFACTURER_NAME, BT_GATT_PERM_READ, diff --git a/samples/bluetooth/ipsp/testcase.ini b/samples/bluetooth/ipsp/testcase.ini index bc5a1e173c2..568eed4113f 100644 --- a/samples/bluetooth/ipsp/testcase.ini +++ b/samples/bluetooth/ipsp/testcase.ini @@ -3,7 +3,7 @@ tags = bluetooth,net build_only = true arch_whitelist = x86 # FIXME Doesn't work for ia32_pci -config_whitelist = CONFIG_PLATFORM="ia32" +config_whitelist = CONFIG_SOC="ia32" [test_arm] tags = bluetooth,net diff --git a/samples/bluetooth/peripheral/src/main.c b/samples/bluetooth/peripheral/src/main.c index 1c75c247842..b21af2ed526 100644 --- a/samples/bluetooth/peripheral/src/main.c +++ b/samples/bluetooth/peripheral/src/main.c @@ -346,7 +346,7 @@ static struct bt_gatt_attr attrs[] = { BT_GATT_PRIMARY_SERVICE(BT_UUID_DIS), BT_GATT_CHARACTERISTIC(BT_UUID_DIS_MODEL_NUMBER, BT_GATT_CHRC_READ), BT_GATT_DESCRIPTOR(BT_UUID_DIS_MODEL_NUMBER, BT_GATT_PERM_READ, - read_model, NULL, CONFIG_PLATFORM), + read_model, NULL, CONFIG_SOC), BT_GATT_CHARACTERISTIC(BT_UUID_DIS_MANUFACTURER_NAME, BT_GATT_CHRC_READ), BT_GATT_DESCRIPTOR(BT_UUID_DIS_MANUFACTURER_NAME, BT_GATT_PERM_READ, diff --git a/samples/bluetooth/peripheral/testcase.ini b/samples/bluetooth/peripheral/testcase.ini index 7946e54c26a..2eaa2890ced 100644 --- a/samples/bluetooth/peripheral/testcase.ini +++ b/samples/bluetooth/peripheral/testcase.ini @@ -3,7 +3,7 @@ tags = bluetooth build_only = true arch_whitelist = x86 # FIXME Doesn't work for ia32_pci -config_whitelist = CONFIG_PLATFORM="ia32" +config_whitelist = CONFIG_SOC="ia32" [test_arm] tags = bluetooth diff --git a/samples/bluetooth/peripheral_dis/src/main.c b/samples/bluetooth/peripheral_dis/src/main.c index 07933b738b2..13cdf1ac5b8 100644 --- a/samples/bluetooth/peripheral_dis/src/main.c +++ b/samples/bluetooth/peripheral_dis/src/main.c @@ -64,7 +64,7 @@ static struct bt_gatt_attr attrs[] = { BT_GATT_PRIMARY_SERVICE(BT_UUID_DIS), BT_GATT_CHARACTERISTIC(BT_UUID_DIS_MODEL_NUMBER, BT_GATT_CHRC_READ), BT_GATT_DESCRIPTOR(BT_UUID_DIS_MODEL_NUMBER, BT_GATT_PERM_READ, - read_string, NULL, CONFIG_PLATFORM), + read_string, NULL, CONFIG_SOC), BT_GATT_CHARACTERISTIC(BT_UUID_DIS_MANUFACTURER_NAME, BT_GATT_CHRC_READ), BT_GATT_DESCRIPTOR(BT_UUID_DIS_MANUFACTURER_NAME, BT_GATT_PERM_READ, diff --git a/samples/bluetooth/peripheral_dis/testcase.ini b/samples/bluetooth/peripheral_dis/testcase.ini index 22c1cc1bb63..96903079eae 100644 --- a/samples/bluetooth/peripheral_dis/testcase.ini +++ b/samples/bluetooth/peripheral_dis/testcase.ini @@ -3,7 +3,7 @@ tags = bluetooth build_only = true arch_whitelist = x86 # FIXME Doesn't work for ia32_pci -config_whitelist = CONFIG_PLATFORM="ia32" +config_whitelist = CONFIG_SOC="ia32" [test_arm] tags = bluetooth diff --git a/samples/bluetooth/peripheral_sc_only/testcase.ini b/samples/bluetooth/peripheral_sc_only/testcase.ini index 22c1cc1bb63..96903079eae 100644 --- a/samples/bluetooth/peripheral_sc_only/testcase.ini +++ b/samples/bluetooth/peripheral_sc_only/testcase.ini @@ -3,7 +3,7 @@ tags = bluetooth build_only = true arch_whitelist = x86 # FIXME Doesn't work for ia32_pci -config_whitelist = CONFIG_PLATFORM="ia32" +config_whitelist = CONFIG_SOC="ia32" [test_arm] tags = bluetooth diff --git a/samples/bluetooth/shell/testcase.ini b/samples/bluetooth/shell/testcase.ini index 7946e54c26a..2eaa2890ced 100644 --- a/samples/bluetooth/shell/testcase.ini +++ b/samples/bluetooth/shell/testcase.ini @@ -3,7 +3,7 @@ tags = bluetooth build_only = true arch_whitelist = x86 # FIXME Doesn't work for ia32_pci -config_whitelist = CONFIG_PLATFORM="ia32" +config_whitelist = CONFIG_SOC="ia32" [test_arm] tags = bluetooth diff --git a/samples/microkernel/apps/nfc_hello/testcase.ini b/samples/microkernel/apps/nfc_hello/testcase.ini index f839a3106bc..765172c06ab 100644 --- a/samples/microkernel/apps/nfc_hello/testcase.ini +++ b/samples/microkernel/apps/nfc_hello/testcase.ini @@ -3,5 +3,5 @@ build_only = true tags = apps arch_whitelist = x86 # Doesn't work for ia32_pci -config_whitelist = CONFIG_PLATFORM="ia32" +config_whitelist = CONFIG_SOC="ia32" diff --git a/samples/microkernel/benchmark/latency_measure/src/Makefile b/samples/microkernel/benchmark/latency_measure/src/Makefile index e23651a283d..3d79ccef2be 100644 --- a/samples/microkernel/benchmark/latency_measure/src/Makefile +++ b/samples/microkernel/benchmark/latency_measure/src/Makefile @@ -1,6 +1,6 @@ ccflags-y += -I$(CURDIR)/misc/generated/sysgen ccflags-y += -I$(srctree)/samples/include -ccflags-$(CONFIG_PLATFORM_QUARK_D2000) += -DSTACKSIZE=256 +ccflags-$(CONFIG_SOC_QUARK_D2000) += -DSTACKSIZE=256 obj-y = main.o \ micro_int_to_task_evt.o \ diff --git a/samples/microkernel/test/test_prng/testcase.ini b/samples/microkernel/test/test_prng/testcase.ini index 3db0dab4412..95c86179a89 100644 --- a/samples/microkernel/test/test_prng/testcase.ini +++ b/samples/microkernel/test/test_prng/testcase.ini @@ -2,4 +2,4 @@ tags = crypto sha256 hmac prng build_only = false arch_whitelist = x86 arm -config_whitelist = !CONFIG_PLATFORM_QUARK_SE +config_whitelist = !CONFIG_SOC_QUARK_SE diff --git a/samples/microkernel/test/test_tickless/src/test_tickless.c b/samples/microkernel/test/test_tickless/src/test_tickless.c index dd2edc22921..315b775d980 100644 --- a/samples/microkernel/test/test_tickless/src/test_tickless.c +++ b/samples/microkernel/test/test_tickless/src/test_tickless.c @@ -53,7 +53,7 @@ typedef uint64_t _timer_res_t; #elif defined(CONFIG_ARM) -# if defined(CONFIG_PLATFORM_TI_LM3S6965_QEMU) +# if defined(CONFIG_SOC_TI_LM3S6965_QEMU) /* A bug in the QEMU ARMv7-M sysTick timer prevents tickless idle support */ #error "This QEMU target does not support tickless idle!" # endif diff --git a/samples/microkernel/test/test_tickless/src/timestamps.c b/samples/microkernel/test/test_tickless/src/timestamps.c index 08634afbd98..2209abe0459 100644 --- a/samples/microkernel/test/test_tickless/src/timestamps.c +++ b/samples/microkernel/test/test_tickless/src/timestamps.c @@ -24,7 +24,7 @@ Platform-specific timestamp support for the tickless idle test. #include #include -#if defined(CONFIG_PLATFORM_TI_LM3S6965_QEMU) +#if defined(CONFIG_SOC_TI_LM3S6965_QEMU) /* * @brief Use a General Purpose Timer in * 32-bit periodic timer mode (down-counter) @@ -138,7 +138,7 @@ void _TimestampClose(void) _CLKGATECTRL &= ~_CLKGATECTRL_TIMESTAMP_EN; } -#elif defined(CONFIG_PLATFORM_FSL_FRDM_K64F) +#elif defined(CONFIG_SOC_FSL_FRDM_K64F) /* Freescale FRDM-K64F target - use RTC (prescale value) */ #define _COUNTDOWN_TIMER false @@ -247,4 +247,4 @@ void _TimestampClose(void) #else #error "Unknown platform" -#endif /* CONFIG_PLATFORM_xxx */ +#endif /* CONFIG_SOC_xxx */ diff --git a/samples/microkernel/test/test_tickless/testcase.ini b/samples/microkernel/test/test_tickless/testcase.ini index 3592865c517..460dd769482 100644 --- a/samples/microkernel/test/test_tickless/testcase.ini +++ b/samples/microkernel/test/test_tickless/testcase.ini @@ -1,4 +1,4 @@ [test] tags = core -config_whitelist = !CONFIG_PLATFORM_TI_LM3S6965_QEMU +config_whitelist = !CONFIG_SOC_TI_LM3S6965_QEMU diff --git a/samples/nanokernel/apps/adc/src/adc.c b/samples/nanokernel/apps/adc/src/adc.c index a2b6b3f8e2d..ce8b0099af9 100644 --- a/samples/nanokernel/apps/adc/src/adc.c +++ b/samples/nanokernel/apps/adc/src/adc.c @@ -33,7 +33,7 @@ #define SLEEPTIME 10 #define SLEEPTICKS (SLEEPTIME * sys_clock_ticks_per_sec) -#ifdef CONFIG_PLATFORM_QUARK_SE_SS +#ifdef CONFIG_SOC_QUARK_SE_SS #define ADC_DEVICE_NAME CONFIG_ADC_DW_NAME_0 #elif CONFIG_BOARD_GALILEO #define ADC_DEVICE_NAME CONFIG_ADC_TI_ADC108S102_0_DRV_NAME diff --git a/samples/nanokernel/apps/gpio_dw/src/main.c b/samples/nanokernel/apps/gpio_dw/src/main.c index 85bc44b00a3..3a94ba3e10e 100644 --- a/samples/nanokernel/apps/gpio_dw/src/main.c +++ b/samples/nanokernel/apps/gpio_dw/src/main.c @@ -87,7 +87,7 @@ #define SLEEPTICKS SECONDS(1) -#ifdef CONFIG_PLATFORM_QUARK_SE_SS +#ifdef CONFIG_SOC_QUARK_SE_SS #define GPIO_OUT_PIN 2 #define GPIO_INT_PIN 3 #define GPIO_NAME "GPIO_SS_" diff --git a/samples/nanokernel/apps/kernel_event_logger/testcase.ini b/samples/nanokernel/apps/kernel_event_logger/testcase.ini index cbf1e501e07..d37b8409997 100644 --- a/samples/nanokernel/apps/kernel_event_logger/testcase.ini +++ b/samples/nanokernel/apps/kernel_event_logger/testcase.ini @@ -1,5 +1,5 @@ [test] build_only = true tags = apps -config_whitelist = !CONFIG_PLATFORM_QUARK_D2000 +config_whitelist = !CONFIG_SOC_QUARK_D2000 arch_whitelist = x86 arm diff --git a/samples/nanokernel/test/test_context/src/Makefile b/samples/nanokernel/test/test_context/src/Makefile index 187cecef301..503b0d82fab 100644 --- a/samples/nanokernel/test/test_context/src/Makefile +++ b/samples/nanokernel/test/test_context/src/Makefile @@ -1,4 +1,4 @@ ccflags-y += -I${srctree}/samples/include -ccflags-$(CONFIG_PLATFORM_QUARK_D2000) += -DFIBER_STACKSIZE=256 +ccflags-$(CONFIG_SOC_QUARK_D2000) += -DFIBER_STACKSIZE=256 obj-y = context.o diff --git a/samples/nanokernel/test/test_fifo/src/Makefile b/samples/nanokernel/test/test_fifo/src/Makefile index 7b6490e47e5..5836fd486c2 100644 --- a/samples/nanokernel/test/test_fifo/src/Makefile +++ b/samples/nanokernel/test/test_fifo/src/Makefile @@ -1,4 +1,4 @@ ccflags-y += -I${srctree}/samples/include -ccflags-$(CONFIG_PLATFORM_QUARK_D2000) += -DFIBER_STACKSIZE=256 +ccflags-$(CONFIG_SOC_QUARK_D2000) += -DFIBER_STACKSIZE=256 obj-y = fifo.o fifo_timeout.o diff --git a/samples/nanokernel/test/test_lifo/src/Makefile b/samples/nanokernel/test/test_lifo/src/Makefile index 6dad7bdd06c..8b33443f6aa 100644 --- a/samples/nanokernel/test/test_lifo/src/Makefile +++ b/samples/nanokernel/test/test_lifo/src/Makefile @@ -1,4 +1,4 @@ ccflags-y += -I${srctree}/samples/include -ccflags-$(CONFIG_PLATFORM_QUARK_D2000) += -DFIBER_STACKSIZE=256 +ccflags-$(CONFIG_SOC_QUARK_D2000) += -DFIBER_STACKSIZE=256 obj-y = lifo.o diff --git a/samples/nanokernel/test/test_sema/src/Makefile b/samples/nanokernel/test/test_sema/src/Makefile index 5a3de5de660..640a4609528 100644 --- a/samples/nanokernel/test/test_sema/src/Makefile +++ b/samples/nanokernel/test/test_sema/src/Makefile @@ -1,4 +1,4 @@ ccflags-y += -I${srctree}/samples/include -ccflags-$(CONFIG_PLATFORM_QUARK_D2000) += -DFIBER_STACKSIZE=256 +ccflags-$(CONFIG_SOC_QUARK_D2000) += -DFIBER_STACKSIZE=256 obj-y = sema.o diff --git a/samples/nanokernel/test/test_timer/src/Makefile b/samples/nanokernel/test/test_timer/src/Makefile index 24461cff1dd..6404cba0038 100644 --- a/samples/nanokernel/test/test_timer/src/Makefile +++ b/samples/nanokernel/test/test_timer/src/Makefile @@ -1,4 +1,4 @@ ccflags-y += -I${srctree}/samples/include -ccflags-$(CONFIG_PLATFORM_QUARK_D2000) += -DFIBER_STACKSIZE=256 -DFIBER2_STACKSIZE=256 +ccflags-$(CONFIG_SOC_QUARK_D2000) += -DFIBER_STACKSIZE=256 -DFIBER2_STACKSIZE=256 obj-y=timer.o diff --git a/samples/net/buf/testcase.ini b/samples/net/buf/testcase.ini index af4deaab9b0..a0b244e2127 100644 --- a/samples/net/buf/testcase.ini +++ b/samples/net/buf/testcase.ini @@ -3,4 +3,4 @@ tags = buf build_only = true arch_whitelist = x86 # Doesn't work for ia32_pci -config_whitelist = CONFIG_PLATFORM="ia32" +config_whitelist = CONFIG_SOC="ia32"