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 tag 'u-boot-rockchip-20200501' of https://gitlab.denx.de/u-boot/custodians...
[platform/kernel/u-boot.git]
/
include
/
configs
/
cgtqmx6eval.h
diff --git
a/include/configs/cgtqmx6eval.h
b/include/configs/cgtqmx6eval.h
index
07c6409
..
797fcb1
100644
(file)
--- a/
include/configs/cgtqmx6eval.h
+++ b/
include/configs/cgtqmx6eval.h
@@
-17,7
+17,6
@@
#define CONFIG_MACH_TYPE 4122
#ifdef CONFIG_SPL
#define CONFIG_MACH_TYPE 4122
#ifdef CONFIG_SPL
-#define CONFIG_SYS_SPI_U_BOOT_OFFS (64 * 1024)
#include "imx6_spl.h"
#endif
#include "imx6_spl.h"
#endif
@@
-80,7
+79,6
@@
#define CONFIG_FEC_XCV_TYPE RGMII
#define CONFIG_ETHPRIME "FEC"
#define CONFIG_FEC_MXC_PHYADDR 6
#define CONFIG_FEC_XCV_TYPE RGMII
#define CONFIG_ETHPRIME "FEC"
#define CONFIG_FEC_MXC_PHYADDR 6
-#define CONFIG_PHY_ATHEROS
/* Command definition */
/* Command definition */
@@
-207,15
+205,7
@@
/* Environment organization */
#if defined (CONFIG_ENV_IS_IN_MMC)
/* Environment organization */
#if defined (CONFIG_ENV_IS_IN_MMC)
-#define CONFIG_ENV_OFFSET (6 * 64 * 1024)
#define CONFIG_SYS_MMC_ENV_DEV 0
#endif
#define CONFIG_SYS_MMC_ENV_DEV 0
#endif
-#define CONFIG_ENV_SIZE (8 * 1024)
-
-#if defined(CONFIG_ENV_IS_IN_SPI_FLASH)
-#define CONFIG_ENV_OFFSET (768 * 1024)
-#define CONFIG_ENV_SECT_SIZE (64 * 1024)
-#endif
-
#endif /* __CONFIG_CGTQMX6EVAL_H */
#endif /* __CONFIG_CGTQMX6EVAL_H */