Use SoC instead of platform.

Change terminology and use SoC instead of platform. An SoC provides
features and default configurations available with an SoC. A board
implements the SoC and adds more features and IP block specific to the
board to extend the SoC functionality such as sensors and debugging
features.

Change-Id: I15e8d78a6d4ecd5cfb3bc25ced9ba77e5ea1122f
Signed-off-by: Anas Nashif <anas.nashif@intel.com>

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), \

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

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)/

arch/arc/Kconfig

@@ -26,10 +26,8 @@ config ARCH_DEFCONFIG
 	default "arch/arc/defconfig"
 
 choice
-prompt "Platform Selection"
+prompt "SoC Selection"
-default PLATFORM_GENERIC_ARC
+source "arch/arc/soc/*/Kconfig.soc"
-
-source "arch/arc/platforms/*/Kconfig.platform"
 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

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

arch/arc/platforms/generic_arc/Kconfig.platform

@@ -1,3 +0,0 @@
-
-config PLATFORM_GENERIC_ARC
-        bool "Minimum configuration for generic arc"

arch/arc/platforms/quark_se_ss/Kconfig.platform

@@ -1,3 +0,0 @@
-
-config PLATFORM_QUARK_SE_SS
-        bool "Minimum configuration for Quark SE Sensor Subsystem"

arch/arc/soc/generic_arc/Kconfig

@@ -14,8 +14,8 @@
 # limitations under the License.
 #
 
-if PLATFORM_GENERIC_ARC
+if SOC_GENERIC_ARC
-config PLATFORM
+config SOC
 	default generic_arc
 
 config NUM_IRQ_PRIO_LEVELS

arch/arc/soc/generic_arc/Kconfig.soc

@@ -0,0 +1,3 @@
+
+config SOC_GENERIC_ARC
+        bool

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

arch/arc/soc/generic_arc/soc.c

@@ -23,7 +23,7 @@
  */
 
 #include <nanokernel.h>
-#include "platform.h"
+#include "soc.h"
 #include <init.h>
 #include <uart.h>
 

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

arch/arc/soc/quark_se_ss/Kconfig.soc

@@ -0,0 +1,3 @@
+
+config SOC_QUARK_SE_SS
+        bool "Intel Quark SE - Sensor Sub System"

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

arch/arc/soc/quark_se_ss/soc.c

@@ -22,7 +22,7 @@
  */
 
 #include <nanokernel.h>
-#include "platform.h"
+#include "soc.h"
 #include <init.h>
 #include <quark_se/shared_mem.h>
 

arch/arc/soc/quark_se_ss/soc_config.c

@@ -16,7 +16,7 @@
 
 #include <device.h>
 #include <init.h>
-#include "platform.h"
+#include "soc.h"
 
 #if CONFIG_IPM_QUARK_SE
 #include <ipm.h>

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)/

arch/arm/Kconfig

@@ -30,11 +30,9 @@ config ARCH_DEFCONFIG
 menu "General Platform Configuration"
 
 choice
-prompt "Platform Selection"
+prompt "SoC Selection"
-default PLATFORM_FSL_FRDM_K64F
+default SOC_FSL_FRDM_K64F
-
+source "arch/arm/soc/*/Kconfig.soc"
-source "arch/arm/platforms/*/Kconfig.platform"
-
 endchoice
 
 
@@ -71,6 +69,6 @@ source "arch/arm/core/Kconfig"
 
 endmenu
 
-source "arch/arm/platforms/*/Kconfig"
+source "arch/arm/soc/*/Kconfig"
 
 endmenu

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

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)
 

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"

arch/arm/platforms/fsl_frdm_k64f/Kconfig.platform

@@ -1,5 +0,0 @@
-
-config  PLATFORM_FSL_FRDM_K64F
-	bool "FSL FRDM K64F"
-	select CPU_CORTEX_M
-	select CPU_CORTEX_M4

arch/arm/platforms/fsl_frdm_k64f/Makefile

@@ -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

arch/arm/platforms/ti_lm3s6965/Makefile

@@ -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

arch/arm/soc/fsl_frdm_k64f/Kconfig

