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
/
colibri_imx7.h
diff --git
a/include/configs/colibri_imx7.h
b/include/configs/colibri_imx7.h
index
32a79b0
..
c568643
100644
(file)
--- a/
include/configs/colibri_imx7.h
+++ b/
include/configs/colibri_imx7.h
@@
-21,10
+21,6
@@
#define CFG_SYS_FSL_USDHC_NUM 2
#endif
#define CFG_SYS_FSL_USDHC_NUM 2
#endif
-#define CONFIG_IPADDR 192.168.10.2
-#define CONFIG_NETMASK 255.255.255.0
-#define CONFIG_SERVERIP 192.168.10.1
-
#if defined(CONFIG_TARGET_COLIBRI_IMX7_EMMC)
#define UBOOT_UPDATE \
"uboot_hwpart=1\0" \
#if defined(CONFIG_TARGET_COLIBRI_IMX7_EMMC)
#define UBOOT_UPDATE \
"uboot_hwpart=1\0" \
@@
-123,7
+119,7
@@
#endif
#include <config_distro_bootcmd.h>
#endif
#include <config_distro_bootcmd.h>
-#define C
ONFI
G_EXTRA_ENV_SETTINGS \
+#define C
F
G_EXTRA_ENV_SETTINGS \
BOOTENV \
MEM_LAYOUT_ENV_SETTINGS \
MODULE_EXTRA_ENV_SETTINGS \
BOOTENV \
MEM_LAYOUT_ENV_SETTINGS \
MODULE_EXTRA_ENV_SETTINGS \
@@
-171,9
+167,7
@@
/* USB Configs */
/* USB Configs */
-#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
-
-#define CONFIG_USBD_HS
+#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS 0
#endif
#endif