Merge tag 'mips-pull-2020-06-29' of https://gitlab.denx.de/u-boot/custodians/u-boot...

[platform/kernel/u-boot.git] / include / configs / am65x_evm.h

diff --git a/include/configs/am65x_evm.h b/include/configs/am65x_evm.h
index 1415bb1..19d861d 100644 (file)
--- a/include/configs/am65x_evm.h
+++ b/include/configs/am65x_evm.h
@@ -12,8 +12,8 @@
 #include <linux/sizes.h>
 #include <config_distro_bootcmd.h>
 #include <environment/ti/mmc.h>
-
-#define CONFIG_ENV_SIZE                        (128 << 10)
+#include <environment/ti/k3_rproc.h>
+#include <environment/ti/k3_dfu.h>
 
 /* DDR Configuration */
 #define CONFIG_SYS_SDRAM_BASE1         0x880000000
@@ -66,14 +66,15 @@
 #define EXTRA_ENV_AM65X_BOARD_SETTINGS                                 \
        "findfdt="                                                      \
                "setenv name_fdt k3-am654-base-board.dtb;"              \
-               "setenv fdtfile ${name_fdt};"                           \
-               "setenv overlay_files ${name_overlays}\0"               \
+               "setenv fdtfile ${name_fdt}\0"                          \
        "loadaddr=0x80080000\0"                                         \
        "fdtaddr=0x82000000\0"                                          \
        "overlayaddr=0x83000000\0"                                      \
        "name_kern=Image\0"                                             \
        "console=ttyS2,115200n8\0"                                      \
-       "args_all=setenv optargs earlycon=ns16550a,mmio32,0x02800000\0" \
+       "stdin=serial,usbkbd\0"                                         \
+       "args_all=setenv optargs earlycon=ns16550a,mmio32,0x02800000 "  \
+               "${mtdparts}\0"                                         \
        "run_kern=booti ${loadaddr} ${rd_spec} ${fdtaddr}\0"            \
 
 /* U-Boot MMC-specific configuration */
@@ -88,33 +89,63 @@
        "get_overlay_mmc="                                              \
                "fdt address ${fdtaddr};"                               \
                "fdt resize 0x100000;"                                  \
-               "for overlay in $overlay_files;"                        \
+               "for overlay in $name_overlays;"                        \
                "do;"                                                   \
                "load mmc ${bootpart} ${overlayaddr} ${bootdir}/${overlay};"    \
                "fdt apply ${overlayaddr};"                             \
                "done;\0"                                               \
        "get_kern_mmc=load mmc ${bootpart} ${loadaddr} "                \
                "${bootdir}/${name_kern}\0"                             \
+       "get_fit_mmc=load mmc ${bootpart} ${addr_fit} "                 \
+               "${bootdir}/${name_fit}\0"                              \
        "partitions=" PARTS_DEFAULT
 
+#ifdef DEFAULT_RPROCS
+#undef DEFAULT_RPROCS
+#endif
+#define DEFAULT_RPROCS ""                                              \
+               "0 /lib/firmware/am65x-mcu-r5f0_0-fw "                  \
+               "1 /lib/firmware/am65x-mcu-r5f0_1-fw "
+
+#ifdef CONFIG_TARGET_AM654_A53_EVM
+#define EXTRA_ENV_AM65X_BOARD_SETTINGS_MTD                             \
+       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0"                            \
+       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0"
+#else
+#define EXTRA_ENV_AM65X_BOARD_SETTINGS_MTD
+#endif
+
+#define EXTRA_ENV_AM65X_BOARD_SETTINGS_UBI                             \
+       "init_ubi=run args_all args_ubi; sf probe; "                    \
+               "ubi part ospi.rootfs; ubifsmount ubi:rootfs;\0"        \
+       "get_kern_ubi=ubifsload ${loadaddr} ${bootdir}/${name_kern}\0"  \
+       "get_fdt_ubi=ubifsload ${fdtaddr} ${bootdir}/${name_fdt}\0"     \
+       "args_ubi=setenv bootargs console=${console} ${optargs} "       \
+               "rootfstype=ubifs root=ubi0:rootfs rw ubi.mtd=ospi.rootfs\0"
+
+#define EXTRA_ENV_DFUARGS                                              \
+       "dfu_bufsiz=0x20000\0"                                          \
+       DFU_ALT_INFO_MMC                                                \
+       DFU_ALT_INFO_EMMC                                               \
+       DFU_ALT_INFO_OSPI
+
 /* Incorporate settings into the U-Boot environment */
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
        DEFAULT_MMC_TI_ARGS                                             \
+       DEFAULT_FIT_TI_ARGS                                             \
        EXTRA_ENV_AM65X_BOARD_SETTINGS                                  \
-       EXTRA_ENV_AM65X_BOARD_SETTINGS_MMC
+       EXTRA_ENV_AM65X_BOARD_SETTINGS_MMC                              \
+       EXTRA_ENV_AM65X_BOARD_SETTINGS_MTD                              \
+       EXTRA_ENV_AM65X_BOARD_SETTINGS_UBI                              \
+       EXTRA_ENV_RPROC_SETTINGS                                        \
+       EXTRA_ENV_DFUARGS
 
 /* MMC ENV related defines */
 #ifdef CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV         0
 #define CONFIG_SYS_MMC_ENV_PART        1
-#define CONFIG_ENV_SIZE                (128 << 10)
-#define CONFIG_ENV_OFFSET              0x680000
-#define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
-#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
 #endif
 
-#define CONFIG_SUPPORT_EMMC_BOOT
-
 /* Now for the remaining common defines */
 #include <configs/ti_armv7_common.h>