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
global: Migrate CONFIG_STACKBASE to CFG
[platform/kernel/u-boot.git]
/
include
/
configs
/
mccmon6.h
diff --git
a/include/configs/mccmon6.h
b/include/configs/mccmon6.h
index
17986a0
..
b64bf93
100644
(file)
--- a/
include/configs/mccmon6.h
+++ b/
include/configs/mccmon6.h
@@
-9,9
+9,7
@@
#include "mx6_common.h"
#include "mx6_common.h"
-#include "imx6_spl.h"
-
-#define CONFIG_SYS_UBOOT_BASE (CONFIG_SYS_FLASH_BASE + 0x80000)
+#define CFG_SYS_UBOOT_BASE (CFG_SYS_FLASH_BASE + 0x80000)
/*
* Below defines are set but NOT really used since we by
/*
* Below defines are set but NOT really used since we by
@@
-19,24
+17,23
@@
* mode from SD card (SD2)
*/
* mode from SD card (SD2)
*/
-#define C
ONFIG_MXC_UART_BASE
UART1_BASE
+#define C
FG_MXC_UART_BASE
UART1_BASE
/* MMC Configuration */
/* MMC Configuration */
-#define C
ONFIG_SYS_FSL_USDHC_NUM
2
-#define C
ONFIG_SYS_FSL_ESDHC_ADDR
0
+#define C
FG_SYS_FSL_USDHC_NUM
2
+#define C
FG_SYS_FSL_ESDHC_ADDR
0
/* NOR 16-bit mode */
/* NOR 16-bit mode */
-#define CONFIG_SYS_FLASH_BASE WEIM_ARB_BASE_ADDR
-#define CONFIG_FLASH_VERIFY
+#define CFG_SYS_FLASH_BASE WEIM_ARB_BASE_ADDR
/* NOR Flash MTD */
/* NOR Flash MTD */
-#define C
ONFIG_SYS_FLASH_BANKS_LIST { (CONFI
G_SYS_FLASH_BASE) }
-#define C
ONFIG_SYS_FLASH_BANKS_SIZES
{ (32 * SZ_1M) }
+#define C
FG_SYS_FLASH_BANKS_LIST { (CF
G_SYS_FLASH_BASE) }
+#define C
FG_SYS_FLASH_BANKS_SIZES
{ (32 * SZ_1M) }
/* Ethernet Configuration */
/* Ethernet Configuration */
-#define C
ONFIG_FEC_MXC_PHYADDR
1
+#define C
FG_FEC_MXC_PHYADDR
1
-#define C
ONFI
G_EXTRA_ENV_SETTINGS \
+#define C
F
G_EXTRA_ENV_SETTINGS \
"console=ttymxc0,115200 quiet\0" \
"fdt_high=0xffffffff\0" \
"initrd_high=0xffffffff\0" \
"console=ttymxc0,115200 quiet\0" \
"fdt_high=0xffffffff\0" \
"initrd_high=0xffffffff\0" \
@@
-118,7
+115,7
@@
"nor_img_addr=0x11000000\0" \
"nor_img_file=core-image-lwn-mccmon6.nor\0" \
"emmc_img_file=core-image-lwn-mccmon6.ext4\0" \
"nor_img_addr=0x11000000\0" \
"nor_img_file=core-image-lwn-mccmon6.nor\0" \
"emmc_img_file=core-image-lwn-mccmon6.ext4\0" \
- "nor_bank_start=" __stringify(C
ONFI
G_SYS_FLASH_BASE) "\0" \
+ "nor_bank_start=" __stringify(C
F
G_SYS_FLASH_BASE) "\0" \
"nor_img_size=0x02000000\0" \
"factory_script_file=factory.scr\0" \
"factory_load_script=" \
"nor_img_size=0x02000000\0" \
"factory_script_file=factory.scr\0" \
"factory_load_script=" \
@@
-216,9
+213,9
@@
/* Physical Memory Map */
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
/* Physical Memory Map */
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
-#define C
ONFIG_SYS_SDRAM_BASE
PHYS_SDRAM
-#define C
ONFIG_SYS_INIT_RAM_ADDR
IRAM_BASE_ADDR
-#define C
ONFIG_SYS_INIT_RAM_SIZE
IRAM_SIZE
+#define C
FG_SYS_SDRAM_BASE
PHYS_SDRAM
+#define C
FG_SYS_INIT_RAM_ADDR
IRAM_BASE_ADDR
+#define C
FG_SYS_INIT_RAM_SIZE
IRAM_SIZE
/* Environment organization */
/* Environment organization */