Re: [Buildroot] [PATCH v6 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022

From: Luca Ceresoli <luca@lucaceresoli.net>
To: Neal Frager <neal.frager@xilinx.com>, buildroot@buildroot.org
Cc: giulio.benetti@benettiengineering.com, michal.simek@xilinx.com
Subject: Re: [Buildroot] [PATCH v6 1/2] configs/zynqmp_zcu106: bump ATF/U-Boot/Linux to Xilinx 2022
Date: Sat, 12 Feb 2022 14:13:28 +0100	[thread overview]
Message-ID: <69189572-6eba-ed26-52dd-08a8b098f124@lucaceresoli.net> (raw)
In-Reply-To: <20220211144402.1626443-1-neal.frager@xilinx.com>

Hi Neal,

On 11/02/22 15:44, Neal Frager wrote:
[...]
> diff --git a/board/zynqmp/zcu106/pm_cfg_obj.c b/board/zynqmp/zcu106/pm_cfg_obj.c
> new file mode 100644
> index 0000000000..6d15d510e9
> --- /dev/null
> +++ b/board/zynqmp/zcu106/pm_cfg_obj.c
> @@ -0,0 +1,562 @@
> +/******************************************************************************
> +* Copyright (c) 2017 - 2021 Xilinx, Inc.  All rights reserved.
> +* SPDX-License-Identifier: MIT
> +******************************************************************************/
> +
> +#include "xil_types.h"
> +#include "pm_defs.h"
> +
> +#define PM_CONFIG_MASTER_SECTION_ID	0x101U
> +#define PM_CONFIG_SLAVE_SECTION_ID	0x102U
> +#define PM_CONFIG_PREALLOC_SECTION_ID	0x103U
> +#define PM_CONFIG_POWER_SECTION_ID	0x104U
> +#define PM_CONFIG_RESET_SECTION_ID	0x105U
> +#define PM_CONFIG_SHUTDOWN_SECTION_ID	0x106U
> +#define PM_CONFIG_SET_CONFIG_SECTION_ID	0x107U
> +#define PM_CONFIG_GPO_SECTION_ID	0x108U
> +
> +#define PM_SLAVE_FLAG_IS_SHAREABLE	0x1U
> +#define PM_MASTER_USING_SLAVE_MASK	0x2U
> +
> +#define PM_CONFIG_GPO1_MIO_PIN_34_MAP	(1U << 10U)
> +#define PM_CONFIG_GPO1_MIO_PIN_35_MAP	(1U << 11U)
> +#define PM_CONFIG_GPO1_MIO_PIN_36_MAP	(1U << 12U)
> +#define PM_CONFIG_GPO1_MIO_PIN_37_MAP	(1U << 13U)
> +
> +#define PM_CONFIG_GPO1_BIT_2_MASK	(1U << 2U)
> +#define PM_CONFIG_GPO1_BIT_3_MASK	(1U << 3U)
> +#define PM_CONFIG_GPO1_BIT_4_MASK	(1U << 4U)
> +#define PM_CONFIG_GPO1_BIT_5_MASK	(1U << 5U)
> +
> +#define SUSPEND_TIMEOUT	0xFFFFFFFFU
> +
> +#define PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK    0x00000001
> +#define PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK    0x00000100
> +#define PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK    0x00000200
> +
> +
> +
> +#if defined (__ICCARM__)
> +#pragma language=save
> +#pragma language=extended
> +#endif
> +#if defined (__GNUC__)
> +    const u32 XPm_ConfigObject[] __attribute__((used, section(".sys_cfg_data"))) =
> +#elif defined (__ICCARM__)
> +#pragma location = ".sys_cfg_data"
> +__root const u32 XPm_ConfigObject[] =
> +#endif
> +{
> +	/**********************************************************************/
> +	/* HEADER */
> +	2,	/* Number of remaining words in the header */
> +	8,	/* Number of sections included in config object */
> +	1U,	/* Type of config object as base */

Here's where you have manually replaced "PM_CONFIG_OBJECT_TYPE_BASE" ->
"1U", right? Well, it should be well noted in the commit message. This
file is supposed to be generated by Vitis and used untouched, any manual
edits whould be documented.

Or, even better, use the U-Boot patch I sent (see other e-mail I just
wrote) and use an unmodified pm_cfg_obj.c

-- 
Luca
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot