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 git://git.denx.de/u-boot-socfpga
[platform/kernel/u-boot.git]
/
include
/
configs
/
colibri-imx6ull.h
diff --git
a/include/configs/colibri-imx6ull.h
b/include/configs/colibri-imx6ull.h
index
7cf550c
..
fc39e80
100644
(file)
--- a/
include/configs/colibri-imx6ull.h
+++ b/
include/configs/colibri-imx6ull.h
@@
-1,6
+1,6
@@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
/* SPDX-License-Identifier: GPL-2.0+ */
/*
- * Copyright 2018 Toradex AG
+ * Copyright 2018
-2019
Toradex AG
*
* Configuration settings for the Colibri iMX6ULL module.
*
*
* Configuration settings for the Colibri iMX6ULL module.
*
@@
-19,10
+19,6
@@
#define CONFIG_SYS_MALLOC_LEN (32 * SZ_1M)
/* Network */
#define CONFIG_SYS_MALLOC_LEN (32 * SZ_1M)
/* Network */
-#define CONFIG_FEC_XCV_TYPE RMII
-#define CONFIG_ETHPRIME "FEC"
-#define CONFIG_FEC_MXC_PHYADDR 0
-
#define CONFIG_IP_DEFRAG
#define CONFIG_TFTP_BLOCKSIZE 16352
#define CONFIG_TFTP_TSIZE
#define CONFIG_IP_DEFRAG
#define CONFIG_TFTP_BLOCKSIZE 16352
#define CONFIG_TFTP_TSIZE
@@
-30,7
+26,7
@@
/* ENET1 */
#define IMX_FEC_BASE ENET2_BASE_ADDR
/* ENET1 */
#define IMX_FEC_BASE ENET2_BASE_ADDR
-/* MMC Config*/
+/* MMC Config
*/
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
#define CONFIG_SYS_FSL_USDHC_NUM 1
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
#define CONFIG_SYS_FSL_USDHC_NUM 1
@@
-48,12
+44,12
@@
#define MEM_LAYOUT_ENV_SETTINGS \
"bootm_size=0x10000000\0" \
#define MEM_LAYOUT_ENV_SETTINGS \
"bootm_size=0x10000000\0" \
- "fdt_addr_r=0x82
0
00000\0" \
+ "fdt_addr_r=0x82
1
00000\0" \
"fdt_high=0xffffffff\0" \
"initrd_high=0xffffffff\0" \
"kernel_addr_r=0x81000000\0" \
"pxefile_addr_r=0x87100000\0" \
"fdt_high=0xffffffff\0" \
"initrd_high=0xffffffff\0" \
"kernel_addr_r=0x81000000\0" \
"pxefile_addr_r=0x87100000\0" \
- "ramdisk_addr_r=0x82
1
00000\0" \
+ "ramdisk_addr_r=0x82
2
00000\0" \
"scriptaddr=0x87000000\0"
#define NFS_BOOTCMD \
"scriptaddr=0x87000000\0"
#define NFS_BOOTCMD \
@@
-182,4
+178,4
@@
#define CONFIG_VIDEO_BMP_LOGO
#endif
#define CONFIG_VIDEO_BMP_LOGO
#endif
-#endif
+#endif
/* __COLIBRI_IMX6ULL_CONFIG_H */