summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2014-01-22 09:30:35 +0100
committerMax Krummenacher <max.krummenacher@toradex.com>2014-01-22 09:30:35 +0100
commit212df4fc995012a525b31d3258def139cc236e8c (patch)
tree3bef9645c6e1f1b78fe681c47e8aefc4f57c5fb7 /include
parent14a2bdbd75854ba597c012c42197e929f4b03739 (diff)
Apalis imx6: further bringup
- Switched on some PMIC rails until we fuse the PMIC - Added/corrected pinmuxings - ETH still not working - Corrected board name were Colibri was used instead of Apalis
Diffstat (limited to 'include')
-rw-r--r--include/configs/apalis-imx6.h (renamed from include/configs/colibri-imx6.h)12
1 files changed, 7 insertions, 5 deletions
diff --git a/include/configs/colibri-imx6.h b/include/configs/apalis-imx6.h
index 11f0de1b1f..9d50ab20a2 100644
--- a/include/configs/colibri-imx6.h
+++ b/include/configs/apalis-imx6.h
@@ -69,8 +69,8 @@
/* MMC Configs */
#define CONFIG_FSL_ESDHC
#define CONFIG_FSL_USDHC
-#define CONFIG_SYS_FSL_ESDHC_ADDR 0
-#define CONFIG_SYS_FSL_USDHC_NUM 3
+#define CONFIG_SYS_FSL_ESDHC_ADDR 0
+#define CONFIG_SYS_FSL_USDHC_NUM 3
#define CONFIG_MMC
#define CONFIG_CMD_MMC
@@ -108,7 +108,7 @@
#define CONFIG_FEC_MXC_PHYADDR 6
#define CONFIG_PHYLIB
#define CONFIG_PHY_MICREL
-#define CONFIG_PHY_MICREL_KSZ9021
+//#define CONFIG_PHY_MICREL_KSZ9021
/* USB Configs */
#define CONFIG_CMD_USB
@@ -249,7 +249,7 @@
"else run netboot; fi"
#else
#define CONFIG_EXTRA_ENV_SETTINGS \
- "console=ttymxc1\0" \
+ "console=ttymxc0\0" \
"clearenv=if sf probe || sf probe || sf probe 1 ; then " \
"sf erase 0xc0000 0x2000 && " \
"echo restored environment to factory default ; fi\0" \
@@ -280,6 +280,8 @@
"done ; " \
"done ; " \
"done\0" \
+ "ethaddr=00:14:2D:00:00:00\0" \
+ "ipaddr=192.168.10.2\0" \
#endif
/* Miscellaneous configurable options */
@@ -324,7 +326,7 @@
#define CONFIG_ENV_IS_IN_MMC
#if defined(CONFIG_ENV_IS_IN_MMC)
-#define CONFIG_ENV_OFFSET ((1024 * 1024) - (2 * CONFIG_ENV_SIZE))
+#define CONFIG_ENV_OFFSET (512 * 1024)
#define CONFIG_SYS_MMC_ENV_DEV 0
#endif