@@ -16,8 +16,8 @@
 # limitations under the License.
 #
 
-if PLATFORM_FSL_FRDM_K64F
+if SOC_FSL_FRDM_K64F
-config PLATFORM
+config SOC
 	default fsl_frdm_k64f
 
 config NUM_IRQ_PRIO_BITS

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

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

arch/arm/soc/fsl_frdm_k64f/irq_vector_table.c

@@ -32,12 +32,12 @@
 #include <sections.h>
 
 #if defined(CONFIG_CONSOLE_HANDLER)
-#include <platform.h>
+#include <soc.h>
 #include <console/uart_console.h>
 #endif /* CONFIG_CONSOLE_HANDLER */
 
 #if defined(CONFIG_BLUETOOTH_UART)
-#include <platform.h>
+#include <soc.h>
 #include <bluetooth/uart.h>
 #endif /* CONFIG_BLUETOOTH_UART */
 

arch/arm/soc/fsl_frdm_k64f/soc.c

@@ -25,7 +25,7 @@
 #include <nanokernel.h>
 #include <device.h>
 #include <init.h>
-#include <platform.h>
+#include <soc.h>
 #include <drivers/k20_mcg.h>
 #include <uart.h>
 #include <drivers/k20_pcr.h>

arch/arm/soc/fsl_frdm_k64f/soc.h

@@ -22,8 +22,8 @@
  * 'fsl_frdm_k64f' platform.
  */
 
-#ifndef _PLATFORM__H_
+#ifndef _SOC__H_
-#define _PLATFORM__H_
+#define _SOC__H_
 
 #include <misc/util.h>
 
@@ -163,4 +163,4 @@
 
 #endif /* !_ASMLANGUAGE */
 
-#endif /* _PLATFORM__H_ */
+#endif /* _SOC__H_ */

arch/arm/soc/fsl_frdm_k64f/soc_config.c

@@ -23,7 +23,7 @@
 
 #include <nanokernel.h>
 
-#include "platform.h"
+#include "soc.h"
 
 #ifdef CONFIG_UART_K20
 #include <uart.h>

arch/arm/soc/fsl_frdm_k64f/wdog.S

@@ -23,7 +23,7 @@
 
 #define _ASMLANGUAGE
 
-#include <platform.h>
+#include <soc.h>
 #include <toolchain.h>
 #include <sections.h>
 

arch/arm/soc/ti_lm3s6965/Kconfig

@@ -16,8 +16,8 @@
 # limitations under the License.
 #
 
-if PLATFORM_TI_LM3S6965
+if SOC_TI_LM3S6965
-config PLATFORM
+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.

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

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

arch/arm/soc/ti_lm3s6965/irq_vector_table.c

@@ -32,12 +32,12 @@
 #include <sections.h>
 
 #if defined(CONFIG_CONSOLE_HANDLER)
-#include <platform.h>
+#include <soc.h>
 #include <console/uart_console.h>
 #endif /* CONFIG_CONSOLE_HANDLER */
 
 #if defined(CONFIG_BLUETOOTH_UART)
-#include <platform.h>
+#include <soc.h>
 #include <bluetooth/uart.h>
 #endif /* CONFIG_BLUETOOTH_UART */
 

arch/arm/soc/ti_lm3s6965/soc.c

@@ -25,7 +25,7 @@
 #include <nanokernel.h>
 #include <device.h>
 #include <init.h>
-#include <platform.h>
+#include <soc.h>
 
 #ifdef CONFIG_RUNTIME_NMI
 extern void _NmiInit(void);

arch/arm/soc/ti_lm3s6965/soc_config.c

@@ -23,7 +23,7 @@
 
 #include <nanokernel.h>
 
-#include "platform.h"
+#include "soc.h"
 
 #ifdef CONFIG_UART_STELLARIS
 #include <uart.h>

arch/x86/Kbuild

@@ -1,2 +1,2 @@
 obj-y += core/
-obj-y += platforms/$(PLATFORM_NAME)/
+obj-y += soc/$(SOC_NAME)/

arch/x86/Kconfig

