Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-17 18:14:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "feat(stm32mp2): add ddr-fw parameter for fiptool" into integration

Browse source
This commit is contained in:
Manish Pandey 2024-05-08 23:08:44 +02:00 • committed by TrustedFirmware Code Review
commit 10327628ca
3 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
plat/st/stm32mp1/include/plat_def_fip_uuid.h → plat/st/common/include/plat_def_fip_uuid.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2021-2022, STMicroelectronics - All Rights Reserved * Copyright (c) 2021-2024, STMicroelectronics - All Rights Reserved
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -7,6 +7,10 @@
#ifndef PLAT_DEF_FIP_UUID_H #ifndef PLAT_DEF_FIP_UUID_H
#define PLAT_DEF_FIP_UUID_H #define PLAT_DEF_FIP_UUID_H
#define UUID_DDR_FW \
{{0xb1, 0x12, 0x49, 0xbe}, {0x92, 0xdd}, {0x4b, 0x10}, 0x86, 0x7c, \
{0x2c, 0x6a, 0x4b, 0x47, 0xa7, 0xfb} }
#define UUID_STM32MP_CONFIG_CERT \ #define UUID_STM32MP_CONFIG_CERT \
{{0x50, 0x1d, 0x8d, 0xd2}, {0x8b, 0xce}, {0x49, 0xa5}, 0x84, 0xeb, \ {{0x50, 0x1d, 0x8d, 0xd2}, {0x8b, 0xce}, {0x49, 0xa5}, 0x84, 0xeb, \
{0x55, 0x9a, 0x9f, 0x2e, 0xae, 0xaf} } {0x55, 0x9a, 0x9f, 0x2e, 0xae, 0xaf} }

7
tools/fiptool/plat_fiptool/st/stm32mp1/plat_def_uuid_config.c → tools/fiptool/plat_fiptool/st/plat_def_uuid_config.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2022-2023, STMicroelectronics - All Rights Reserved * Copyright (c) 2022-2024, STMicroelectronics - All Rights Reserved
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -11,6 +11,11 @@
#include "tbbr_config.h" #include "tbbr_config.h"
toc_entry_t plat_def_toc_entries[] = { toc_entry_t plat_def_toc_entries[] = {
{
.name = "DDR_FW",
.uuid = UUID_DDR_FW,
.cmdline_name = "ddr-fw"
},
{ {
.name = "STM32MP CONFIG CERT", .name = "STM32MP CONFIG CERT",
.uuid = UUID_STM32MP_CONFIG_CERT, .uuid = UUID_STM32MP_CONFIG_CERT,

6
tools/fiptool/plat_fiptool/st/stm32mp1/plat_fiptool.mk → tools/fiptool/plat_fiptool/st/plat_fiptool.mk
View file

@ -1,5 +1,5 @@
# #
# Copyright (c) 2021-2022, STMicroelectronics - All Rights Reserved # Copyright (c) 2021-2024, STMicroelectronics - All Rights Reserved
# #
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
# #
@ -9,14 +9,14 @@
# in the plat_def_toc_entries[]. # in the plat_def_toc_entries[].
PLAT_DEF_UUID_FILE_NAME := plat_def_uuid_config PLAT_DEF_UUID_FILE_NAME := plat_def_uuid_config
INCLUDE_PATHS += -I${PLAT_DIR}/include -I./ INCLUDE_PATHS += -I../../plat/st/common/include -I./
PLAT_DEF_UUID := yes PLAT_DEF_UUID := yes
ifeq (${PLAT_DEF_UUID},yes) ifeq (${PLAT_DEF_UUID},yes)
HOSTCCFLAGS += -DPLAT_DEF_FIP_UUID HOSTCCFLAGS += -DPLAT_DEF_FIP_UUID
${PLAT_DEF_UUID_FILE_NAME}.o: plat_fiptool/st/stm32mp1/${PLAT_DEF_UUID_FILE_NAME}.c ${PLAT_DEF_UUID_FILE_NAME}.o: plat_fiptool/st/${PLAT_DEF_UUID_FILE_NAME}.c
$(host-cc) -c ${CPPFLAGS} ${HOSTCCFLAGS} ${INCLUDE_PATHS} $< -o $@ $(host-cc) -c ${CPPFLAGS} ${HOSTCCFLAGS} ${INCLUDE_PATHS} $< -o $@
PLAT_OBJECTS += ${PLAT_DEF_UUID_FILE_NAME}.o PLAT_OBJECTS += ${PLAT_DEF_UUID_FILE_NAME}.o