diff options
author | Stefan Agner <stefan@agner.ch> | 2015-03-25 14:32:13 +0100 |
---|---|---|
committer | Stefan Agner <stefan@agner.ch> | 2015-04-14 09:08:10 +0200 |
commit | b775e683d57cd450318f32c14daaae5dd0ace8f3 (patch) | |
tree | 5e0236438ff57631114b1adfa7497defa8c51b67 | |
parent | 11ae2bc15887e66c85fad2e2e0f033f4686cd770 (diff) |
colibri_vf: support Toradex config block
-rw-r--r-- | board/toradex/colibri_vf/Kconfig | 13 | ||||
-rw-r--r-- | board/toradex/colibri_vf/colibri_vf.c | 10 | ||||
-rw-r--r-- | include/configs/colibri_vf.h | 2 |
3 files changed, 23 insertions, 2 deletions
diff --git a/board/toradex/colibri_vf/Kconfig b/board/toradex/colibri_vf/Kconfig index 2c3cb307fd2..e677a7c8af3 100644 --- a/board/toradex/colibri_vf/Kconfig +++ b/board/toradex/colibri_vf/Kconfig @@ -15,4 +15,17 @@ config SYS_SOC config SYS_CONFIG_NAME default "colibri_vf" +config TRDX_CFG_BLOCK + default y + +config TRDX_HAVE_NAND + default y + +config TRDX_CFG_BLOCK_OFFSET + default "0x800" + +config TRDX_CFG_BLOCK_2ND_ETHADDR + default y + +source "board/toradex/common/Kconfig" endif diff --git a/board/toradex/colibri_vf/colibri_vf.c b/board/toradex/colibri_vf/colibri_vf.c index 62f3013081f..85e5389d57a 100644 --- a/board/toradex/colibri_vf/colibri_vf.c +++ b/board/toradex/colibri_vf/colibri_vf.c @@ -21,6 +21,8 @@ #include <i2c.h> #include <g_dnl.h> +#include "../common/configblock.h" + DECLARE_GLOBAL_DATA_PTR; #define UART_PAD_CTRL (PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \ @@ -364,11 +366,17 @@ int board_init(void) int checkboard(void) { +#ifdef CONFIG_TRDX_CFG_BLOCK + if (read_trdx_cfg_block()) + printf("Missing Toradex config block\n"); + else + display_board_info(); +#else if (is_colibri_vf61()) puts("Board: Colibri VF61\n"); else puts("Board: Colibri VF50\n"); - +#endif return 0; } diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index a30eff80eab..007019672ce 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -24,7 +24,7 @@ #define CONFIG_ARCH_CPU_INIT #define CONFIG_ARCH_MISC_INIT #define CONFIG_DISPLAY_CPUINFO -#define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_DISPLAY_BOARDINFO_LATE #define CONFIG_SKIP_LOWLEVEL_INIT |