projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 */
* Memory Layout
*/
/* Initial RAM for temporary stack, global data */
-#define C
ONFIG_SYS_INIT_RAM_SIZE
0x10000
-#define C
ONFIG_SYS_INIT_RAM_ADDR
\
- (CONFIG_SYS_SRAM_BASE + CONFIG_SYS_SRAM_SIZE - C
ONFI
G_SYS_INIT_RAM_SIZE)
+#define C
FG_SYS_INIT_RAM_SIZE
0x10000
+#define C
FG_SYS_INIT_RAM_ADDR
\
+ (CONFIG_SYS_SRAM_BASE + CONFIG_SYS_SRAM_SIZE - C
F
G_SYS_INIT_RAM_SIZE)
/* SDRAM Configuration (for final code, data, stack, heap) */
#define CFG_SYS_SDRAM_BASE 0x88000000
/* 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" \
"fdt_addr_r=0x89d00000\0" \
"scriptaddr=0x88300000\0" \
-#define C
ONFIG_LEGACY_BOOTCMD_ENV
\
+#define C
FG_LEGACY_BOOTCMD_ENV
\
"legacy_bootcmd= " \
"if load mmc 0 ${scriptaddr} uEnv.txt; then " \
"env import -tr ${scriptaddr} ${filesize}; " \
"legacy_bootcmd= " \
"if load mmc 0 ${scriptaddr} uEnv.txt; then " \
"env import -tr ${scriptaddr} ${filesize}; " \
@@
-69,9
+69,9
@@
#include <config_distro_bootcmd.h>
#include <config_distro_bootcmd.h>
-#define C
ONFIG_EXTRA_ENV_SETTINGS
\
+#define C
FG_EXTRA_ENV_SETTINGS
\
MEM_LAYOUT_ENV_SETTINGS \
MEM_LAYOUT_ENV_SETTINGS \
- C
ONFIG_LEGACY_BOOTCMD_ENV
\
+ C
FG_LEGACY_BOOTCMD_ENV
\
BOOTENV
#endif /* __PIC32MZDASK_CONFIG_H */
BOOTENV
#endif /* __PIC32MZDASK_CONFIG_H */