summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/configs/P2041RDB.h2
-rw-r--r--include/configs/apple.h18
-rw-r--r--include/configs/lx2160a_common.h4
-rw-r--r--include/configs/rcar-gen5-common.h7
-rw-r--r--include/configs/stm32mp13_common.h13
-rw-r--r--include/configs/stm32mp25_st_common.h15
-rw-r--r--include/dt-bindings/clock/r8a78000-clock-scmi.h2
-rw-r--r--include/dt-bindings/reset/r8a78000-reset-scmi.h38
-rw-r--r--include/fwu.h11
-rw-r--r--include/part_efi.h3
10 files changed, 69 insertions, 44 deletions
diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index f88fb9cdb9a..3525e29acc4 100644
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -149,6 +149,8 @@
* shorted - index 1
*/
+#define CFG_SYS_NS16550_CLK (get_bus_freq(0) / 2)
+
#define CFG_SYS_BAUDRATE_TABLE \
{300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200}
diff --git a/include/configs/apple.h b/include/configs/apple.h
deleted file mode 100644
index 1e08b114480..00000000000
--- a/include/configs/apple.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-#include <linux/sizes.h>
-
-/* Environment */
-#define ENV_DEVICE_SETTINGS \
- "stdin=serial,usbkbd,spikbd\0" \
- "stdout=vidconsole,serial\0" \
- "stderr=vidconsole,serial\0"
-
-#define BOOT_TARGETS "nvme usb"
-
-#define CFG_EXTRA_ENV_SETTINGS \
- ENV_DEVICE_SETTINGS \
- "boot_targets=" BOOT_TARGETS "\0"
-
-#endif
diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h
index 45b5cbdd85a..dc0d24dca0a 100644
--- a/include/configs/lx2160a_common.h
+++ b/include/configs/lx2160a_common.h
@@ -197,10 +197,10 @@
#define BOOT_TARGET_DEVICES_USB(func)
#endif
-#ifdef CONFIG_MMC
+#ifdef CONFIG_CMD_MMC
#define BOOT_TARGET_DEVICES_MMC(func, instance) func(MMC, mmc, instance)
#else
-#define BOOT_TARGET_DEVICES_MMC(func)
+#define BOOT_TARGET_DEVICES_MMC(func, instance)
#endif
#ifdef CONFIG_SCSI
diff --git a/include/configs/rcar-gen5-common.h b/include/configs/rcar-gen5-common.h
index 81b5e2aa5bb..5ff2a76fc05 100644
--- a/include/configs/rcar-gen5-common.h
+++ b/include/configs/rcar-gen5-common.h
@@ -10,10 +10,15 @@
/* Console */
#define CFG_SYS_BAUDRATE_TABLE { 38400, 115200, 921600, 1843200, 3250000 }
+#define CFG_HSCIF
/* Memory */
-#define DRAM_RSV_SIZE 0x08000000
+#define DRAM_RSV_SIZE 0x20600000
+#ifdef CONFIG_RCAR_64_RSIP
+#define CFG_SYS_SDRAM_BASE 0xb8400000
+#else
#define CFG_SYS_SDRAM_BASE (0x40000000 + DRAM_RSV_SIZE)
+#endif
#define CFG_SYS_SDRAM_SIZE (0x80000000u - DRAM_RSV_SIZE)
#define CFG_MAX_MEM_MAPPED (0x80000000u - DRAM_RSV_SIZE)
diff --git a/include/configs/stm32mp13_common.h b/include/configs/stm32mp13_common.h
index 3e3f49abae0..e707b146f90 100644
--- a/include/configs/stm32mp13_common.h
+++ b/include/configs/stm32mp13_common.h
@@ -33,6 +33,12 @@
#define BOOT_TARGET_MMC1(func)
#endif
+#ifdef CONFIG_CMD_UBIFS
+#define BOOT_TARGET_UBIFS(func) func(UBIFS, ubifs, 0, UBI, boot)
+#else
+#define BOOT_TARGET_UBIFS(func)
+#endif
+
#ifdef CONFIG_CMD_USB
#define BOOT_TARGET_USB(func) func(USB, usb, 0)
#else
@@ -41,12 +47,14 @@
#define BOOT_TARGET_DEVICES(func) \
BOOT_TARGET_MMC1(func) \
+ BOOT_TARGET_UBIFS(func) \
BOOT_TARGET_MMC0(func) \
BOOT_TARGET_USB(func)
/*
* default bootcmd for stm32mp13:
* for serial/usb: execute the stm32prog command
+ * for nand or spi-nand boot, distro boot with ubifs on UBI partition
* for mmc boot (eMMC, SD card), distro boot on the same mmc device
*/
#define STM32MP_BOOTCMD "bootcmd_stm32mp=" \
@@ -56,7 +64,10 @@
"else " \
"run env_check;" \
"if test ${boot_device} = mmc;" \
- "then env set boot_targets \"mmc${boot_instance}\"; fi;" \
+ "then env set boot_targets \"mmc${boot_instance}\"; fi; " \
+ "if test ${boot_device} = nand ||" \
+ " test ${boot_device} = spi-nand ;" \
+ "then env set boot_targets ubifs0; fi;" \
"run distro_bootcmd;" \
"fi;\0"
diff --git a/include/configs/stm32mp25_st_common.h b/include/configs/stm32mp25_st_common.h
index cb679eb1be2..0b0267ae99b 100644
--- a/include/configs/stm32mp25_st_common.h
+++ b/include/configs/stm32mp25_st_common.h
@@ -8,7 +8,22 @@
#ifndef __CONFIG_STM32MP25_ST_COMMON_H__
#define __CONFIG_STM32MP25_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_STM32MP25_FWU_ENV \
+ "altbootcmd=${bootcmd}\0"
+#else
+#define ST_STM32MP25_FWU_ENV
+#endif
+
#define STM32MP_BOARD_EXTRA_ENV \
+ ST_STM32MP25_FWU_ENV \
"usb_pgood_delay=2000\0" \
"console=ttySTM0\0"
diff --git a/include/dt-bindings/clock/r8a78000-clock-scmi.h b/include/dt-bindings/clock/r8a78000-clock-scmi.h
index 455402ee8cc..663effddeb4 100644
--- a/include/dt-bindings/clock/r8a78000-clock-scmi.h
+++ b/include/dt-bindings/clock/r8a78000-clock-scmi.h
@@ -43,4 +43,6 @@
#define SCP_CLOCK_ID_MDLC_MPPHY31 347
#define SCP_CLOCK_ID_MDLC_MPPHY02 348
+#define SCP_CLOCK_ID_CLK_S0D6_PERE_MAIN 1691
+
#endif /* __DT_BINDINGS_R8A78000_SCMI_CLOCK_H__ */
diff --git a/include/dt-bindings/reset/r8a78000-reset-scmi.h b/include/dt-bindings/reset/r8a78000-reset-scmi.h
index e0d10caa589..3d84bfb073a 100644
--- a/include/dt-bindings/reset/r8a78000-reset-scmi.h
+++ b/include/dt-bindings/reset/r8a78000-reset-scmi.h
@@ -1,33 +1,27 @@
/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */
/*
- * Copyright (C) 2025 Renesas Electronics Corp.
- *
- * IDs match SCP 4.27
+ * Copyright (C) 2025-2026 Renesas Electronics Corp.
*/
#ifndef __DT_BINDINGS_R8A78000_SCMI_RESET_H__
#define __DT_BINDINGS_R8A78000_SCMI_RESET_H__
-/*
- * These definition indices match the Reset ID defined by SCP FW 4.27.
- */
-
-#define SCP_RESET_DOMAIN_ID_UFS0 202
-#define SCP_RESET_DOMAIN_ID_UFS1 203
+#define SCP_RESET_DOMAIN_ID_UFS0 0x60
+#define SCP_RESET_DOMAIN_ID_UFS1 0x61
-#define SCP_RESET_DOMAIN_ID_XPCS0 316
-#define SCP_RESET_DOMAIN_ID_XPCS1 317
-#define SCP_RESET_DOMAIN_ID_XPCS2 318
-#define SCP_RESET_DOMAIN_ID_XPCS3 319
-#define SCP_RESET_DOMAIN_ID_XPCS4 320
-#define SCP_RESET_DOMAIN_ID_XPCS5 321
-#define SCP_RESET_DOMAIN_ID_XPCS6 322
-#define SCP_RESET_DOMAIN_ID_XPCS7 323
+#define SCP_RESET_DOMAIN_ID_XPCS0 0x30
+#define SCP_RESET_DOMAIN_ID_XPCS1 0x31
+#define SCP_RESET_DOMAIN_ID_XPCS2 0x32
+#define SCP_RESET_DOMAIN_ID_XPCS3 0x33
+#define SCP_RESET_DOMAIN_ID_XPCS4 0x34
+#define SCP_RESET_DOMAIN_ID_XPCS5 0x35
+#define SCP_RESET_DOMAIN_ID_XPCS6 0x36
+#define SCP_RESET_DOMAIN_ID_XPCS7 0x37
-#define SCP_RESET_DOMAIN_ID_MPPHY01 344
-#define SCP_RESET_DOMAIN_ID_MPPHY11 345
-#define SCP_RESET_DOMAIN_ID_MPPHY21 346
-#define SCP_RESET_DOMAIN_ID_MPPHY31 347
-#define SCP_RESET_DOMAIN_ID_MPPHY02 348
+#define SCP_RESET_DOMAIN_ID_MPPHY01 0x64
+#define SCP_RESET_DOMAIN_ID_MPPHY11 0x65
+#define SCP_RESET_DOMAIN_ID_MPPHY21 0x66
+#define SCP_RESET_DOMAIN_ID_MPPHY31 0x67
+#define SCP_RESET_DOMAIN_ID_MPPHY02 0x68
#endif /* __DT_BINDINGS_R8A78000_SCMI_RESET_H__ */
diff --git a/include/fwu.h b/include/fwu.h
index 9cee8fb085c..68a51fb4296 100644
--- a/include/fwu.h
+++ b/include/fwu.h
@@ -397,6 +397,17 @@ void fwu_populate_mdata_image_info(struct fwu_data *data);
int fwu_get_mdata_size(uint32_t *mdata_size);
/**
+ * fwu_mdata_get_image_guid() - Get image GUID for a type and bank
+ * @image_guid: Pointer to be filled with the found image GUID
+ * @image_type_guid: Pointer to the image type GUID to search for
+ * @bank_index: Index of the bank
+ *
+ * Return: 0 if OK, -ve on error
+ */
+int fwu_mdata_get_image_guid(efi_guid_t *image_guid,
+ const efi_guid_t *image_type_guid, u32 bank_index);
+
+/**
* fwu_state_machine_updates() - Update FWU state of the platform
* @state: FWU bank state
* @update_index: Bank number to which images have been updated
diff --git a/include/part_efi.h b/include/part_efi.h
index 2cea5088046..5713b3018f4 100644
--- a/include/part_efi.h
+++ b/include/part_efi.h
@@ -60,6 +60,9 @@
#define PARTITION_U_BOOT_ENVIRONMENT \
EFI_GUID( 0x3de21764, 0x95bd, 0x54bd, \
0xa5, 0xc3, 0x4a, 0xbe, 0x78, 0x6f, 0x38, 0xa8)
+#define PARTITION_XBOOTLDR \
+ EFI_GUID( 0xbc13c2ff, 0x59e6, 0x4262, \
+ 0xa3, 0x52, 0xb2, 0x75, 0xfd, 0x6f, 0x71, 0x72)
/* Special ChromiumOS things */
#define PARTITION_CROS_KERNEL \
generated by cgit v1.3.1 (git 2.54.0) at 2026-07-12 04:45:07 +0000