Complete migration of MTDPARTS_DEFAULT / MTDIDS_DEFAULT, include in environment
[platform/kernel/u-boot.git] / include / configs / am65x_evm.h
index 7d7f86a..d8f18d0 100644 (file)
@@ -10,7 +10,6 @@
 #define __CONFIG_AM654_EVM_H
 
 #include <linux/sizes.h>
-#include <config_distro_bootcmd.h>
 #include <environment/ti/mmc.h>
 #include <environment/ti/k3_rproc.h>
 #include <environment/ti/k3_dfu.h>
 /* DDR Configuration */
 #define CONFIG_SYS_SDRAM_BASE1         0x880000000
 
-/* SPL Loader Configuration */
-#ifdef CONFIG_TARGET_AM654_A53_EVM
-#define CONFIG_SYS_INIT_SP_ADDR         (CONFIG_SPL_TEXT_BASE +        \
-                                        CONFIG_SYS_K3_NON_SECURE_MSRAM_SIZE)
-#else
-/*
- * Maximum size in memory allocated to the SPL BSS. Keep it as tight as
- * possible (to allow the build to go through), as this directly affects
- * our memory footprint. The less we use for BSS the more we have available
- * for everything else.
- */
-#define CONFIG_SPL_BSS_MAX_SIZE                0x5000
-/*
- * Link BSS to be within SPL in a dedicated region located near the top of
- * the MCU SRAM, this way making it available also before relocation. Note
- * that we are not using the actual top of the MCU SRAM as there is a memory
- * location filled in by the boot ROM that we want to read out without any
- * interference from the C context.
- */
-#define CONFIG_SPL_BSS_START_ADDR      (CONFIG_SYS_K3_BOOT_PARAM_TABLE_INDEX -\
-                                        CONFIG_SPL_BSS_MAX_SIZE)
-/* Set the stack right below the SPL BSS section */
-#define CONFIG_SYS_INIT_SP_ADDR         CONFIG_SPL_BSS_START_ADDR
-/* Configure R5 SPL post-relocation malloc pool in DDR */
-#define CONFIG_SYS_SPL_MALLOC_START    0x84000000
-#define CONFIG_SYS_SPL_MALLOC_SIZE     SZ_16M
-#endif
-
-#ifdef CONFIG_SYS_K3_SPL_ATF
-#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME        "tispl.bin"
-#endif
-
-#ifndef CONFIG_CPU_V7R
-#define CONFIG_SKIP_LOWLEVEL_INIT
-#endif
-
-#define CONFIG_SPL_MAX_SIZE            CONFIG_SYS_K3_MAX_DOWNLODABLE_IMAGE_SIZE
-
 #define CONFIG_SYS_BOOTM_LEN           SZ_64M
 
 #define PARTS_DEFAULT \
        "findfdt="                                                      \
                "setenv name_fdt k3-am654-base-board.dtb;"              \
                "setenv fdtfile ${name_fdt}\0"                          \
-       "loadaddr=0x80080000\0"                                         \
-       "fdtaddr=0x82000000\0"                                          \
-       "overlayaddr=0x83000000\0"                                      \
        "name_kern=Image\0"                                             \
        "console=ttyS2,115200n8\0"                                      \
        "stdin=serial,usbkbd\0"                                         \
-       "args_all=setenv optargs earlycon=ns16550a,mmio32,0x02800000\0" \
+       "args_all=setenv optargs earlycon=ns16550a,mmio32,0x02800000 "  \
+               "${mtdparts}\0"                                         \
        "run_kern=booti ${loadaddr} ${rd_spec} ${fdtaddr}\0"            \
 
 /* U-Boot MMC-specific configuration */
@@ -90,8 +49,8 @@
                "fdt resize 0x100000;"                                  \
                "for overlay in $name_overlays;"                        \
                "do;"                                                   \
-               "load mmc ${bootpart} ${overlayaddr} ${bootdir}/${overlay};"    \
-               "fdt apply ${overlayaddr};"                             \
+               "load mmc ${bootpart} ${dtboaddr} ${bootdir}/${overlay};"       \
+               "fdt apply ${dtboaddr};"                                \
                "done;\0"                                               \
        "get_kern_mmc=load mmc ${bootpart} ${loadaddr} "                \
                "${bootdir}/${name_kern}\0"                             \
                "0 /lib/firmware/am65x-mcu-r5f0_0-fw "                  \
                "1 /lib/firmware/am65x-mcu-r5f0_1-fw "
 
+#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_RAM                                                \
        DFU_ALT_INFO_EMMC                                               \
        DFU_ALT_INFO_OSPI
 
+#ifdef CONFIG_TARGET_AM654_A53_EVM
+#define BOOT_TARGET_DEVICES(func) \
+       func(MMC, mmc, 1) \
+       func(MMC, mmc, 0)
+
+#include <config_distro_bootcmd.h>
+#else
+#define BOOTENV
+#endif
+
 /* Incorporate settings into the U-Boot environment */
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
+       DEFAULT_LINUX_BOOT_ENV                                          \
        DEFAULT_MMC_TI_ARGS                                             \
        DEFAULT_FIT_TI_ARGS                                             \
        EXTRA_ENV_AM65X_BOARD_SETTINGS                                  \
        EXTRA_ENV_AM65X_BOARD_SETTINGS_MMC                              \
+       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
-#endif
-
-#define CONFIG_SUPPORT_EMMC_BOOT
+       EXTRA_ENV_DFUARGS                                               \
+       BOOTENV
 
 /* Now for the remaining common defines */
 #include <configs/ti_armv7_common.h>