diff options
| author | Tom Rini <[email protected]> | 2026-06-08 15:28:18 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2026-06-08 15:28:18 -0600 |
| commit | e91911169bc737ee4a79963a1cba8db2aab7c1c0 (patch) | |
| tree | 77bdc64834398b00a211c1ceedfb87e39a1631b0 /include | |
| parent | 5d4d6e331d3f056ecc7ab11b72098a3cf4fdb099 (diff) | |
| parent | 1296a428c67cf103eca482d4a63349661c1b799f (diff) | |
Merge tag 'v2026.07-rc4' into next
Prepare v2026.07-rc4
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/geist.h | 18 | ||||
| -rw-r--r-- | include/configs/stm32mp15_st_common.h | 15 |
2 files changed, 33 insertions, 0 deletions
diff --git a/include/configs/geist.h b/include/configs/geist.h new file mode 100644 index 00000000000..3f7e2e913ed --- /dev/null +++ b/include/configs/geist.h @@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * This file is Geist board configuration. + * + * Copyright (C) 2025-2026 Renesas Electronics Corporation + */ + +#ifndef __GEIST_H +#define __GEIST_H + +#include "rcar-gen3-common.h" + +/* Environment in eMMC, at the end of 2nd "boot sector" */ + +#define CFG_SYS_FLASH_BANKS_LIST { 0x08000000 } +#define CFG_SYS_WRITE_SWAPPED_DATA + +#endif /* __GEIST_H */ diff --git a/include/configs/stm32mp15_st_common.h b/include/configs/stm32mp15_st_common.h index 60838cb0e3f..7727e583fc7 100644 --- a/include/configs/stm32mp15_st_common.h +++ b/include/configs/stm32mp15_st_common.h @@ -8,7 +8,22 @@ #ifndef __CONFIG_STM32MP15_ST_COMMON_H__ #define __CONFIG_STM32MP15_ST_COMMON_H__ +#ifdef CONFIG_FWU_MULTI_BANK_UPDATE +#define SCAN_DEV_FOR_BOOT_PARTS \ + "setenv devplist; " \ + "env exists boot_partuuid && " \ + "part number ${devtype} ${devnum} ${boot_partuuid} devplist; " \ + "env exists devplist || " \ + "part list ${devtype} ${devnum} -bootable devplist; " + +#define ST_STM32MP15_FWU_ENV \ + "altbootcmd=${bootcmd}\0" +#else +#define ST_STM32MP15_FWU_ENV +#endif + #define STM32MP_BOARD_EXTRA_ENV \ + ST_STM32MP15_FWU_ENV \ "usb_pgood_delay=2000\0" \ "console=ttySTM0\0" \ "splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ |