intel_quark: Group Quark SoCs under intel_quark/

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

arch/arc/soc/quark_se_c1000_ss/Kbuild

@@ -1,4 +1,4 @@
-ccflags-y +=-I$(srctree)/arch/x86/soc/
+ccflags-y +=-I$(srctree)/arch/x86/soc/intel_quark
 ccflags-y +=-I$(srctree)/include
 ccflags-y +=-I$(srctree)/include/drivers
 ccflags-y +=-I$(srctree)/drivers

arch/x86/soc/intel_quark/Kbuild

@@ -0,0 +1,2 @@
+
+obj-y += $(SOC_SERIES)/

arch/x86/soc/intel_quark/Kconfig

@@ -0,0 +1,29 @@
+#
+# Copyright (c) 2016 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+config SOC_FAMILY_QUARK
+	bool
+	default n
+
+if SOC_FAMILY_QUARK
+config SOC_FAMILY
+	string
+	default "intel_quark"
+endif
+
+source "arch/x86/soc/intel_quark/*/Kconfig.soc"
+
+source "arch/x86/soc/intel_quark/*/Kconfig"

arch/x86/soc/intel_quark/Kconfig.defconfig

@@ -0,0 +1 @@
+source "arch/x86/soc/intel_quark/*/Kconfig.defconfig.series"

arch/x86/soc/intel_quark/Kconfig.soc

@@ -0,0 +1,17 @@
+#
+# Copyright (c) 2016 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+source "arch/x86/soc/intel_quark/*/Kconfig.series"

arch/x86/soc/intel_quark/quark_se/Kconfig.defconfig.curie

@@ -0,0 +1,24 @@
+# Kconfig - Curie configuration options
+
+#
+# Copyright (c) 2015-2016 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+if SOC_QUARK_SE_CURIE
+
+config SOC
+	default curie
+
+endif

arch/x86/soc/intel_quark/quark_se/Kconfig.defconfig.quark_se_c1000

@@ -0,0 +1,24 @@
+# Kconfig - Quark SE configuration options
+
+#
+# Copyright (c) 2015-2016 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+if SOC_QUARK_SE_C1000
+
+config SOC
+	default quark_se_c1000
+
+endif

arch/x86/soc/intel_quark/quark_se/Kconfig.defconfig.series

@@ -1,7 +1,5 @@
-# Kconfig - Quark SE configuration options
-
 #
-# Copyright (c) 2015-2016 Intel Corporation
+# Copyright (c) 2016 Intel Corporation Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,9 +14,9 @@
 # limitations under the License.
 #
 
-if SOC_QUARK_SE_C1000
+if SOC_SERIES_QUARK_SE
 
-config SOC
+config SOC_SERIES
 	default quark_se
 
 config PHYS_RAM_ADDR
@@ -234,4 +232,7 @@ config USB_DW_IRQ_PRI
 	default 3
 endif # USB
 
-endif # SOC_QUARK_SE_C1000
+source "arch/x86/soc/intel_quark/quark_se/Kconfig.defconfig.quark_se*"
+source "arch/x86/soc/intel_quark/quark_se/Kconfig.defconfig.curie*"
+
+endif # SOC_SERIES_QUARK_SE

arch/x86/soc/intel_quark/quark_se/Kconfig.series

@@ -0,0 +1,29 @@
+# Copyright (c) 2016 Intel Corporation Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+config SOC_SERIES_QUARK_SE
+	bool "Quark SE Series MCU"
+	select SOC_FAMILY_QUARK
+	select CPU_MINUTEIA
+	select IOAPIC
+	select LOAPIC
+	select LOAPIC_TIMER
+	select XIP
+	select X86_IAMCU
+	select SYS_POWER_LOW_POWER_STATE_SUPPORTED
+	select SYS_POWER_DEEP_SLEEP_SUPPORTED
+	select HAS_QMSI
+	help
+	 Enable support for Quark SE

arch/x86/soc/intel_quark/quark_se/Kconfig.soc

@@ -0,0 +1,27 @@
+# Copyright (c) 2016 Intel Corporation Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+choice
+	prompt "Quark SE Selection"
+	depends on SOC_SERIES_QUARK_SE
+
+config SOC_QUARK_SE_C1000
+	bool "Intel Quark SE C1000"
+
+config SOC_QUARK_SE_CURIE
+	bool "Intel Curie"
+
+endchoice
+
+

arch/x86/soc/quark_se/Kconfig.soc

@@ -1,13 +0,0 @@
-
-
-config SOC_QUARK_SE_C1000
-	bool "Intel Quark SE"
-	select CPU_MINUTEIA
-	select IOAPIC
-	select LOAPIC
-	select LOAPIC_TIMER
-	select XIP
-	select X86_IAMCU
-	select SYS_POWER_LOW_POWER_STATE_SUPPORTED
-	select SYS_POWER_DEEP_SLEEP_SUPPORTED
-	select HAS_QMSI

boards/arduino_101/Kconfig.board

@@ -1,4 +1,4 @@
 
 config BOARD_ARDUINO_101
 	bool "Arduino 101 Board"
-	depends on SOC_QUARK_SE_C1000
+	depends on SOC_SERIES_QUARK_SE

boards/arduino_101/arduino_101_defconfig

@@ -1,5 +1,6 @@
 CONFIG_X86=y
 CONFIG_SOC_QUARK_SE_C1000=y
+CONFIG_SOC_SERIES_QUARK_SE=y
 CONFIG_BOARD_ARDUINO_101=y
 CONFIG_CPU_MINUTEIA=y
 CONFIG_CONSOLE=y

boards/arduino_101/arduino_101_factory_defconfig

@@ -1,5 +1,6 @@
 CONFIG_X86=y
 CONFIG_SOC_QUARK_SE_C1000=y
+CONFIG_SOC_SERIES_QUARK_SE=y
 CONFIG_BOARD_ARDUINO_101=y
 CONFIG_CPU_MINUTEIA=y
 CONFIG_CONSOLE=y

boards/quark_se_c1000_devboard/Kconfig.board

@@ -1,4 +1,4 @@
 
 config BOARD_QUARK_SE_C1000_DEVBOARD
 	bool "Quark SE C1000 Devboard"
-	depends on SOC_QUARK_SE_C1000
+	depends on SOC_SERIES_QUARK_SE

boards/quark_se_c1000_devboard/Kconfig.defconfig

@@ -96,4 +96,4 @@ endif
 
 endif # NETWORKING_WITH_15_4_TI_CC2520
 
-endif # BOARD_QUARK_SE_C1000
+endif # BOARD_QUARK_SE_C1000_DEVBOARD

boards/quark_se_c1000_devboard/quark_se_c1000_devboard_defconfig

@@ -1,6 +1,7 @@
 CONFIG_X86=y
 CONFIG_SOC_QUARK_SE_C1000=y
 CONFIG_BOARD_QUARK_SE_C1000_DEVBOARD=y
+CONFIG_SOC_SERIES_QUARK_SE=y
 CONFIG_SOC_FAMILY_QUARK=y
 CONFIG_CPU_MINUTEIA=y
 CONFIG_SET_GDT=n