1
0
mirror of https://git.yoctoproject.org/meta-arm synced 2026-04-20 11:29:54 +00:00

arm-autonomy: fixes for yocto-check-layer

Add fixes for yocto-check-layer with no new functionality introduced.

Issue-Id: SCM-2625
Signed-off-by: Diego Sueiro <diego.sueiro@arm.com>
Change-Id: I4f7dc30e7ca27f88dfe140ac84ff2b73fe99b728
Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
Diego Sueiro
2021-06-30 19:01:36 +01:00
committed by Jon Mason
parent af10576f9f
commit 1d7d30f98d
16 changed files with 62 additions and 56 deletions

View File

@@ -1,5 +1,7 @@
# This files is added when DISTRO_FEATURES contains arm-autonomy-host
ARM_AUTONOMY_HOST_OVERRIDES = ":autonomy-host"
# We need to have xen and ipv4 activated
DISTRO_FEATURES_append = " xen ipv4"
DISTRO_FEATURES_NATIVE_append = " arm-autonomy-host"

View File

@@ -1,6 +1,6 @@
# Use OVERRIDES to minimize the usage of
# ${@bb.utils.contains('DISTRO_FEATURES', 'autonomy-host', ...
OVERRIDES_append = "${@bb.utils.contains('DISTRO_FEATURES', 'arm-autonomy-host', ':autonomy-host', '', d)}"
OVERRIDES_append = "${ARM_AUTONOMY_HOST_OVERRIDES}"
FILESEXTRAPATHS_prepend_autonomy-host := "${THISDIR}/${PN}:"

View File

@@ -1,9 +1,10 @@
# Machine specific u-boot
# Use OVERRIDES to minimize the usage of
# ${@bb.utils.contains('DISTRO_FEATURES', 'autonomy-host', ...
OVERRIDES_append = "${ARM_AUTONOMY_HOST_OVERRIDES}"
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
FILESEXTRAPATHS_prepend_autonomy-host_fvp-base := "${THISDIR}/${PN}:"
#
# FVP BASE
#
SRC_URI_append_fvp-base = "${@bb.utils.contains('DISTRO_FEATURES', 'arm-autonomy-host', ' file://xen_u-boot_kernel_addr.patch', '', d)}"
SRC_URI_append_autonomy-host_fvp-base = " file://xen_u-boot_kernel_addr.patch"

View File

@@ -1,6 +0,0 @@
define KMACHINE n1sdp
define KTYPE preempt-rt
define KARCH arm64
kconf non-hardware ktypes/developer/developer.cfg
kconf non-hardware ktypes/preempt-rt/preempt-rt.cfg

View File

@@ -1,7 +0,0 @@
# Yocto kernel-cache sets CONFIG_NLS_CODEPAGE_437=m for LINUX_KERNEL_TYPR=preempt-rt
CONFIG_NLS_CODEPAGE_437=y
# Yocto kernel-cache sets CONFIG_NLS_ISO8859_1=m for LINUX_KERNEL_TYPR=preempt-rt
CONFIG_NLS_ISO8859_1=y
# Set the timer interrupt run at 1000 Hz to have a fast response
CONFIG_HZ_1000=y

View File

@@ -1,3 +0,0 @@
define KFEATURE_DESCRIPTION "Extra kernel configs when building with PREEMPT_RT"
kconf non-hardware preempt-rt-extras.cfg

View File

@@ -1,15 +1,17 @@
FILESEXTRAPATHS_prepend := "${THISDIR}:"
# Use OVERRIDES to minimize the usage of
# ${@bb.utils.contains('DISTRO_FEATURES', 'autonomy-host', ...
OVERRIDES_append = "${ARM_AUTONOMY_HOST_OVERRIDES}"
FILESEXTRAPATHS_prepend_autonomy-host_fvp-base := "${THISDIR}:"
#
# arm-autonomy kmeta extra
#
SRC_URI_append = " file://arm-autonomy-kmeta-extra;type=kmeta;name=arm-autonomy-kmeta-extra;destsuffix=arm-autonomy-kmeta-extra"
SRC_URI_append_autonomy-host_fvp-base = " \
file://arm-autonomy-kmeta-extra;type=kmeta;name=arm-autonomy-kmeta-extra;destsuffix=arm-autonomy-kmeta-extra"
# We need to turn off SVE support in the Linux kernel otherwise Xen is stopping
# Linux kernel with a coredump while trying to access XEN bit of CPACR1 core
# register.
LINUX_ARM_AUTONOMY_DISABLE_ARM64_SVE = "${@bb.utils.contains_any('DISTRO_FEATURES', \
'arm-autonomy-host arm-autonomy-guest', \
' features/arm-autonomy/disable-arm64-sve.scc','',d)}"
KERNEL_FEATURES_append_fvp-base = "${LINUX_ARM_AUTONOMY_DISABLE_ARM64_SVE}"
KERNEL_FEATURES_append_autonomy-host_fvp-base = " \
features/arm-autonomy/disable-arm64-sve.scc"

View File

