* [PATCH 2/5] arm-bsp/linux-yocto: migrate corstone700 to the common file
2021-08-19 20:59 [PATCH 1/5] arm-bsp/linux-yocto: Alphabetize platform inc file Jon Mason
@ 2021-08-19 20:59 ` Jon Mason
2021-08-19 20:59 ` [PATCH 3/5] arm/machine: update to new tunes locations Jon Mason
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Jon Mason @ 2021-08-19 20:59 UTC (permalink / raw)
To: meta-arm
The Linux kernel entries for corstone700 are not much more than any
other BSP. Migrate them to the common file for easier development and
debugging.
Signed-off-by: Jon Mason <jon.mason@arm.com>
---
.../linux/linux-arm-platforms.inc | 53 +++++++++++++++++
.../linux/linux-yocto-corstone700.inc | 58 -------------------
.../linux/linux-yocto_5.6%.bbappend | 8 ---
3 files changed, 53 insertions(+), 66 deletions(-)
delete mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-yocto-corstone700.inc
diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc b/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc
index cdffcfb..092d92c 100644
--- a/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc
+++ b/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc
@@ -13,6 +13,7 @@ ARMBSPFILESPATHS := "${THISDIR}:${THISDIR}/files:"
# Arm platforms kmeta
SRC_URI_KMETA = "file://arm-platforms-kmeta;type=kmeta;name=arm-platforms-kmeta;destsuffix=arm-platforms-kmeta"
+SRC_URI:append:corstone700 = " ${SRC_URI_KMETA}"
SRC_URI:append:fvp-base = " ${SRC_URI_KMETA}"
SRC_URI:append:fvp-base-arm32 = " ${SRC_URI_KMETA}"
SRC_URI:append:fvp-baser-aemv8r64 = " ${SRC_URI_KMETA}"
@@ -28,6 +29,58 @@ KMACHINE:corstone500 = "corstone500"
KBUILD_DEFCONFIG:corstone500 = "multi_v7_defconfig"
KCONFIG_MODE:corstone500 = "--alldefconfig"
+#
+# Corstone-700 Machines
+#
+COMPATIBLE_MACHINE:corstone700 = "${MACHINE}"
+KMACHINE:corstone700 = "corstone700"
+KERNEL_IMAGETYPE:corstone700 = "xipImage"
+KCONFIG_MODE:corstone700 = "--alldefconfig"
+FILESEXTRAPATHS:prepend:corstone700 := "${ARMBSPFILESPATHS}"
+SRC_URI:append:corstone700 = " \
+ file://0001-arm-support-for-a-single-ARMv7-A-based-platform.patch \
+ file://0002-arm-Add-tiny-vexpress-machine.patch \
+ file://0003-arm-introduce-corstone700_defconfig.patch \
+ file://0004-add-driver-of-mailbox-handling-unit-controller-versi.patch \
+ file://0005-add-rpmsg-based-on-rpmsg-char-driver-using-mailbox.patch \
+ file://0006-enable-arm-MHU-driver-and-RPMSG-char-driver.patch \
+ file://0007-allow-creation-of-multiple-arm-rpmsg-channels.patch \
+ file://0008-mailbox-enable-combined-receiver-interrupt-when-usin.patch \
+ file://0009-misc-arm-add-corstone700-external-system-harness-dri.patch \
+ file://0010-arm-containerize-endpoint-and-mailbox-information.patch \
+ file://0011-arm-couple-mailbox-channel-ownership-to-rpmsg-endpoi.patch \
+ file://0012-mailbox-arm_mhu_v2-add-new-AMBA-ID-to-support-MHU-v2.patch \
+ file://0013-mailbox-arm_mhu_v2-dynamic-allocation-of-channels.patch \
+ file://0014-defconfig-adjust-XIP-physical-address-to-3MB-offset.patch \
+ file://0015-arm-Kconfig-disable-ARM_VIRT-extension-if-XIP_KERNEL.patch \
+ file://0016-corstone700_defconfig-use-DDR-address-instead-of-sha.patch \
+ file://0017-corstone700_defconfig-enable-configs-for-cramfs-xip.patch \
+ file://0018-usb-isp1760-move-to-regmap-for-register-access.patch \
+ file://0019-usb-isp1760-hcd-refactor-mempool-config-and-setup.patch \
+ file://0020-usb-isp1760-add-support-for-isp1763.patch \
+ "
+
+KERNEL_FEATURES:append:corstone700 = " bsp/arm-platforms/corstone700-bsp.scc"
+KERNEL_FEATURES:append:corstone700-fvp = " \
+ ${@bb.utils.contains('MACHINE_FEATURES', \
+ 'eth_lan91c111', \
+ 'bsp/arm-platforms/corstone700/xip_dhcp_cmdline.cfg \
+ bsp/arm-platforms/corstone700/eth_lan91c111.scc', \
+ 'bsp/arm-platforms/corstone700/xip_cmdline.cfg', \
+ d)}"
+KERNEL_FEATURES:append:corstone700-mps3 = " \
+ ${@bb.utils.contains('MACHINE_FEATURES', \
+ 'eth_lan9115', \
+ 'bsp/arm-platforms/corstone700/xip_dhcp_cmdline.cfg \
+ bsp/arm-platforms/corstone700/eth_lan9115.scc', \
+ 'bsp/arm-platforms/corstone700/xip_cmdline.cfg', \
+ d)} \
+ ${@bb.utils.contains('MACHINE_FEATURES', \
+ 'usb_host', \
+ 'bsp/arm-platforms/corstone700/usb_host.cfg', \
+ '', \
+ d)}"
+
#
# FVP BASE KMACHINE
#
diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-yocto-corstone700.inc b/meta-arm-bsp/recipes-kernel/linux/linux-yocto-corstone700.inc
deleted file mode 100644
index e21f059..0000000
--- a/meta-arm-bsp/recipes-kernel/linux/linux-yocto-corstone700.inc
+++ /dev/null
@@ -1,58 +0,0 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}:${THISDIR}/files:"
-
-COMPATIBLE_MACHINE = "${MACHINE}"
-
-KMACHINE = "corstone700"
-
-SRC_URI += " \
- file://0001-arm-support-for-a-single-ARMv7-A-based-platform.patch \
- file://0002-arm-Add-tiny-vexpress-machine.patch \
- file://0003-arm-introduce-corstone700_defconfig.patch \
- file://0004-add-driver-of-mailbox-handling-unit-controller-versi.patch \
- file://0005-add-rpmsg-based-on-rpmsg-char-driver-using-mailbox.patch \
- file://0006-enable-arm-MHU-driver-and-RPMSG-char-driver.patch \
- file://0007-allow-creation-of-multiple-arm-rpmsg-channels.patch \
- file://0008-mailbox-enable-combined-receiver-interrupt-when-usin.patch \
- file://0009-misc-arm-add-corstone700-external-system-harness-dri.patch \
- file://0010-arm-containerize-endpoint-and-mailbox-information.patch \
- file://0011-arm-couple-mailbox-channel-ownership-to-rpmsg-endpoi.patch \
- file://0012-mailbox-arm_mhu_v2-add-new-AMBA-ID-to-support-MHU-v2.patch \
- file://0013-mailbox-arm_mhu_v2-dynamic-allocation-of-channels.patch \
- file://0014-defconfig-adjust-XIP-physical-address-to-3MB-offset.patch \
- file://0015-arm-Kconfig-disable-ARM_VIRT-extension-if-XIP_KERNEL.patch \
- file://0016-corstone700_defconfig-use-DDR-address-instead-of-sha.patch \
- file://0017-corstone700_defconfig-enable-configs-for-cramfs-xip.patch \
- file://0018-usb-isp1760-move-to-regmap-for-register-access.patch \
- file://0019-usb-isp1760-hcd-refactor-mempool-config-and-setup.patch \
- file://0020-usb-isp1760-add-support-for-isp1763.patch \
- "
-
-KERNEL_IMAGETYPE = "xipImage"
-
-KCONFIG_MODE = "--alldefconfig"
-
-SRC_URI:append = " ${SRC_URI_KMETA}"
-
-KERNEL_EXTRA_FEATURES = "bsp/arm-platforms/corstone700-bsp.scc"
-KERNEL_FEATURES:append = " ${KERNEL_EXTRA_FEATURES}"
-
-KERNEL_FEATURES:append:corstone700-fvp = " \
- ${@bb.utils.contains('MACHINE_FEATURES', \
- 'eth_lan91c111', \
- 'bsp/arm-platforms/corstone700/xip_dhcp_cmdline.cfg \
- bsp/arm-platforms/corstone700/eth_lan91c111.scc', \
- 'bsp/arm-platforms/corstone700/xip_cmdline.cfg', \
- d)}"
-
-KERNEL_FEATURES:append:corstone700-mps3 = " \
- ${@bb.utils.contains('MACHINE_FEATURES', \
- 'eth_lan9115', \
- 'bsp/arm-platforms/corstone700/xip_dhcp_cmdline.cfg \
- bsp/arm-platforms/corstone700/eth_lan9115.scc', \
- 'bsp/arm-platforms/corstone700/xip_cmdline.cfg', \
- d)} \
- ${@bb.utils.contains('MACHINE_FEATURES', \
- 'usb_host', \
- 'bsp/arm-platforms/corstone700/usb_host.cfg', \
- '', \
- d)}"
diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.6%.bbappend b/meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.6%.bbappend
index 02fbf05..cf3af8a 100644
--- a/meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.6%.bbappend
+++ b/meta-arm-bsp/recipes-kernel/linux/linux-yocto_5.6%.bbappend
@@ -2,11 +2,3 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/linux-yocto-5.6:"
SRC_URI:append = " file://0001-libtraceevent-Fix-build-with-binutils-2.35.patch \
file://0002-perf-cs-etm-Move-definition-of-traceid_list-global-v.patch"
-
-#
-# Corstone700 KMACHINE
-#
-MACHINE_KERNEL_REQUIRE ?= ""
-MACHINE_KERNEL_REQUIRE:corstone700 = "linux-yocto-corstone700.inc"
-
-require ${MACHINE_KERNEL_REQUIRE}
--
2.17.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/5] arm/machine: update to new tunes locations
2021-08-19 20:59 [PATCH 1/5] arm-bsp/linux-yocto: Alphabetize platform inc file Jon Mason
2021-08-19 20:59 ` [PATCH 2/5] arm-bsp/linux-yocto: migrate corstone700 to the common file Jon Mason
@ 2021-08-19 20:59 ` Jon Mason
2021-08-19 20:59 ` [PATCH 4/5] arm-bsp/linux-yocto: Add 5.4 kernel Jon Mason
2021-08-19 20:59 ` [PATCH 5/5] arm/qemuarm64-secureboot: use 5.10 kernel Jon Mason
3 siblings, 0 replies; 5+ messages in thread
From: Jon Mason @ 2021-08-19 20:59 UTC (permalink / raw)
To: meta-arm
Signed-off-by: Jon Mason <jon.mason@arm.com>
---
meta-arm-bsp/conf/machine/corstone500.conf | 2 +-
meta-arm-bsp/conf/machine/include/corstone700.inc | 2 +-
meta-arm/conf/machine/microbit-v1.conf | 2 +-
meta-arm/conf/machine/qemu-cortex-a53.conf | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta-arm-bsp/conf/machine/corstone500.conf b/meta-arm-bsp/conf/machine/corstone500.conf
index 401c746..e87d81d 100644
--- a/meta-arm-bsp/conf/machine/corstone500.conf
+++ b/meta-arm-bsp/conf/machine/corstone500.conf
@@ -2,7 +2,7 @@
#@NAME: Corstone-500 machine
#@DESCRIPTION: Machine configuration for the Corstone-500 platform
-require conf/machine/include/tune-cortexa5.inc
+require conf/machine/include/arm/armv7a/tune-cortexa5.inc
# Corstone-500 is built against poky-tiny distro.
# poky-tiny sets PREFERRED_PROVIDER_virtual/kernel to linux-yocto-tiny.
diff --git a/meta-arm-bsp/conf/machine/include/corstone700.inc b/meta-arm-bsp/conf/machine/include/corstone700.inc
index 229a226..0ec385a 100644
--- a/meta-arm-bsp/conf/machine/include/corstone700.inc
+++ b/meta-arm-bsp/conf/machine/include/corstone700.inc
@@ -1,6 +1,6 @@
# Common configuration for all Corstone700 machines
-require conf/machine/include/tune-cortexa32.inc
+require conf/machine/include/arm/armv8a/tune-cortexa32.inc
MACHINEOVERRIDES =. "corstone700:"
diff --git a/meta-arm/conf/machine/microbit-v1.conf b/meta-arm/conf/machine/microbit-v1.conf
index 84663d4..1fa2532 100644
--- a/meta-arm/conf/machine/microbit-v1.conf
+++ b/meta-arm/conf/machine/microbit-v1.conf
@@ -3,7 +3,7 @@
#@DESCRIPTION: Machine for BBC Microbit v1, Zephyr BOARD qemu_cortex_m0
require conf/machine/include/qemu.inc
-require conf/machine/include/tune-cortex-m0.inc
+require conf/machine/include/arm/armv6m/tune-cortexm0.inc
MACHINEOVERRIDES =. "nordic:"
diff --git a/meta-arm/conf/machine/qemu-cortex-a53.conf b/meta-arm/conf/machine/qemu-cortex-a53.conf
index 294c65f..b97cde7 100644
--- a/meta-arm/conf/machine/qemu-cortex-a53.conf
+++ b/meta-arm/conf/machine/qemu-cortex-a53.conf
@@ -3,7 +3,7 @@
#@DESCRIPTION: Machine for Zephyr BOARD qemu_cortex_a53
require conf/machine/include/qemu.inc
-require conf/machine/include/tune-cortexa53.inc
+require conf/machine/include/arm/armv8a/tune-cortexa53.inc
TCLIBC = "newlib"
--
2.17.1
^ permalink raw reply related [flat|nested] 5+ messages in thread