summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2025-09-05 10:48:05 -0600
committerTom Rini <[email protected]>2025-09-05 10:48:05 -0600
commit1116d915965604c691a9117971cbd8a731615483 (patch)
tree6015b93c2cdcddf4e8c2427332242e33dd205354 /include
parente31947724f69faaa6b0ccd2539052781358b0572 (diff)
parent28d6f787b0deb3f66118857297a855233eba18d1 (diff)
Merge tag 'u-boot-imx-next-20250905a' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx into next
CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/27573 - Several improvements for kontron-sl-mx6ul. - Add Phytec imx8mp-libra-fpsc board - Add redundant environment support for imx8m evk boards. - Several improvements for phycore-imx93.
Diffstat (limited to 'include')
-rw-r--r--include/configs/imx8mp-libra-fpsc.h27
-rw-r--r--include/configs/kontron-sl-mx6ul.h12
2 files changed, 27 insertions, 12 deletions
diff --git a/include/configs/imx8mp-libra-fpsc.h b/include/configs/imx8mp-libra-fpsc.h
new file mode 100644
index 00000000000..cde91dc3642
--- /dev/null
+++ b/include/configs/imx8mp-libra-fpsc.h
@@ -0,0 +1,27 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * Copyright (C) 2025 PHYTEC Messtechnik GmbH
+ */
+
+#ifndef __IMX8MP_LIBRA_FPSC_H
+#define __IMX8MP_LIBRA_FPSC_H
+
+#include <linux/sizes.h>
+#include <asm/arch/imx-regs.h>
+
+#define CFG_SYS_UBOOT_BASE \
+ (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
+
+/* Link Definitions */
+
+#define CFG_SYS_INIT_RAM_ADDR 0x40000000
+#define CFG_SYS_INIT_RAM_SIZE SZ_512K
+
+#define CFG_SYS_SDRAM_BASE 0x40000000
+
+#define PHYS_SDRAM 0x40000000
+#define PHYS_SDRAM_SIZE (SZ_2G + SZ_1G) /* 3GB */
+#define PHYS_SDRAM_2 0x100000000
+#define PHYS_SDRAM_2_SIZE (SZ_4G + SZ_1G) /* 5GB */
+
+#endif /* __IMX8MP_LIBRA_FPSC_H */
diff --git a/include/configs/kontron-sl-mx6ul.h b/include/configs/kontron-sl-mx6ul.h
index 015df01db4e..e2152eb05ed 100644
--- a/include/configs/kontron-sl-mx6ul.h
+++ b/include/configs/kontron-sl-mx6ul.h
@@ -24,22 +24,10 @@
/* Board and environment settings */
#define CFG_MXC_UART_BASE UART4_BASE
-/* Boot order for distro boot */
-#define BOOT_TARGET_DEVICES(func) \
- func(MMC, mmc, 1) \
- func(MMC, mmc, 0) \
- func(UBIFS, ubifs, 0, UBI, boot) \
- func(USB, usb, 0) \
- func(PXE, pxe, na) \
- func(DHCP, dhcp, na)
-#include <config_distro_bootcmd.h>
-
/* MMC Configs */
#ifdef CONFIG_FSL_USDHC
#define CFG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR
#define CFG_SYS_FSL_USDHC_NUM 2
#endif
-#define CFG_EXTRA_ENV_SETTINGS BOOTENV
-
#endif /* __KONTRON_MX6UL_CONFIG_H */