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_MXC_UART_BASE to CFG
[platform/kernel/u-boot.git]
/
include
/
configs
/
ls1012aqds.h
diff --git
a/include/configs/ls1012aqds.h
b/include/configs/ls1012aqds.h
index
54555b3
..
35e8ff0
100644
(file)
--- a/
include/configs/ls1012aqds.h
+++ b/
include/configs/ls1012aqds.h
@@
-17,7
+17,7
@@
*/
#ifdef CONFIG_FSL_QIXIS
*/
#ifdef CONFIG_FSL_QIXIS
-#define C
ONFIG_SYS_I2C_FPGA_ADDR
0x66
+#define C
FG_SYS_I2C_FPGA_ADDR
0x66
#define QIXIS_LBMAP_BRDCFG_REG 0x04
#define QIXIS_LBMAP_SWITCH 6
#define QIXIS_LBMAP_MASK 0x08
#define QIXIS_LBMAP_BRDCFG_REG 0x04
#define QIXIS_LBMAP_SWITCH 6
#define QIXIS_LBMAP_MASK 0x08
@@
-46,8
+46,7
@@
/*
* RTC configuration
*/
/*
* RTC configuration
*/
-#define RTC
-#define CONFIG_SYS_I2C_RTC_ADDR 0x51 /* Channel 3*/
+#define CFG_SYS_I2C_RTC_ADDR 0x51 /* Channel 3*/
/* Voltage monitor on channel 2*/
/* Voltage monitor on channel 2*/
@@
-56,8
+55,8
@@
#define I2C_VOL_MONITOR_BUS_V_OVF 0x1
#define I2C_VOL_MONITOR_BUS_V_SHIFT 3
#define I2C_VOL_MONITOR_BUS_V_OVF 0x1
#define I2C_VOL_MONITOR_BUS_V_SHIFT 3
-#undef C
ONFI
G_EXTRA_ENV_SETTINGS
-#define C
ONFIG_EXTRA_ENV_SETTINGS
\
+#undef C
F
G_EXTRA_ENV_SETTINGS
+#define C
FG_EXTRA_ENV_SETTINGS
\
"verify=no\0" \
"kernel_addr=0x01000000\0" \
"kernelheader_addr=0x600000\0" \
"verify=no\0" \
"kernel_addr=0x01000000\0" \
"kernelheader_addr=0x600000\0" \