@@ -42,12 +42,10 @@ config ARCH_DEFCONFIG
 source "arch/x86/core/Kconfig"
 
 choice
-prompt "Platform Selection"
+prompt "SoC Selection"
-default PLATFORM_IA32_PCI
+source "arch/x86/soc/*/Kconfig.soc"
-source "arch/x86/platforms/*/Kconfig.platform"
 endchoice
 
-
 choice
 prompt "Intel Processor"
 default CPU_MINUTEIA
@@ -280,6 +278,6 @@ endmenu
 
 
 
-source "arch/x86/platforms/*/Kconfig"
+source "arch/x86/soc/*/Kconfig"
 
 endmenu

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

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

arch/x86/platforms/ia32/Kconfig.platform

@@ -1,5 +0,0 @@
-
-
-config PLATFORM_IA32
-	bool "IA32"
-	select BOOTLOADER_UNKNOWN

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

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

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

arch/x86/soc/atom/soc.c

@@ -23,7 +23,7 @@
  */
 
 #include <nanokernel.h>
-#include "platform.h"
+#include "soc.h"
 #include <uart.h>
 #include <device.h>
 #include <init.h>

arch/x86/soc/atom/soc.h

@@ -22,8 +22,8 @@
  * the 'ia32' platform.
  */
 
-#ifndef __PLATFORM_H_
+#ifndef __SOC_H_
-#define __PLATFORM_H_
+#define __SOC_H_
 
 #include <misc/util.h>
 
@@ -47,4 +47,4 @@
 
 #define INT_VEC_IRQ0 0x20 /* vector number for IRQ0 */
 
-#endif /* __PLATFORM_H_ */
+#endif /* __SOC_H_ */

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

arch/x86/soc/ia32/Kconfig.soc

@@ -0,0 +1,5 @@
+
+
+config SOC_IA32
+	bool "Generic IA32 SoC"
+	select BOOTLOADER_UNKNOWN

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

arch/x86/soc/ia32/soc.c

@@ -23,7 +23,7 @@
  */
 
 #include <nanokernel.h>
-#include "platform.h"
+#include "soc.h"
 #include <uart.h>
 #include <device.h>
 #include <init.h>

arch/x86/soc/ia32/soc.h

@@ -22,8 +22,8 @@
  * the 'ia32' platform.
  */
 
-#ifndef __PLATFORM_H_
+#ifndef __SOC_H_
-#define __PLATFORM_H_
+#define __SOC_H_
 
 #include <misc/util.h>
 
@@ -47,4 +47,4 @@
 
 #define INT_VEC_IRQ0 0x20 /* vector number for IRQ0 */
 
-#endif /* __PLATFORM_H_ */
+#endif /* __SOC_H_ */

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

arch/x86/soc/ia32_pci/Kconfig.soc

@@ -1,6 +1,6 @@
 
-config PLATFORM_IA32_PCI
+config SOC_IA32_PCI
-	bool "IA32 with PCI"
+	bool "Generic IA32 SoC with PCI"
 	select HPET_TIMER
 	select BOOTLOADER_UNKNOWN
 	select PCI

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

arch/x86/soc/ia32_pci/soc.c

@@ -30,7 +30,7 @@
 #include <device.h>
 #include <misc/printk.h>
 #include <misc/__assert.h>
-#include "platform.h"
+#include "soc.h"
 #include <uart.h>
 #include <drivers/pci/pci.h>
 #include <drivers/pci/pci_mgr.h>

arch/x86/soc/ia32_pci/soc.h

@@ -22,8 +22,8 @@
  * the 'ia32_pci' platform.
  */
 
-#ifndef __PLATFORM_H_
+#ifndef __SOC_H_
-#define __PLATFORM_H_
+#define __SOC_H_
 
 #include <misc/util.h>
 
@@ -117,4 +117,4 @@ static inline int pci_irq2pin(int irq)
 	return irq - NUM_STD_IRQS + 1;
 }
 
-#endif /* __PLATFORM_H_ */
+#endif /* __SOC_H_ */

arch/x86/soc/quark_d2000/Kconfig

@@ -14,8 +14,8 @@
 # limitations under the License.
 #
 
