From 8be20446706c6b2fe911804385f308817495d2d4 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Mon, 17 Apr 2023 13:15:23 +0200 Subject: [PATCH] fix(xilinx): remove asserts around arg0/arg1 The commit a6f340fe58b9 ("Introduce the new BL handover interface") extended handoff to 4 registers instead of 2. Arguments arg0-3 are not used by platform code but in future they can be used for it. But it doesn't make sense to checking their unused value. Change-Id: I151e4b1574465409424453c054d937487086b79a Signed-off-by: Michal Simek --- plat/xilinx/versal/bl31_versal_setup.c | 3 --- plat/xilinx/versal_net/bl31_versal_net_setup.c | 3 --- plat/xilinx/zynqmp/bl31_zynqmp_setup.c | 4 ---- 3 files changed, 10 deletions(-) diff --git a/plat/xilinx/versal/bl31_versal_setup.c b/plat/xilinx/versal/bl31_versal_setup.c index 995c8529c..77561a770 100644 --- a/plat/xilinx/versal/bl31_versal_setup.c +++ b/plat/xilinx/versal/bl31_versal_setup.c @@ -97,9 +97,6 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1, /* Initialize the platform config for future decision making */ versal_config_setup(); - /* There are no parameters from BL2 if BL31 is a reset vector */ - assert(arg0 == 0U); - assert(arg1 == 0U); /* * Do initial security configuration to allow DRAM/device access. On diff --git a/plat/xilinx/versal_net/bl31_versal_net_setup.c b/plat/xilinx/versal_net/bl31_versal_net_setup.c index a7bae7258..d74ac9566 100644 --- a/plat/xilinx/versal_net/bl31_versal_net_setup.c +++ b/plat/xilinx/versal_net/bl31_versal_net_setup.c @@ -123,9 +123,6 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1, /* Initialize the platform config for future decision making */ versal_net_config_setup(); - /* There are no parameters from BL2 if BL31 is a reset vector */ - assert(arg0 == 0U); - assert(arg1 == 0U); /* * Do initial security configuration to allow DRAM/device access. On diff --git a/plat/xilinx/zynqmp/bl31_zynqmp_setup.c b/plat/xilinx/zynqmp/bl31_zynqmp_setup.c index c99d1b10c..e7b0a905c 100644 --- a/plat/xilinx/zynqmp/bl31_zynqmp_setup.c +++ b/plat/xilinx/zynqmp/bl31_zynqmp_setup.c @@ -94,10 +94,6 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1, /* Initialize the platform config for future decision making */ zynqmp_config_setup(); - /* There are no parameters from BL2 if BL31 is a reset vector */ - assert(arg0 == 0U); - assert(arg1 == 0U); - /* * Do initial security configuration to allow DRAM/device access. On * Base ZYNQMP only DRAM security is programmable (via TrustZone), but -- 2.39.5