diff options
author | Saul Wold <sgw@linux.intel.com> | 2017-12-08 06:54:15 -0800 |
---|---|---|
committer | California Sullivan <california.l.sullivan@intel.com> | 2017-12-08 15:04:46 -0800 |
commit | 5dbc69e339588834317b632119717996584b0d6c (patch) | |
tree | 943b54fbef4cd368cec6f7771746bebb3b69d736 | |
parent | 71fc4f34978700a87dfc15876ca9663cb6edc191 (diff) | |
download | meta-intel-5dbc69e339588834317b632119717996584b0d6c.tar.gz |
intel-quark: Remove MACHINE configuration for Quark
As the Quark machine has been EOL'ed at the end of 2017, remove this
machine type from the 2018 planned release of meta-intel
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
-rw-r--r-- | conf/machine/include/intel-quark-common.inc | 12 | ||||
-rw-r--r-- | conf/machine/intel-quark.conf | 33 |
2 files changed, 0 insertions, 45 deletions
diff --git a/conf/machine/include/intel-quark-common.inc b/conf/machine/include/intel-quark-common.inc deleted file mode 100644 index f7cfe146..00000000 --- a/conf/machine/include/intel-quark-common.inc +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | # | ||
2 | # Common configuration for all MACHINES of the intel-quark type | ||
3 | # | ||
4 | |||
5 | DEFAULTTUNE ?= "i586-nlp-32" | ||
6 | require conf/machine/include/tune-i586-nlp.inc | ||
7 | require conf/machine/include/x86-base.inc | ||
8 | |||
9 | # gnutls padlock code uses CMOV instruction in assembly which | ||
10 | # is not valid for Quark. | ||
11 | EXTRA_OECONF_append_pn-gnutls_intel-quark = " --disable-padlock" | ||
12 | EXTRA_OECONF_append_pn-openssl_intel-quark = " no-asm" | ||
diff --git a/conf/machine/intel-quark.conf b/conf/machine/intel-quark.conf deleted file mode 100644 index 17e8c52f..00000000 --- a/conf/machine/intel-quark.conf +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | #@TYPE: Machine | ||
2 | #@NAME: quark | ||
3 | |||
4 | #@DESCRIPTION: Machine configuration for Quark systems | ||
5 | |||
6 | require conf/machine/include/meta-intel.inc | ||
7 | require conf/machine/include/intel-quark-common.inc | ||
8 | require conf/machine/include/intel-common-pkgarch.inc | ||
9 | |||
10 | #Avoid pulling in GRUB | ||
11 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "" | ||
12 | |||
13 | MACHINE_FEATURES = "efi usb" | ||
14 | MACHINE_FEATURES += "intel-ucode" | ||
15 | |||
16 | SERIAL_CONSOLE = "115200 ttyS1" | ||
17 | APPEND += "rootwait console=ttyS1,115200 console=tty0" | ||
18 | |||
19 | # Bypass the default labels which also has "install" option in OE. | ||
20 | # | ||
21 | # We don't need to do this when constructing direct-boot image with | ||
22 | # wic. But EFI installer in hddimg image doesn't work on quark now, | ||
23 | # so we only provide a live-boot entry in boot menu for images in | ||
24 | # hddimg format. | ||
25 | |||
26 | LABELS_LIVE = "boot" | ||
27 | |||
28 | # Ensure that the Lock prefix is omitted for the kernel" | ||
29 | KERNEL_EXTRA_ARGS = "EXTRA_CFLAGS=-Wa,-momit-lock-prefix=yes" | ||
30 | |||
31 | IMAGE_FSTYPES += "wic" | ||
32 | WKS_FILE ?= "galileodisk-sd.wks" | ||
33 | do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" | ||