jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9496 from heitbaum/atf

Browse Source 
atf: update to 2.12
This commit is contained in:
CvH 2024-11-21 19:10:23 +01:00 committed by GitHub
commit 09e4ebd18b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 27 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/tools/atf/package.mk
View File

@ -2,8 +2,8 @@
# Copyright (C) 2018-present Team LibreELEC
PKG_NAME="atf"
PKG_VERSION="2.11.0"
PKG_SHA256="8c0412be8ceca9d3838daa4b6e7bee7d5a6d591aa05170a3fba2cbc415e2f7fc"
PKG_VERSION="2.12.0"
PKG_SHA256="d95aaf292792c98035910d7e6c64ebfb297c897fef510415db1612f6d39f9223"
PKG_ARCH="arm aarch64"
PKG_LICENSE="BSD-3c"
PKG_SITE="https://github.com/ARM-software/arm-trusted-firmware"
@ -25,7 +25,8 @@ make_target() {
if [ "${ATF_PLATFORM}" = "imx8mq" ]; then
CROSS_COMPILE="${TARGET_KERNEL_PREFIX}" LDFLAGS="" CFLAGS="" make PLAT=${ATF_PLATFORM} LOG_LEVEL=0 bl31
else
CROSS_COMPILE="${TARGET_KERNEL_PREFIX}" LDFLAGS="" CFLAGS="" make PLAT=${ATF_PLATFORM} bl31
# as of atf 2.12.0 - sun50i_a64 builds use LTO, include -ffat-lto-objects to support this
CROSS_COMPILE="${TARGET_KERNEL_PREFIX}" LDFLAGS="" CFLAGS="-ffat-lto-objects" make PLAT=${ATF_PLATFORM} bl31
fi
}

23
projects/NXP/devices/iMX8/patches/atf/fix.patch Normal file
View File

@ -0,0 +1,23 @@
diff -Nur a/plat/imx/common/include/imx_sip_svc.h b/plat/imx/common/include/imx_sip_svc.h
--- a/plat/imx/common/include/imx_sip_svc.h 2024-11-12 15:39:40.000000000 +0000
+++ b/plat/imx/common/include/imx_sip_svc.h 2024-11-14 14:54:18.965199761 +0000
@@ -88,7 +88,7 @@
u_register_t x2, u_register_t x3, void *handle);
#endif
-#if defined(PLAT_imx8mm) || defined(PLAT_imx8mn) || defined(PLAT_imx8mp)
+#if defined(PLAT_imx8mm) || defined(PLAT_imx8mn) || defined(PLAT_imx8mp) || defined(PLAT_imx8mq)
int imx_hab_handler(uint32_t smc_fid, u_register_t x1,
u_register_t x2, u_register_t x3, u_register_t x4);
#endif
diff -Nur a/plat/imx/imx8m/imx8mq/platform.mk b/plat/imx/imx8m/imx8mq/platform.mk
--- a/plat/imx/imx8m/imx8mq/platform.mk 2024-11-12 15:39:40.000000000 +0000
+++ b/plat/imx/imx8m/imx8mq/platform.mk 2024-11-14 15:10:06.955672418 +0000
@@ -29,6 +29,7 @@
plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c \
plat/imx/imx8m/imx8mq/imx8mq_psci.c \
plat/imx/imx8m/gpc_common.c \
+ plat/imx/imx8m/imx_hab.c \
plat/imx/imx8m/imx_aipstz.c \
plat/imx/imx8m/imx8m_caam.c \
plat/imx/imx8m/imx8m_ccm.c \

124
projects/NXP/devices/iMX8/patches/atf/imx8mq-remove-ram-retention.patch
View File

