colibri_vf: support Toradex config block

diff --git a/board/toradex/colibri_vf/Kconfig b/board/toradex/colibri_vf/Kconfig
index 2c3cb307fd2ca8fae9a2817adc7b0cb66563df25..e677a7c8af395e00f8ce0850c15fcd27280864a5 100644 (file)
--- 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 62f3013081fb7cfdf46f395caa253fc7e3e4b727..85e5389d57a5a7bbc574be339493474c6721d877 100644 (file)
--- 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 a30eff80eabd7981f1c56641ed4c19c90ce0c1cd..007019672ce0805474fdbbf94105381e3aba24a7 100644 (file)
--- 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