diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2016-02-11 15:26:59 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2016-02-17 10:54:11 +0100 |
| commit | debfb32fe5c4f95e52cc9e90b3c390d878dbf782 (patch) | |
| tree | 870ffb1583a4f625f18af2a31e6187d80ff64498 | |
| parent | 2f0b04f25f619dccb3efa3b7353d9c49987b6e63 (diff) | |
colibri_imx7: add trdx configblock handling
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
| -rw-r--r-- | board/toradex/colibri_imx7/Kconfig | 15 | ||||
| -rw-r--r-- | board/toradex/colibri_imx7/colibri_imx7.c | 10 |
2 files changed, 23 insertions, 2 deletions
diff --git a/board/toradex/colibri_imx7/Kconfig b/board/toradex/colibri_imx7/Kconfig index ddaf6cbcc6..e62ec5a68a 100644 --- a/board/toradex/colibri_imx7/Kconfig +++ b/board/toradex/colibri_imx7/Kconfig @@ -12,6 +12,21 @@ config SYS_SOC config SYS_CONFIG_NAME default "colibri_imx7" +config TRDX_CFG_BLOCK + default y + +config TRDX_HAVE_NAND + default y + +config TRDX_CFG_BLOCK_OFFSET + default "2048" + +config TRDX_CFG_BLOCK_OFFSET2 + default "133120" + +config TRDX_CFG_BLOCK_2ND_ETHADDR + default y + menuconfig TRDX_CMD_IMX_MFGR bool "Enable factory testing commands for Toradex iMX 6 modules" help diff --git a/board/toradex/colibri_imx7/colibri_imx7.c b/board/toradex/colibri_imx7/colibri_imx7.c index d74b79cb4b..e71206bfbb 100644 --- a/board/toradex/colibri_imx7/colibri_imx7.c +++ b/board/toradex/colibri_imx7/colibri_imx7.c @@ -26,18 +26,17 @@ #include <asm/imx-common/mxc_i2c.h> #endif #include <asm/arch/crm_regs.h> - #ifdef CONFIG_VIDEO_MXS #include <linux/fb.h> #include <mxsfb.h> #endif - #ifdef CONFIG_FASTBOOT #include <fastboot.h> #ifdef CONFIG_ANDROID_RECOVERY #include <recovery.h> #endif #endif /*CONFIG_FASTBOOT*/ +#include "../common/configblock.h" //#define COLIBRI_EXT_PHYCLK @@ -553,6 +552,13 @@ int board_init(void) return 0; } +int checkboard_fallback(void) +{ + printf("Model: Toradex Colibri iMX7 %s\n", + (gd->ram_size == 0x20000000) ? "Dual" : "Solo"); + return 0; +} + #ifdef CONFIG_CMD_BMODE static const struct boot_mode board_boot_modes[] = { /* 4 bit bus width */ |