Merge "ipq5332: TINY NOR: add compressed_art fixup"

This commit is contained in:
Linux Build Service Account 2023-09-22 04:10:57 -07:00 committed by Gerrit - the friendly Code Review server
commit 5f169ad23b
3 changed files with 20 additions and 7 deletions

View file

@ -876,11 +876,6 @@ __weak void fdt_fixup_for_atf(void *blob)
return;
}
__weak void fdt_fixup_art_format(void *blob)
{
return;
}
#ifdef CONFIG_IPQ_BT_SUPPORT
__weak void fdt_fixup_bt_running(void *blob)
{
@ -963,6 +958,11 @@ __weak void fdt_fixup_auto_restart(void *blob)
}
#endif
__weak void fdt_fixup_art_format(void *blob)
{
return;
}
__weak void ipq_fdt_fixup_socinfo(void *blob)
{
uint32_t cpu_type;
@ -1196,13 +1196,13 @@ int ft_board_setup(void *blob, bd_t *bd)
fdt_fixup_bt_running(blob);
#endif
fdt_fixup_sdx65_gpio(blob);
#endif
/*
|| This features fixup compressed_art in
|| dts if its 16M profile build.
*/
fdt_fixup_art_format(blob);
#endif
#ifdef CONFIG_QCA_MMC
board_mmc_deinit();

View file

@ -2055,6 +2055,7 @@ void fdt_fixup_bt_debug(void *blob)
parse_fdt_fixup("/soc/serial@78b0000/%status%?ok", blob);
parse_fdt_fixup("/soc/usb3@8A00000/%delete%device-power-gpio", blob);
}
#endif
#ifdef CONFIG_IPQ_TINY
void fdt_fixup_art_format(void *blob)
@ -2065,7 +2066,6 @@ void fdt_fixup_art_format(void *blob)
}
#endif
#endif
#ifndef CONFIG_CMD_DISABLE_EXECTZT
void run_tzt(void *address)

View file

@ -131,6 +131,19 @@ void fdt_fixup_flash(void *blob)
}
#endif
#ifdef CONFIG_IPQ_TINY_SPI_NOR
void fdt_fixup_art_format(void *blob)
{
int nodeoffset;
int ret;
nodeoffset = fdt_path_offset(blob, "/");
ret = fdt_setprop(blob, nodeoffset, "compressed_art", NULL, 0);
if (ret != 0)
printf("fdt-fixup: unable to set property 'compressed_art'\n");
}
#endif
void qca_serial_init(struct ipq_serial_platdata *plat)
{
int ret;