From: Jan Kiszka <[email protected]> This allows to drop the now included zynqmp fix from ATF.
Signed-off-by: Jan Kiszka <[email protected]> --- ...rmware_2.1.inc => arm-trusted-firmware_2.2.inc} | 3 +- ...t-xilinx-zynqmp-Initialize-IPI-table-from.patch | 68 ---------------------- ....1.bb => u-boot-macchiatobin_2019.10-atf2.2.bb} | 2 +- ...-atf2.1.bb => u-boot-ultra96_2019.10-atf2.2.bb} | 2 +- 4 files changed, 3 insertions(+), 72 deletions(-) rename recipes-bsp/arm-trusted-firmware/{arm-trusted-firmware_2.1.inc => arm-trusted-firmware_2.2.inc} (63%) delete mode 100644 recipes-bsp/arm-trusted-firmware/files/0001-plat-xilinx-zynqmp-Initialize-IPI-table-from.patch rename recipes-bsp/u-boot/{u-boot-macchiatobin_2019.07-atf2.1.bb => u-boot-macchiatobin_2019.10-atf2.2.bb} (94%) rename recipes-bsp/u-boot/{u-boot-ultra96_2019.07-atf2.1.bb => u-boot-ultra96_2019.10-atf2.2.bb} (91%) diff --git a/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.1.inc b/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.2.inc similarity index 63% rename from recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.1.inc rename to recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.2.inc index 8fd5cce..2281d72 100644 --- a/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.1.inc +++ b/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.2.inc @@ -13,6 +13,5 @@ FILESPATH =. "${LAYERDIR_jailhouse}/recipes-bsp/arm-trusted-firmware/files:" SRC_URI += " \ https://github.com/ARM-software/arm-trusted-firmware/archive/v${ATF_PV}.tar.gz;name=atf \ - file://0001-plat-xilinx-zynqmp-Initialize-IPI-table-from.patch;patchdir=${WORKDIR}/arm-trusted-firmware-${ATF_PV} \ " -SRC_URI[atf.sha256sum] = "7c4c00a4f28d3cfbb235fd1a1fb28c4d2fc1d657c9301686e7d8824ef575d059" +SRC_URI[atf.sha256sum] = "07e3c058ae2d95c7d516a46fc93565b797e912c3271ddbf29df523b1ab1ee911" diff --git a/recipes-bsp/arm-trusted-firmware/files/0001-plat-xilinx-zynqmp-Initialize-IPI-table-from.patch b/recipes-bsp/arm-trusted-firmware/files/0001-plat-xilinx-zynqmp-Initialize-IPI-table-from.patch deleted file mode 100644 index dec3cb2..0000000 --- a/recipes-bsp/arm-trusted-firmware/files/0001-plat-xilinx-zynqmp-Initialize-IPI-table-from.patch +++ /dev/null @@ -1,68 +0,0 @@ -From f20643624a65cc8a992cbafe245af11fcf63ab6d Mon Sep 17 00:00:00 2001 -From: Jolly Shah <[email protected]> -Date: Tue, 27 Aug 2019 11:23:08 -0700 -Subject: [PATCH] plat: xilinx: zynqmp: Initialize IPI table from - zynqmp_config_setup() - -Common ipi_table needs to be initialized before using any -IPI command (i.e send/receive). Move zynqmp ipi config table -initialization from sip_svc_setup() to zynqmp_config_setup(). - -Signed-off-by: Tejas Patel <[email protected]> -Signed-off-by: Jolly Shah <[email protected]> ---- - plat/xilinx/zynqmp/aarch64/zynqmp_common.c | 6 +++++- - plat/xilinx/zynqmp/sip_svc_setup.c | 4 ---- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/plat/xilinx/zynqmp/aarch64/zynqmp_common.c b/plat/xilinx/zynqmp/aarch64/zynqmp_common.c -index 8ff6c43604..ab5d95d1e2 100644 ---- a/plat/xilinx/zynqmp/aarch64/zynqmp_common.c -+++ b/plat/xilinx/zynqmp/aarch64/zynqmp_common.c -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2013-2016, ARM Limited and Contributors. All rights reserved. -+ * Copyright (c) 2013-2019, ARM Limited and Contributors. All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ -@@ -11,6 +11,7 @@ - #include <drivers/generic_delay_timer.h> - #include <lib/mmio.h> - #include <lib/xlat_tables/xlat_tables.h> -+#include <plat_ipi.h> - #include <plat_private.h> - #include <plat/common/platform.h> - -@@ -325,6 +326,9 @@ unsigned int zynqmp_get_bootmode(void) - - void zynqmp_config_setup(void) - { -+ /* Configure IPI data for ZynqMP */ -+ zynqmp_ipi_config_table_init(); -+ - zynqmp_print_platform_name(); - generic_delay_timer_init(); - } -diff --git a/plat/xilinx/zynqmp/sip_svc_setup.c b/plat/xilinx/zynqmp/sip_svc_setup.c -index edb81f5c3b..9b182749cb 100644 ---- a/plat/xilinx/zynqmp/sip_svc_setup.c -+++ b/plat/xilinx/zynqmp/sip_svc_setup.c -@@ -9,7 +9,6 @@ - #include <common/runtime_svc.h> - #include <tools_share/uuid.h> - --#include <plat_ipi.h> - #include "ipi_mailbox_svc.h" - #include "pm_svc_main.h" - -@@ -41,9 +40,6 @@ DEFINE_SVC_UUID2(zynqmp_sip_uuid, - */ - static int32_t sip_svc_setup(void) - { -- /* Configure IPI data for ZynqMP */ -- zynqmp_ipi_config_table_init(); -- - /* PM implementation as SiP Service */ - pm_setup(); - diff --git a/recipes-bsp/u-boot/u-boot-macchiatobin_2019.07-atf2.1.bb b/recipes-bsp/u-boot/u-boot-macchiatobin_2019.10-atf2.2.bb similarity index 94% rename from recipes-bsp/u-boot/u-boot-macchiatobin_2019.07-atf2.1.bb rename to recipes-bsp/u-boot/u-boot-macchiatobin_2019.10-atf2.2.bb index 81ac2d7..c80e07f 100644 --- a/recipes-bsp/u-boot/u-boot-macchiatobin_2019.07-atf2.1.bb +++ b/recipes-bsp/u-boot/u-boot-macchiatobin_2019.10-atf2.2.bb @@ -22,7 +22,7 @@ SRC_URI += " \ file://0001-mv_ddr4_training-fix-gcc-warning-about-uninitialized.patch;patchdir=${WORKDIR}/mv-ddr-marvell \ file://macchiatobin-rules \ " -SRC_URI[u-boot.sha256sum] = "bff4fa77e8da17521c030ca4c5b947a056c1b1be4d3e6ee8637020b8d50251d0" +SRC_URI[u-boot.sha256sum] = "8d6d6070739522dd236cba7055b8736bfe92b4fac0ea18ad809829ca79667014" BUILD_DEPENDS =. "libssl-dev:native, " diff --git a/recipes-bsp/u-boot/u-boot-ultra96_2019.07-atf2.1.bb b/recipes-bsp/u-boot/u-boot-ultra96_2019.10-atf2.2.bb similarity index 91% rename from recipes-bsp/u-boot/u-boot-ultra96_2019.07-atf2.1.bb rename to recipes-bsp/u-boot/u-boot-ultra96_2019.10-atf2.2.bb index 8e80388..b87d7ce 100644 --- a/recipes-bsp/u-boot/u-boot-ultra96_2019.07-atf2.1.bb +++ b/recipes-bsp/u-boot/u-boot-ultra96_2019.10-atf2.2.bb @@ -23,7 +23,7 @@ SRC_URI += " \ file://ultra96.bif.tmpl \ file://ultra96-rules \ " -SRC_URI[u-boot.sha256sum] = "bff4fa77e8da17521c030ca4c5b947a056c1b1be4d3e6ee8637020b8d50251d0" +SRC_URI[u-boot.sha256sum] = "8d6d6070739522dd236cba7055b8736bfe92b4fac0ea18ad809829ca79667014" TEMPLATE_FILES += "ultra96.bif.tmpl" TEMPLATE_VARS += "ATF_PV" -- 2.16.4 -- You received this message because you are subscribed to the Google Groups "Jailhouse" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/jailhouse-dev/94238caff510daf171b442f1fda43bce4db9db36.1579170887.git.jan.kiszka%40siemens.com.