@ -1,124 +0,0 @@
diff --git a/plat/imx/imx8m/ddr/dram.c b/plat/imx/imx8m/ddr/dram.c
index b5f697334e91..6adbdbf92eff 100644
--- a/plat/imx/imx8m/ddr/dram.c
+++ b/plat/imx/imx8m/ddr/dram.c
@@ -21,11 +21,6 @@ struct dram_info dram_info;
/* lock used for DDR DVFS */
spinlock_t dfs_lock;
-#if defined(PLAT_imx8mq)
-/* ocram used to dram timing */
-static uint8_t dram_timing_saved[13 * 1024] __aligned(8);
-#endif
-
static volatile uint32_t wfe_done;
static volatile bool wait_ddrc_hwffc_done = true;
static unsigned int dev_fsp = 0x1;
@@ -36,31 +31,6 @@ static uint32_t fsp_init_reg[3][4] = {
{ DDRC_FREQ2_INIT3(0), DDRC_FREQ2_INIT4(0), DDRC_FREQ2_INIT6(0), DDRC_FREQ2_INIT7(0) },
};
-#if defined(PLAT_imx8mq)
-static inline struct dram_cfg_param *get_cfg_ptr(void *ptr,
- void *old_base, void *new_base)
-{
- uintptr_t offset = (uintptr_t)ptr & ~((uintptr_t)old_base);
-
- return (struct dram_cfg_param *)(offset + new_base);
-}
-
-/* copy the dram timing info from DRAM to OCRAM */
-void imx8mq_dram_timing_copy(struct dram_timing_info *from)
-{
- struct dram_timing_info *info = (struct dram_timing_info *)dram_timing_saved;
-
- /* copy the whole 13KB content used for dram timing info */
- memcpy(dram_timing_saved, from, sizeof(dram_timing_saved));
-
- /* correct the header after copied into ocram */
- info->ddrc_cfg = get_cfg_ptr(info->ddrc_cfg, from, dram_timing_saved);
- info->ddrphy_cfg = get_cfg_ptr(info->ddrphy_cfg, from, dram_timing_saved);
- info->ddrphy_trained_csr = get_cfg_ptr(info->ddrphy_trained_csr, from, dram_timing_saved);
- info->ddrphy_pie = get_cfg_ptr(info->ddrphy_pie, from, dram_timing_saved);
-}
-#endif
-
#if defined(PLAT_imx8mp)
static uint32_t lpddr4_mr_read(unsigned int mr_rank, unsigned int mr_addr)
{
@@ -231,10 +201,6 @@ void dram_info_init(unsigned long dram_timing_base)
dram_info.boot_fsp = current_fsp;
dram_info.current_fsp = current_fsp;
-#if defined(PLAT_imx8mq)
- imx8mq_dram_timing_copy((struct dram_timing_info *)dram_timing_base);
- dram_timing_base = (unsigned long) dram_timing_saved;
-#endif
get_mr_values(dram_info.mr_table);
dram_info.timing_info = (struct dram_timing_info *)dram_timing_base;
diff --git a/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c b/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c
index 7065a658614f..3c66baa291d6 100644
--- a/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c
+++ b/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c
@@ -21,7 +21,6 @@
#include <lib/xlat_tables/xlat_tables_v2.h>
#include <plat/common/platform.h>
-#include <dram.h>
#include <gpc.h>
#include <imx_aipstz.h>
#include <imx_uart.h>
@@ -49,8 +48,6 @@ static const mmap_region_t imx_mmap[] = {
MAP_REGION_FLAT(IMX_ROM_BASE, IMX_ROM_SIZE, MT_MEMORY | MT_RO), /* ROM map */
MAP_REGION_FLAT(IMX_AIPS_BASE, IMX_AIPS_SIZE, MT_DEVICE | MT_RW), /* AIPS map */
MAP_REGION_FLAT(IMX_GIC_BASE, IMX_GIC_SIZE, MT_DEVICE | MT_RW), /* GIC map */
- MAP_REGION_FLAT(IMX_DDRPHY_BASE, IMX_DDR_IPS_SIZE, MT_DEVICE | MT_RW), /* DDRMIX map */
- MAP_REGION_FLAT(IMX_DRAM_BASE, IMX_DRAM_SIZE, MT_MEMORY | MT_RW | MT_NS),
{0},
};
@@ -229,8 +226,6 @@ void bl31_platform_setup(void)
/* gpc init */
imx_gpc_init();
-
- dram_info_init(SAVED_DRAM_TIMING_BASE);
}
entry_point_info_t *bl31_plat_get_next_image_ep_info(unsigned int type)
diff --git a/plat/imx/imx8m/imx8mq/imx8mq_psci.c b/plat/imx/imx8m/imx8mq/imx8mq_psci.c
index 3375ce71bc95..e5c54261a5f9 100644
--- a/plat/imx/imx8m/imx8mq/imx8mq_psci.c
+++ b/plat/imx/imx8m/imx8mq/imx8mq_psci.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018-2023, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2018, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -13,7 +13,6 @@
#include <lib/mmio.h>
#include <lib/psci/psci.h>
-#include <dram.h>
#include <gpc.h>
#include <imx8m_psci.h>
#include <plat_imx8.h>
@@ -80,7 +79,6 @@ void imx_domain_suspend(const psci_power_state_t *target_state)
if (is_local_state_retn(SYSTEM_PWR_STATE(target_state))) {
imx_set_sys_lpm(core_id, true);
- dram_enter_retention();
imx_anamix_override(true);
}
}
@@ -93,7 +91,6 @@ void imx_domain_suspend_finish(const psci_power_state_t *target_state)
/* check the system level status */
if (is_local_state_retn(SYSTEM_PWR_STATE(target_state))) {
imx_anamix_override(false);
- dram_exit_retention();
imx_set_sys_lpm(core_id, false);
imx_clear_rbc_count();
}