soc: intel_quark: move quark d2000 to intel_quark family

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

arch/x86/soc/intel_quark/quark_d2000/Kconfig.defconfig.quark_d2000

@@ -0,0 +1,24 @@
+# Kconfig - Quark D2000 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_D2000
+
+config SOC
+	default quark_d2000
+
+endif # SOC_QUARK_D2000

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

@@ -14,9 +14,9 @@
 # limitations under the License.
 #
 
-if SOC_QUARK_D2000
+if SOC_SERIES_QUARK_D2000
 
-config SOC
+config SOC_SERIES
 	default quark_d2000
 
 config SYS_CLOCK_HW_CYCLES_PER_SEC
@@ -177,4 +177,4 @@ config SOC_FLASH_QMSI_SYS_SIZE
 	default 0x8000
 endif # SOC_FLASH_QMSI
 
-endif # SOC_QUARK_D2000
+endif # SOC_SERIES_QUARK_D2000

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

@@ -0,0 +1,26 @@
+# 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_D2000
+	bool "Quark D2000 Series MCU"
+	select CPU_MINUTEIA
+	select LOAPIC_TIMER
+	select XIP
+	select MVIC
+	select X86_IAMCU
+	select HAS_QMSI
+	select SOC_FAMILY_QUARK
+	help
+	 Enable support for Intel Quark D2000

arch/x86/soc/intel_quark/quark_d2000/Kconfig.soc

@@ -0,0 +1,4 @@
+
+config SOC_QUARK_D2000
+	bool "Intel Quark D2000"
+	depends on SOC_SERIES_QUARK_D2000

arch/x86/soc/quark_d2000/Kconfig.soc

@@ -1,9 +0,0 @@
-
-config SOC_QUARK_D2000
-	bool "Quark D2000"
-	select CPU_MINUTEIA
-	select LOAPIC_TIMER
-	select XIP
-	select MVIC
-	select X86_IAMCU
-	select HAS_QMSI

boards/quark_d2000_crb/Kconfig.board

@@ -1,4 +1,4 @@
 
 config BOARD_QUARK_D2000_CRB
-	bool "Quark D2000 CRB"
-	depends on SOC_QUARK_D2000
+	bool "Intel Quark D2000 CRB"
+	depends on SOC_SERIES_QUARK_D2000

boards/quark_d2000_crb/quark_d2000_crb_defconfig

@@ -1,5 +1,6 @@
 CONFIG_X86=y
 CONFIG_SOC_QUARK_D2000=y
+CONFIG_SOC_SERIES_QUARK_D2000=y
 CONFIG_BOARD_QUARK_D2000_CRB=y
 CONFIG_CPU_MINUTEIA=y
 CONFIG_SET_GDT=n