From 1a4b7ee28bf7413af6513fb45ad0d0736048f866 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Sun, 16 Dec 2018 17:11:34 -0800 Subject: reset upstream subtrees to yocto 2.6 Reset the following subtrees on thud HEAD: poky: 87e3a9739d meta-openembedded: 6094ae18c8 meta-security: 31dc4e7532 meta-raspberrypi: a48743dc36 meta-xilinx: c42016e2e6 Also re-apply backports that didn't make it into thud: poky: 17726d0 systemd-systemctl-native: handle Install wildcards meta-openembedded: 4321a5d libtinyxml2: update to 7.0.1 042f0a3 libcereal: Add native and nativesdk classes e23284f libcereal: Allow empty package 030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG 179a1b9 gtest: update to 1.8.1 Squashed OpenBMC subtree compatibility updates: meta-aspeed: Brad Bishop (1): aspeed: add yocto 2.6 compatibility meta-ibm: Brad Bishop (1): ibm: prepare for yocto 2.6 meta-ingrasys: Brad Bishop (1): ingrasys: set layer compatibility to yocto 2.6 meta-openpower: Brad Bishop (1): openpower: set layer compatibility to yocto 2.6 meta-phosphor: Brad Bishop (3): phosphor: set layer compatibility to thud phosphor: libgpg-error: drop patches phosphor: react to fitimage artifact rename Ed Tanous (4): Dropbear: upgrade options for latest upgrade yocto2.6: update openssl options busybox: remove upstream watchdog patch systemd: Rebase CONFIG_CGROUP_BPF patch Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7 Signed-off-by: Brad Bishop --- poky/meta/conf/machine/include/arm/arch-armv7a.inc | 1 + poky/meta/conf/machine/include/m68k/arch-m68k.inc | 8 +++++ .../conf/machine/include/mips/tune-mips-74k.inc | 37 ++++++++++++++++++++++ poky/meta/conf/machine/include/qemu.inc | 2 +- poky/meta/conf/machine/include/tune-core2.inc | 2 +- poky/meta/conf/machine/include/tune-corei7.inc | 11 +++---- poky/meta/conf/machine/include/tune-mcf5441x.inc | 13 ++++++++ poky/meta/conf/machine/include/x86-base.inc | 9 ++---- 8 files changed, 69 insertions(+), 14 deletions(-) create mode 100644 poky/meta/conf/machine/include/m68k/arch-m68k.inc create mode 100644 poky/meta/conf/machine/include/mips/tune-mips-74k.inc create mode 100644 poky/meta/conf/machine/include/tune-mcf5441x.inc (limited to 'poky/meta/conf/machine/include') diff --git a/poky/meta/conf/machine/include/arm/arch-armv7a.inc b/poky/meta/conf/machine/include/arm/arch-armv7a.inc index bad1c2705..a2663d800 100644 --- a/poky/meta/conf/machine/include/arm/arch-armv7a.inc +++ b/poky/meta/conf/machine/include/arm/arch-armv7a.inc @@ -1,4 +1,5 @@ DEFAULTTUNE ?= "armv7athf" +ARM_INSTRUCTION_SET ?= "thumb" TUNEVALID[armv7a] = "Enable instructions for ARMv7-a" TUNECONFLICTS[armv7a] = "armv4 armv5 armv6 armv7" diff --git a/poky/meta/conf/machine/include/m68k/arch-m68k.inc b/poky/meta/conf/machine/include/m68k/arch-m68k.inc new file mode 100644 index 000000000..3ff8a3a5b --- /dev/null +++ b/poky/meta/conf/machine/include/m68k/arch-m68k.inc @@ -0,0 +1,8 @@ +# m68k Architecture definitions + +DEFAULTTUNE ?= "m68k" + +# Architecture name +TUNE_ARCH = "m68k" + +TUNE_PKGARCH = "${TUNE_PKGARCH_tune-${DEFAULTTUNE}}" diff --git a/poky/meta/conf/machine/include/mips/tune-mips-74k.inc b/poky/meta/conf/machine/include/mips/tune-mips-74k.inc new file mode 100644 index 000000000..94afee34b --- /dev/null +++ b/poky/meta/conf/machine/include/mips/tune-mips-74k.inc @@ -0,0 +1,37 @@ +DEFAULTTUNE ?= "mips32r2-74kc" + +MIPSPKGSFX_MIPS16E ??= "" + +require conf/machine/include/tune-mips32r2.inc +require conf/machine/include/mips/feature-mips-mips16e.inc + + +TUNEVALID[74kc] = "Enable MIPS 74K with DSPr2 processor optimizations" +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "74kc", " -mtune=74kc", "", d)}" + +AVAILTUNES += "mips32r2-74kc mips32r2-74kc-m16" +AVAILTUNES += "mips32r2el-74kc mips32r2el-74kc-m16" + +# big endian: kc+dsp2=kc, kc+dsp2+mips16e=kc-m16 +TUNE_FEATURES_tune-mips32r2-74kc = "${TUNE_FEATURES_tune-mips32r2-nf} 74kc" +TUNE_FEATURES_tune-mips32r2-74kc-m16 = "${TUNE_FEATURES_tune-mips32r2-74kc} mips16e" + +MIPSPKGSFX_VARIANT_tune-mips32r2-74kc = "mips32r2-74kc" +PACKAGE_EXTRA_ARCHS_tune-mips32r2-74kc = "${PACKAGE_EXTRA_ARCHS_tune-mips32r2-nf} mips32r2-74kc-nf" +QEMU_EXTRAOPTIONS_mips32r2-74kc-nf = " -cpu 24Kc" + +MIPSPKGSFX_VARIANT_tune-mips32r2-74kc-m16 = "mips32r2-74kc${MIPSPKGSFX_MIPS16E}" +PACKAGE_EXTRA_ARCHS_tune-mips32r2-74kc-m16 = "${PACKAGE_EXTRA_ARCHS_tune-mips32r2-74kc} mips32r2-74kc-m16-nf" +QEMU_EXTRAOPTIONS_mips32r2-74kc-m16-nf = " -cpu 24KEc" + +# little endian: kc+dsp2=kc, kc+dsp2+mips16e=kc-m16 +TUNE_FEATURES_tune-mips32r2el-74kc = "${TUNE_FEATURES_tune-mips32r2el-nf} 74kc" +TUNE_FEATURES_tune-mips32r2el-74kc-m16 = "${TUNE_FEATURES_tune-mips32r2el-74kc} mips16e" + +MIPSPKGSFX_VARIANT_tune-mips32r2el-74kc = "mips32r2el-74kc" +PACKAGE_EXTRA_ARCHS_tune-mips32r2el-74kc = "${PACKAGE_EXTRA_ARCHS_tune-mips32r2el-nf} mips32r2el-74kc-nf" +QEMU_EXTRAOPTIONS_mips32r2el-74kc-nf = " -cpu 24Kc" + +MIPSPKGSFX_VARIANT_tune-mips32r2el-74kc-m16 = "mips32r2el-74kc${MIPSPKGSFX_MIPS16E}" +PACKAGE_EXTRA_ARCHS_tune-mips32r2el-74kc-m16 = "${PACKAGE_EXTRA_ARCHS_tune-mips32r2el-74kc} mips32r2el-74kc-m16-nf" +QEMU_EXTRAOPTIONS_mips32r2el-74kc-m16-nf = " -cpu 24KEc" diff --git a/poky/meta/conf/machine/include/qemu.inc b/poky/meta/conf/machine/include/qemu.inc index aa332fecc..5050e4106 100644 --- a/poky/meta/conf/machine/include/qemu.inc +++ b/poky/meta/conf/machine/include/qemu.inc @@ -19,7 +19,7 @@ IMAGE_FSTYPES += "tar.bz2 ext4" RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" # Use a common kernel recipe for all QEMU machines -PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" +PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto" EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native" diff --git a/poky/meta/conf/machine/include/tune-core2.inc b/poky/meta/conf/machine/include/tune-core2.inc index c686bb468..ddde719bd 100644 --- a/poky/meta/conf/machine/include/tune-core2.inc +++ b/poky/meta/conf/machine/include/tune-core2.inc @@ -21,7 +21,7 @@ TUNE_FEATURES_tune-core2-32 = "${TUNE_FEATURES_tune-x86} core2" BASE_LIB_tune-core2-32 = "lib" TUNE_PKGARCH_tune-core2-32 = "core2-32" PACKAGE_EXTRA_ARCHS_tune-core2-32 = "${PACKAGE_EXTRA_ARCHS_tune-i686} core2-32" -QEMU_EXTRAOPTIONS_core2-32 = " -cpu core2duo" +QEMU_EXTRAOPTIONS_core2-32 = " -cpu n270" AVAILTUNES += "core2-64" TUNE_FEATURES_tune-core2-64 = "${TUNE_FEATURES_tune-x86-64} core2" diff --git a/poky/meta/conf/machine/include/tune-corei7.inc b/poky/meta/conf/machine/include/tune-corei7.inc index 6edfb680e..d06af47b8 100644 --- a/poky/meta/conf/machine/include/tune-corei7.inc +++ b/poky/meta/conf/machine/include/tune-corei7.inc @@ -1,20 +1,19 @@ -# Settings for the GCC(1) cpu-type "corei7": +# Settings for the GCC(1) cpu-type "nehalem": # -# Intel Core i7 CPU with 64-bit extensions, MMX, SSE, SSE2, SSE3, SSSE3, SSE4.1 -# and SSE4.2 instruction set support. +# Intel Nehalem CPU with 64-bit extensions, MMX, SSE, SSE2, SSE3, SSSE3, SSE4.1, +# SSE4.2 and POPCNT instruction set support. # # This tune is recommended for Intel Nehalem and Silvermont (e.g. Bay Trail) CPUs # (and beyond). # DEFAULTTUNE ?= "corei7-64" -# Pull in the previous tune in to pull in PACKAGE_EXTRA_ARCHS +# Include the previous tune to pull in PACKAGE_EXTRA_ARCHS require conf/machine/include/tune-core2.inc - # Extra tune features TUNEVALID[corei7] = "Enable corei7 specific processor optimizations" -TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'corei7', ' -march=corei7 -mtune=corei7 -mfpmath=sse -msse4.2', '', d)}" +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'corei7', ' -march=nehalem -mtune=generic -mfpmath=sse -msse4.2', '', d)}" # Extra tune selections AVAILTUNES += "corei7-32" diff --git a/poky/meta/conf/machine/include/tune-mcf5441x.inc b/poky/meta/conf/machine/include/tune-mcf5441x.inc new file mode 100644 index 000000000..11a41a7c5 --- /dev/null +++ b/poky/meta/conf/machine/include/tune-mcf5441x.inc @@ -0,0 +1,13 @@ +DEFAULTTUNE ?= "mcf5441x" + +require conf/machine/include/m68k/arch-m68k.inc + +TUNEVALID[mcf5441x] = "Enable coldfire specific processor optimizations" +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'mcf5441x', ' -mcpu=54418', '', d)}" + +AVAILTUNES += "mcf5441x" +TUNE_FEATURES_tune-mcf5441x = "mcf5441x" +TUNE_ARCH_tune-mcf5441x = "mcf5441x" +TUNE_PKGARCH_tune-mcf5441x = "mcf5441x" +PACKAGE_EXTRA_ARCHS_tune-mcf5441x = "m68k mcf5441x" + diff --git a/poky/meta/conf/machine/include/x86-base.inc b/poky/meta/conf/machine/include/x86-base.inc index f8aacea64..c29279209 100644 --- a/poky/meta/conf/machine/include/x86-base.inc +++ b/poky/meta/conf/machine/include/x86-base.inc @@ -8,20 +8,17 @@ MACHINE_FEATURES += "screen keyboard pci usbhost ext2 ext3 x86 \ acpi serial usbgadget alsa" -MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" - -IMAGE_FSTYPES ?= "live" -NOISO ?= "1" +IMAGE_FSTYPES ?= "hddimg" KERNEL_IMAGETYPE ?= "bzImage" -SERIAL_CONSOLE ?= "115200 ttyS0" +SERIAL_CONSOLES ?= "115200;ttyS0" # # kernel-related variables # PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto" -PREFERRED_VERSION_linux-yocto ??= "4.15%" +PREFERRED_VERSION_linux-yocto ??= "4.18%" # # XSERVER subcomponents, used to build the XSERVER variable -- cgit v1.2.1