From 417409e573044c185b58106f0154ebc0912e1cc7 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Fri, 1 Nov 2024 10:17:55 +0100 Subject: common: binman: Calling initr_binman() when BINMAN_FDT Calling empty function when BINMAN_FDT is adding +64B for nothing which is not helping on size sensitive configurations as Xilinx mini configurations. Signed-off-by: Michal Simek Link: https://lore.kernel.org/r/f79dc1fbf796dd5ad290f6080608ee68d7652cfc.1730452668.git.michal.simek@amd.com --- common/board_r.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'common/board_r.c') diff --git a/common/board_r.c b/common/board_r.c index 62228a723e1..ff9bce88dc9 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -287,13 +287,10 @@ static int initr_announce(void) return 0; } -static int initr_binman(void) +static int __maybe_unused initr_binman(void) { int ret; - if (!CONFIG_IS_ENABLED(BINMAN_FDT)) - return 0; - ret = binman_init(); if (ret) printf("binman_init failed:%d\n", ret); @@ -635,7 +632,9 @@ static init_fnc_t init_sequence_r[] = { #ifdef CONFIG_EFI_LOADER efi_memory_init, #endif +#ifdef CONFIG_BINMAN_FDT initr_binman, +#endif #ifdef CONFIG_FSP_VERSION2 arch_fsp_init_r, #endif -- cgit v1.2.3 From 623f5cf517ae0e0f6f7132ac6411ea0a8dd9b3f7 Mon Sep 17 00:00:00 2001 From: Evgeny Bachinin Date: Wed, 11 Dec 2024 01:39:57 +0300 Subject: fdtdec: encapsulate dtb_dt_embedded() within Patch keeps the access to dtb_dt_embedded() within fdtdec API, by means of new API function introduction. This new function is a common place for updating appropriate global_data fields for OF_EMBED case. Also, the consequence of the patch is movement of '___dtb_dt_*begin' symbols' declaration from header file, because nobody used symbols outside the lib/fdtdec.c. Signed-off-by: Evgeny Bachinin Suggested-by: Simon Glass Reviewed-by: Simon Glass --- common/board_r.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'common/board_r.c') diff --git a/common/board_r.c b/common/board_r.c index 88dc756b2a5..3c6a4c1f5df 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -155,11 +155,11 @@ static int initr_reloc_global_data(void) /* * For CONFIG_OF_EMBED case the FDT is embedded into ELF, available by - * __dtb_dt_begin. After U-boot ELF self-relocation to RAM top address + * __dtb_dt_begin. After U-Boot ELF self-relocation to RAM top address * it is worth to update fdt_blob in global_data */ if (IS_ENABLED(CONFIG_OF_EMBED)) - gd->fdt_blob = dtb_dt_embedded(); + fdtdec_setup_embed(); #ifdef CONFIG_EFI_LOADER /* -- cgit v1.2.3