-if PLATFORM_QUARK_D2000
+if SOC_QUARK_D2000
-config PLATFORM
+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

arch/x86/soc/quark_d2000/Kconfig.soc

@@ -1,6 +1,6 @@
 
-config  PLATFORM_QUARK_D2000
+config  SOC_QUARK_D2000
-        bool "Minimum configuration for Quark D2000"
+        bool "Quark D2000"
         select CPU_MINUTEIA
         select LOAPIC_TIMER
         select EOI_HANDLER_SUPPORTED

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

arch/x86/soc/quark_d2000/soc.c

@@ -26,7 +26,7 @@
 #include <arch/cpu.h>
 #include <misc/printk.h>
 #include <misc/__assert.h>
-#include "platform.h"
+#include "soc.h"
 #include <drivers/mvic.h>
 #include <init.h>
 

arch/x86/soc/quark_d2000/soc.h

@@ -20,8 +20,8 @@
  * the Quark D2000 Platform.
  */
 
-#ifndef __PLATFORM_H_
+#ifndef __SOC_H_
-#define __PLATFORM_H_
+#define __SOC_H_
 
 #include <stdint.h>
 #include <misc/util.h>
@@ -148,4 +148,4 @@ struct scss_interrupt {
 #endif
 #endif /* CONFIG_MVIC */
 
-#endif /* __PLATFORM_H_ */
+#endif /* __SOC_H_ */

arch/x86/soc/quark_se/Kconfig

@@ -16,8 +16,8 @@
 # limitations under the License.
 #
 
-if PLATFORM_QUARK_SE
+if SOC_QUARK_SE
-config PLATFORM
+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

arch/x86/soc/quark_se/Kconfig.soc

@@ -1,7 +1,7 @@
 
 
-config  PLATFORM_QUARK_SE
+config  SOC_QUARK_SE
-        bool "Minimum configuration for Quark SE"
+        bool "Intel Quark SE"
         select CPU_MINUTEIA
         select IOAPIC
         select LOAPIC

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

arch/x86/soc/quark_se/soc.c

@@ -25,7 +25,7 @@
 #include <nanokernel.h>
 #include <misc/printk.h>
 #include <misc/__assert.h>
-#include "platform.h"
+#include "soc.h"
 #include <uart.h>
 #include <init.h>
 #include "shared_mem.h"

arch/x86/soc/quark_se/soc.h

@@ -20,8 +20,8 @@
  * the Quark SE Platform.
  */
 
-#ifndef __PLATFORM_H_
+#ifndef __SOC_H_
-#define __PLATFORM_H_
+#define __SOC_H_
 
 #include <stdint.h>
 #include <misc/util.h>
@@ -198,4 +198,4 @@ struct scss_interrupt {
 
 #endif /*  _ASMLANGUAGE */
 
-#endif /* __PLATFORM_H_ */
+#endif /* __SOC_H_ */

arch/x86/soc/quark_x1000/Kconfig

@@ -16,8 +16,8 @@
 # limitations under the License.
 #
 
-if PLATFORM_QUARK_X1000
+if SOC_QUARK_X1000
-config PLATFORM
+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

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

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

arch/x86/soc/quark_x1000/soc.c

@@ -30,7 +30,7 @@
 #include <device.h>
 #include <misc/printk.h>
 #include <misc/__assert.h>
-#include "platform.h"
+#include "soc.h"
 #include <uart.h>
 #include <drivers/pci/pci.h>
 #include <drivers/pci/pci_mgr.h>

arch/x86/soc/quark_x1000/soc.h

@@ -22,8 +22,8 @@
  * the Quark X1000 SoC.
  */
 
-#ifndef __PLATFORM_H_
+#ifndef __SOC_H_
-#define __PLATFORM_H_
+#define __SOC_H_
 
 #include <misc/util.h>
 
@@ -117,4 +117,4 @@ static inline int pci_irq2pin(int irq)
 	return irq - NUM_STD_IRQS + 1;
 }
 
-#endif /* __PLATFORM_H_ */
+#endif /* __SOC_H_ */

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

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