Merge remote-tracking branch 'origin/master' into master-enea

3 files changed, 43 insertions, 0 deletions

diff --git a/common/recipes-kernel/linux/linux-yocto-dev.bbappend b/common/recipes-kernel/linux/linux-yocto-dev.bbappend
index 554bd624..75cd2809 100644
--- a/common/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ b/common/recipes-kernel/linux/linux-yocto-dev.bbappend
@@ -14,6 +14,14 @@ KMACHINE_corei7-64-intel-common = "intel-corei7-64"
 KBRANCH_corei7-64-intel-common = "standard/base"
 KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
 
+# Quark / X1000 BSP Info
+LINUX_VERSION_i586-nlp-32-intel-common = "4.1"
+COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}"
+KMACHINE_i586-nlp-32-intel-common = "intel-quark"
+KBRANCH_i586-nlp-32-intel-common = "standard/base"
+KERNEL_FEATURES_append_i586-nlp-32-intel-common = ""
+#KCONFIG_MODE_i586-nlp-32-intel-common = "--allnoconfig"
+
 # NOTE: We do not set SRCREVs here as -dev is intended to be built with AUTOREV
 # and setting them here breaks the default mechanism to use AUTOREV if the
 # default SRCREV is set and linux-yocto-dev is the preferred provider.
diff --git a/conf/machine/include/intel-quark-common.inc b/conf/machine/include/intel-quark-common.inc
new file mode 100644
index 00000000..e2d34d70
--- /dev/null
+++ b/conf/machine/include/intel-quark-common.inc
@@ -0,0 +1,7 @@
+#
+# Common configuration for all MACHINES of the intel-corei7-64 type
+#
+
+DEFAULTTUNE ?= "i586-nlp-32"
+require conf/machine/include/tune-i586-nlp.inc
+require conf/machine/include/x86-base.inc
diff --git a/conf/machine/intel-quark.conf b/conf/machine/intel-quark.conf
new file mode 100644
index 00000000..b59e5664
--- /dev/null
+++ b/conf/machine/intel-quark.conf
@@ -0,0 +1,28 @@
+#@TYPE: Machine
+#@NAME: quark
+
+#@DESCRIPTION: Machine configuration for Quark systems
+
+require conf/machine/include/meta-intel.inc
+require conf/machine/include/intel-quark-common.inc
+require conf/machine/include/intel-common-pkgarch.inc
+
+# Use dev kernel which is 4.1 based currently
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto-dev"
+PREFERRED_PROVIDER_linux-yocto ?= "linux-yocto-dev"
+
+#Avoid pulling in GRUB
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS = ""
+
+MACHINE_FEATURES = "efi usb"
+MACHINE_FEATURES += "intel-ucode"
+
+MACHINE_EXTRA_RRECOMMENDS += "kernel-modules linux-firmware"
+
+SERIAL_CONSOLE = "115200 ttyS1"
+APPEND += "console=ttyS1,115200 console=tty0"
+
+EFI_PROVIDER = "gummiboot"
+
+
+