@@ -1 +1,3 @@
GRUB_BUILDIN += "${@bb.utils.contains('DISTRO_FEATURES', 'arm-autonomy-host', 'xen_boot', '', d)}"
OVERRIDES_append = "${ARM_AUTONOMY_HOST_OVERRIDES}"
GRUB_BUILDIN_append_autonomy-host = " xen_boot"

View File

@@ -1,4 +1,8 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
# Use OVERRIDES to minimize the usage of
# ${@bb.utils.contains('DISTRO_FEATURES', 'arm-autonomy-host', ...
OVERRIDES_append = "${ARM_AUTONOMY_HOST_OVERRIDES}"
FILESEXTRAPATHS_prepend_autonomy-host := "${THISDIR}/${PN}:"
# The --exclude flag in Busybox tar is required by xenguest-mkimage
SRC_URI += "file://feature_tar_long_options.cfg"
SRC_URI_append_autonomy-host = " file://feature_tar_long_options.cfg"

View File

@@ -3,7 +3,9 @@
# configuration by adding network network interface configuration file under
# interfaces.d directory.
do_install_append() {
OVERRIDES_append = "${ARM_AUTONOMY_HOST_OVERRIDES}"
do_install_append_autonomy-host() {
# Add scan of interfaces.d to interfaces file
cp -f ${WORKDIR}/interfaces ${WORKDIR}/interfaces.subdir
echo "source-directory ${sysconfdir}/network/interfaces.d/" \

View File

@@ -0,0 +1,8 @@
# For Xen we only need the i386 binaries
QEMU_TARGETS = "i386"
PACKAGECONFIG[noaudio] = "--audio-drv-list='',,"
PACKAGECONFIG_append = " noaudio"
PACKAGECONFIG_remove = "fdt sdl kvm"
require recipes-devtools/qemu/qemu-package-split.inc

View File

@@ -1,12 +1,3 @@
# Use OVERRIDES to minimize the usage of
# ${@bb.utils.contains('DISTRO_FEATURES', 'arm-autonomy-host', ...
OVERRIDES_append = "${@bb.utils.contains('DISTRO_FEATURES', 'arm-autonomy-host', ':autonomy-host', '', d)}"
# For Xen we only need the i386 binaries
QEMU_TARGETS_autonomy-host = "i386"
PACKAGECONFIG[noaudio] = "--audio-drv-list='',,"
PACKAGECONFIG_append_autonomy-host = " noaudio"
PACKAGECONFIG_remove_autonomy-host = "fdt sdl kvm"
require ${@bb.utils.contains('DISTRO_FEATURES', 'arm-autonomy-host', 'recipes-devtools/qemu/${BPN}-package-split.inc', '', d)}
require ${@bb.utils.contains('DISTRO_FEATURES', \
'arm-autonomy-host', \
'qemu-autonomy-host.inc', '', d)}

View File

@@ -1,4 +1,7 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-4.14:"
# Use OVERRIDES to minimize the usage of
# ${@bb.utils.contains('DISTRO_FEATURES', 'arm-autonomy-host', ...
OVERRIDES_append = "${ARM_AUTONOMY_HOST_OVERRIDES}"
SRC_URI += "file://0001-vif-nat-fix-hostname.patch \
"
FILESEXTRAPATHS_prepend_autonomy-host := "${THISDIR}/${PN}-4.14:"
SRC_URI_append_autonomy-host = " file://0001-vif-nat-fix-hostname.patch"

View File

@@ -1,9 +1,10 @@
# Use OVERRIDES to minimize the usage of
# ${@bb.utils.contains('DISTRO_FEATURES', 'arm-autonomy-host', ...
OVERRIDES_append = "${ARM_AUTONOMY_HOST_OVERRIDES}"
# Make Xen machine specific
# This ensures that sstate is properly handled and that each machine can have
# its own configuration
PACKAGE_ARCH = "${MACHINE_ARCH}"
PACKAGE_ARCH_autonomy-host = "${MACHINE_ARCH}"
PACKAGECONFIG_remove = "\
${@bb.utils.contains('DISTRO_FEATURES', \
'arm-autonomy-host', \
'sdl', '', d)}"
PACKAGECONFIG_remove_autonomy-host = "sdl"

View File

@@ -1,5 +1,9 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-4.14:"
# Use OVERRIDES to minimize the usage of
# ${@bb.utils.contains('DISTRO_FEATURES', 'arm-autonomy-host', ...
OVERRIDES_append = "${ARM_AUTONOMY_HOST_OVERRIDES}"
SRC_URI += " \
FILESEXTRAPATHS_prepend_autonomy-host := "${THISDIR}/${PN}-4.14:"
SRC_URI_append_autonomy-host = " \
file://0001-xen-arm-Throw-messages-for-unknown-FP-SIMD-implement.patch \
"

View File

@@ -1,3 +1,5 @@
# Add arm-autonomy kernel support
require linux-arm-autonomy.inc
require ${@bb.utils.contains_any('DISTRO_FEATURES', \
'arm-autonomy-host arm-autonomy-guest', \
'linux-arm-autonomy.inc', \
'', d)}