Merge branch 'master_sh/gen4/mmcfix' of https://source.denx.de/u-boot/custodians...

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

diff --git a/include/configs/pic32mzdask.h b/include/configs/pic32mzdask.h
index d9abbbc..0ae4fc5 100644 (file)
--- a/include/configs/pic32mzdask.h
+++ b/include/configs/pic32mzdask.h
@@ -18,9 +18,9 @@
  * Memory Layout
  */
 /* Initial RAM for temporary stack, global data */
-#define CONFIG_SYS_INIT_RAM_SIZE       0x10000
-#define CONFIG_SYS_INIT_RAM_ADDR       \
-       (CONFIG_SYS_SRAM_BASE + CONFIG_SYS_SRAM_SIZE - CONFIG_SYS_INIT_RAM_SIZE)
+#define CFG_SYS_INIT_RAM_SIZE  0x10000
+#define CFG_SYS_INIT_RAM_ADDR  \
+       (CONFIG_SYS_SRAM_BASE + CONFIG_SYS_SRAM_SIZE - CFG_SYS_INIT_RAM_SIZE)
 
 /* SDRAM Configuration (for final code, data, stack, heap) */
 #define CFG_SYS_SDRAM_BASE             0x88000000
@@ -52,7 +52,7 @@
        "fdt_addr_r=0x89d00000\0"                               \
        "scriptaddr=0x88300000\0"                               \
 
-#define CONFIG_LEGACY_BOOTCMD_ENV                                      \
+#define CFG_LEGACY_BOOTCMD_ENV                                 \
        "legacy_bootcmd= "                                              \
                "if load mmc 0 ${scriptaddr} uEnv.txt; then "           \
                        "env import -tr ${scriptaddr} ${filesize}; "    \
@@ -69,9 +69,9 @@
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS      \
+#define CFG_EXTRA_ENV_SETTINGS \
        MEM_LAYOUT_ENV_SETTINGS         \
-       CONFIG_LEGACY_BOOTCMD_ENV       \
+       CFG_LEGACY_BOOTCMD_ENV  \
        BOOTENV
 
 #endif /* __PIC32MZDASK_CONFIG_H */