quark_x1000: move the X1000 into the intel_quark family

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

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

@@ -0,0 +1,24 @@
+# Kconfig - Quark X1000 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_X1000
+
+config SOC
+	default quark_x1000
+
+endif # SOC_QUARK_X1000

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

@@ -17,9 +17,9 @@
 # limitations under the License.
 #
 
-if SOC_QUARK_X1000
+if SOC_SERIES_QUARK_X1000
 
-config SOC
+config SOC_SERIES
 	default quark_x1000
 
 config PHYS_LOAD_ADDR
@@ -276,4 +276,4 @@ config BLUETOOTH_UART_ON_DEV_NAME
 
 endif
 
-endif # SOC_QUARK_X1000
+endif # SOC_SERIES_QUARK_X1000

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

@@ -0,0 +1,13 @@
+
+config SOC_SERIES_QUARK_X1000
+	bool "Intel Quark X1000 Series"
+	select CPU_MINUTEIA
+	select CPU_HAS_FPU
+	select HPET_TIMER
+	select BOOTLOADER_UNKNOWN
+	select PCI
+	select SYS_POWER_LOW_POWER_STATE_SUPPORTED
+	select SYS_POWER_DEEP_SLEEP_SUPPORTED
+	select SOC_FAMILY_QUARK
+	help
+	Intel Quark X1000 SoC.

arch/x86/soc/intel_quark/quark_x1000/Kconfig.soc

@@ -8,5 +8,6 @@ config SOC_QUARK_X1000
 	select PCI
 	select SYS_POWER_LOW_POWER_STATE_SUPPORTED
 	select SYS_POWER_DEEP_SLEEP_SUPPORTED
+	depends on SOC_SERIES_QUARK_X1000
 	help
 	Intel Quark X1000 SoC.

boards/galileo/Kconfig.board

@@ -1,7 +1,7 @@
 
 config BOARD_GALILEO
 	bool "Galileo Gen2"
-	depends on SOC_QUARK_X1000
+	depends on SOC_SERIES_QUARK_X1000
 	help
 	The Intel Galileo Gen 2 development board is a microcontroller board
 	based on the Intel Quark SoC X1000 application processor, a 32-bit

boards/galileo/galileo_defconfig

@@ -2,6 +2,7 @@ CONFIG_NANO_TIMERS=y
 CONFIG_NANO_TIMEOUTS=y
 CONFIG_X86=y
 CONFIG_SOC_QUARK_X1000=y
+CONFIG_SOC_SERIES_QUARK_X1000=y
 CONFIG_BOARD_GALILEO=y
 CONFIG_CPU_MINUTEIA=y
 CONFIG_PCI_LEGACY_BRIDGE=y