diff --git a/conf/machine/include/corstone1000-fvp-cassini-extra-settings.inc b/conf/machine/include/corstone1000-fvp-cassini-extra-settings.inc index 801c5c5d232e57ee882d54118fc73f6edadfa57a..9a696246cc97ee92613dcb9873078d17b60d194e 100644 --- a/conf/machine/include/corstone1000-fvp-cassini-extra-settings.inc +++ b/conf/machine/include/corstone1000-fvp-cassini-extra-settings.inc @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: Copyright 2023 Arm Limited and/or its +# SPDX-FileCopyrightText: Copyright 2023-2024 Arm Limited and/or its # affiliates # # SPDX-License-Identifier: MIT @@ -9,12 +9,13 @@ include conf/machine/include/corstone1000-mps3-cassini-extra-settings.inc # Corstone-1000's FVP need images to have a extra empty space at the end or the FVP # truncates the mmc card size resulting in invalid GPT entries as the GPT last block is # beyond the MMC cards reported size, so we use the padded image here -FVP_CONFIG[board.msd_mmc.p_mmc_file] = "${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.wic.pad" +FVP_CONFIG[board.msd_mmc.p_mmc_file] = "${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.wic" # Setup the second MMC card FVP_CONFIG[board.msd_mmc_2.card_type] ?= "SDHC" FVP_CONFIG[board.msd_mmc_2.p_fast_access] ?= "0" FVP_CONFIG[board.msd_mmc_2.diagnostics] ?= "0" FVP_CONFIG[board.msd_mmc_2.p_max_block_count] ?= "0xFFFF" FVP_CONFIG[board.msd_config_2.pl180_fifo_depth] ?= "16" +FVP_CONFIG[board.msd_mmc.support_unpadded_images] ?= "true" FVP_DATA = "board.flash0=${DEPLOY_DIR_IMAGE}/corstone1000-image-corstone1000-fvp.wic@0x68000000" diff --git a/conf/machine/include/corstone1000-mps3-cassini-extra-settings.inc b/conf/machine/include/corstone1000-mps3-cassini-extra-settings.inc index c824d3c35bf5fa08fd9c1666fe11a7856909a27e..f9cb9c69a203c38114ee7e9f25118b0021264bdf 100644 --- a/conf/machine/include/corstone1000-mps3-cassini-extra-settings.inc +++ b/conf/machine/include/corstone1000-mps3-cassini-extra-settings.inc @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: Copyright 2023 Arm Limited and/or its +# SPDX-FileCopyrightText: Copyright 2023-2024 Arm Limited and/or its # affiliates # # SPDX-License-Identifier: MIT @@ -25,3 +25,7 @@ KERNEL_CLASSES:remove = "k3s_kernelcfg_check" # Due to performance limitations, add wait-online helper IMAGE_INSTALL:append:cassini = " wait-online" + +# Skip components which will be provided by the firmware build +EXTRA_IMAGEDEPENDS:remove:cassini = "external-system" +EXTRA_IMAGEDEPENDS:remove:cassini = "trusted-firmware-m" diff --git a/meta-arm/meta-arm-bsp/recipes-core/images/cassini-image-%.bbappend b/meta-arm/meta-arm-bsp/recipes-core/images/cassini-image-%.bbappend index 610997786d41ee06b7b143aa28c5f19a965d1a09..8380b3c9866094ed6533297add816ca62dad0dca 100644 --- a/meta-arm/meta-arm-bsp/recipes-core/images/cassini-image-%.bbappend +++ b/meta-arm/meta-arm-bsp/recipes-core/images/cassini-image-%.bbappend @@ -1,19 +1,8 @@ -# SPDX-FileCopyrightText: Copyright 2023 Arm Limited and/or its +# SPDX-FileCopyrightText: Copyright 2023-2024 Arm Limited and/or its # affiliates # # SPDX-License-Identifier: MIT -# Corstone-1000's FVP needs images to have a extra empty space at the end or the FVP -# truncates the MMC card resulting in invalid GPT entries as the GPT last block is -# beyond the MMC cards reported size -IMAGE_TYPES += "wic.pad" - -CONVERSIONTYPES += "pad" - -CONVERSION_CMD:pad = "cp ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.pad && dd if=/dev/zero count=1024 bs=512 >> ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.pad" - -IMAGE_FSTYPES:append:corstone1000-fvp = " wic.pad wic.pad.gz" - # We do not want to build these machine added extra's in the main cassini image context as # they should only be built in firmware context # This list needs to be kept in sync with the list added in diff --git a/meta-arm/meta-arm-bsp/recipes-core/systemd/corstone1000/system.conf b/meta-arm/meta-arm-bsp/recipes-core/systemd/corstone1000/timeouts.conf similarity index 100% rename from meta-arm/meta-arm-bsp/recipes-core/systemd/corstone1000/system.conf rename to meta-arm/meta-arm-bsp/recipes-core/systemd/corstone1000/timeouts.conf diff --git a/meta-arm/meta-arm-bsp/recipes-core/systemd/systemd-conf_%.bbappend b/meta-arm/meta-arm-bsp/recipes-core/systemd/systemd-conf_%.bbappend index 1ca063336c2c481ed16fa0567a56cc4e13744129..28399fb2633e0267b7eade37153f7177b22f3fef 100644 --- a/meta-arm/meta-arm-bsp/recipes-core/systemd/systemd-conf_%.bbappend +++ b/meta-arm/meta-arm-bsp/recipes-core/systemd/systemd-conf_%.bbappend @@ -6,10 +6,10 @@ FILESEXTRAPATHS:prepend := "${THISDIR}:" SRC_URI:append:corstone1000 = " \ - file://system.conf \ + file://timeouts.conf \ " # nooelint: oelint.func.specific - Common name set in Corstone-1000 definitions do_install:append:corstone1000() { - install -D -m0644 ${WORKDIR}/system.conf ${D}${systemd_system_unitdir}.conf.d/01-${PN}.conf + install -D -m0644 ${WORKDIR}/timeouts.conf ${D}${systemd_system_unitdir}.conf.d/01-${PN}.conf } diff --git a/poky/meta/recipes-core/systemd/files/corstone1000/0001-Set-networkd-wait-online-timeout-to-5-minutes.patch b/poky/meta/recipes-core/systemd/files/corstone1000/0001-Set-networkd-wait-online-timeout-to-5-minutes.patch index a8d65fdee911d56ed16f3d9e8b4d45a07b631d85..bb0b9ac1b2729232af740f7f7544a0bd6d669c24 100644 --- a/poky/meta/recipes-core/systemd/files/corstone1000/0001-Set-networkd-wait-online-timeout-to-5-minutes.patch +++ b/poky/meta/recipes-core/systemd/files/corstone1000/0001-Set-networkd-wait-online-timeout-to-5-minutes.patch @@ -21,8 +21,8 @@ index 3dc5ce9265..5e1fb5c146 100644 [Service] Type=oneshot --ExecStart={{ROOTLIBEXECDIR}}/systemd-networkd-wait-online -+ExecStart={{ROOTLIBEXECDIR}}/systemd-networkd-wait-online --timeout=300 +-ExecStart={{LIBEXECDIR}}/systemd-networkd-wait-online ++ExecStart={{LIBEXECDIR}}/systemd-networkd-wait-online --timeout=300 RemainAfterExit=yes [Install] @@ -34,8 +34,8 @@ index 2fae26d1c0..efd5d65a55 100644 [Service] Type=oneshot --ExecStart={{ROOTLIBEXECDIR}}/systemd-networkd-wait-online -i %i -+ExecStart={{ROOTLIBEXECDIR}}/systemd-networkd-wait-online -i %i --timeout=300 +-ExecStart={{LIBEXECDIR}}/systemd-networkd-wait-online -i %i ++ExecStart={{LIBEXECDIR}}/systemd-networkd-wait-online -i %i --timeout=300 RemainAfterExit=yes [Install]