m68k: rename CONFIG_MCFTMR to CFG_MCFTMR

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

diff --git a/include/configs/j721e_evm.h b/include/configs/j721e_evm.h
index 2a0b0c7..48b1cea 100644 (file)
--- a/include/configs/j721e_evm.h
+++ b/include/configs/j721e_evm.h
@@ -18,14 +18,14 @@
 /* DDR Configuration */
 #define CFG_SYS_SDRAM_BASE1            0x880000000
 /* FLASH Configuration */
-#define CONFIG_SYS_FLASH_BASE          0x000000000
+#define CFG_SYS_FLASH_BASE             0x000000000
 
 /* SPL Loader Configuration */
 #if defined(CONFIG_TARGET_J721E_A72_EVM) || defined(CONFIG_TARGET_J7200_A72_EVM)
-#define CONFIG_SYS_UBOOT_BASE          0x50280000
+#define CFG_SYS_UBOOT_BASE             0x50280000
 /* Image load address in RAM for DFU boot*/
 #else
-#define CONFIG_SYS_UBOOT_BASE          0x50080000
+#define CFG_SYS_UBOOT_BASE             0x50080000
 #endif
 
 /* HyperFlash related configuration */
@@ -161,7 +161,14 @@
 # define BOOT_TARGET_DHCP(func)
 #endif
 
+#ifdef CONFIG_CMD_USB
+# define BOOT_TARGET_USB(func) func(USB, usb, 0)
+#else
+# define BOOT_TARGET_USB(func)
+#endif
+
 #define BOOT_TARGET_DEVICES(func) \
+       BOOT_TARGET_USB(func) \
        func(MMC, mmc, 1) \
        func(MMC, mmc, 0) \
        BOOT_TARGET_PXE(func) \
@@ -170,7 +177,7 @@
 #include <config_distro_bootcmd.h>
 
 /* Incorporate settings into the U-Boot environment */
-#define CONFIG_EXTRA_ENV_SETTINGS                                      \
+#define CFG_EXTRA_ENV_SETTINGS                                 \
        DEFAULT_LINUX_BOOT_ENV                                          \
        DEFAULT_MMC_TI_ARGS                                             \
        DEFAULT_FIT_TI_ARGS                                             \