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_USB_FLAGS et al to CFG
[platform/kernel/u-boot.git]
/
include
/
configs
/
imx6q-bosch-acc.h
diff --git
a/include/configs/imx6q-bosch-acc.h
b/include/configs/imx6q-bosch-acc.h
index
785ac7c
..
2c998cd
100644
(file)
--- a/
include/configs/imx6q-bosch-acc.h
+++ b/
include/configs/imx6q-bosch-acc.h
@@
-45,7
+45,7
@@
"save_env=env save; env save\0" \
"altbootcmd=run handle_ustate; run switch_bootset; run save_env; run bootcmd\0"
"save_env=env save; env save\0" \
"altbootcmd=run handle_ustate; run switch_bootset; run save_env; run bootcmd\0"
-#define C
ONFI
G_ENV_FLAGS_LIST_STATIC \
+#define C
F
G_ENV_FLAGS_LIST_STATIC \
"bootset:bw," \
"clone_pending:bw," \
"endurance_test:bw," \
"bootset:bw," \
"clone_pending:bw," \
"endurance_test:bw," \
@@
-72,7
+72,7
@@
#endif
/* Default environment */
#endif
/* Default environment */
-#define C
ONFI
G_EXTRA_ENV_SETTINGS \
+#define C
F
G_EXTRA_ENV_SETTINGS \
"bootconf=conf-imx6q-bosch-acc.dtb\0"\
"mmcfit_name=fitImage\0" \
"mmcloadfit=ext4load mmc ${mmcdev}:${fitpart} ${fit_addr} ${mmcfit_name}\0" \
"bootconf=conf-imx6q-bosch-acc.dtb\0"\
"mmcfit_name=fitImage\0" \
"mmcloadfit=ext4load mmc ${mmcdev}:${fitpart} ${fit_addr} ${mmcfit_name}\0" \
@@
-85,35
+85,32
@@
/* Physical Memory Map */
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
/* Physical Memory Map */
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
-#define C
ONFI
G_SYS_SDRAM_BASE PHYS_SDRAM
-#define C
ONFI
G_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR
-#define C
ONFI
G_SYS_INIT_RAM_SIZE IRAM_SIZE
+#define C
F
G_SYS_SDRAM_BASE PHYS_SDRAM
+#define C
F
G_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR
+#define C
F
G_SYS_INIT_RAM_SIZE IRAM_SIZE
/* SPL */
#ifdef CONFIG_SPL
/* SPL */
#ifdef CONFIG_SPL
-#include "imx6_spl.h"
#ifdef CONFIG_SPL_BUILD
#ifdef CONFIG_SPL_BUILD
-#define C
ONFI
G_SYS_FSL_USDHC_NUM 2
+#define C
F
G_SYS_FSL_USDHC_NUM 2
#ifdef CONFIG_SYS_BOOT_EMMC
/* Boot from eMMC */
#ifdef CONFIG_SYS_BOOT_EMMC
/* Boot from eMMC */
-#define C
ONFI
G_SYS_FSL_ESDHC_ADDR 1
+#define C
F
G_SYS_FSL_ESDHC_ADDR 1
#else
/* Boot from SD-card */
#else
/* Boot from SD-card */
-# define C
ONFIG_SYS_FSL_ESDHC_ADDR
0
+# define C
FG_SYS_FSL_ESDHC_ADDR
0
#endif
#endif
#endif
#endif
#endif
#endif
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
-#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
-#define CONFIG_USB_MAX_CONTROLLER_COUNT 1 /* Enabled USB controller number */
+#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS 0
#endif /* __IMX6Q_ACC_H */
#endif /* __IMX6Q_ACC_H */