Convert CONFIG_IMX_VIDEO_SKIP et al to Kconfig

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

diff --git a/include/configs/am64x_evm.h b/include/configs/am64x_evm.h
index 16d0955..25c71f0 100644 (file)
--- a/include/configs/am64x_evm.h
+++ b/include/configs/am64x_evm.h
@@ -16,39 +16,7 @@
 #include <environment/ti/k3_dfu.h>
 
 /* DDR Configuration */
-#define CONFIG_SYS_SDRAM_BASE1         0x880000000
-
-#ifdef CONFIG_SYS_K3_SPL_ATF
-#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME        "tispl.bin"
-#endif
-
-#define CONFIG_SPL_MAX_SIZE            CONFIG_SYS_K3_MAX_DOWNLODABLE_IMAGE_SIZE
-#if defined(CONFIG_TARGET_AM642_A53_EVM)
-#define CONFIG_SYS_INIT_SP_ADDR         (CONFIG_SPL_TEXT_BASE +        \
-                                       CONFIG_SYS_K3_NON_SECURE_MSRAM_SIZE - 4)
-#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                0x1000
-/*
- * 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      (TI_SRAM_SCRATCH_BOARD_EEPROM_START -\
-                                        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
+#define CFG_SYS_SDRAM_BASE1            0x880000000
 
 #define PARTS_DEFAULT \
        /* Linux partitions */ \
@@ -92,6 +60,34 @@
                "${bootdir}/${name_fit}\0"                              \
        "partitions=" PARTS_DEFAULT
 
+#define EXTRA_ENV_AM642_BOARD_SETTING_USBMSC                           \
+       "args_usb=run finduuid;setenv bootargs console=${console} "     \
+               "${optargs} "                                           \
+               "root=PARTUUID=${uuid} rw "                             \
+               "rootfstype=${mmcrootfstype}\0"                         \
+       "init_usb=run args_all args_usb\0"                              \
+       "get_fdt_usb=load usb ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
+       "get_overlay_usb="                                              \
+               "fdt address ${fdtaddr};"                               \
+               "fdt resize 0x100000;"                                  \
+               "for overlay in $name_overlays;"                        \
+               "do;"                                                   \
+               "load usb ${bootpart} ${dtboaddr} ${bootdir}/${overlay} && "    \
+               "fdt apply ${dtboaddr};"                                \
+               "done;\0"                                               \
+       "get_kern_usb=load usb ${bootpart} ${loadaddr} "                \
+               "${bootdir}/${name_kern}\0"                             \
+       "get_fit_usb=load usb ${bootpart} ${addr_fit} "                 \
+               "${bootdir}/${name_fit}\0"                              \
+       "usbboot=setenv boot usb;"                                      \
+               "setenv bootpart 0:2;"                                  \
+               "usb start;"                                            \
+               "run findfdt;"                                          \
+               "run init_usb;"                                         \
+               "run get_kern_usb;"                                     \
+               "run get_fdt_usb;"                                      \
+               "run run_kern\0"
+
 #define EXTRA_ENV_DFUARGS \
        DFU_ALT_INFO_MMC \
        DFU_ALT_INFO_EMMC \
@@ -104,11 +100,10 @@
        DEFAULT_MMC_TI_ARGS                                             \
        EXTRA_ENV_AM642_BOARD_SETTINGS                                  \
        EXTRA_ENV_AM642_BOARD_SETTINGS_MMC                              \
-       EXTRA_ENV_DFUARGS
+       EXTRA_ENV_DFUARGS                                               \
+       EXTRA_ENV_AM642_BOARD_SETTING_USBMSC
 
 /* Now for the remaining common defines */
 #include <configs/ti_armv7_common.h>
 
-#define CONFIG_SYS_USB_FAT_BOOT_PARTITION 1
-
 #endif /* __CONFIG_AM642_EVM_H */