From: Stefan Agner Date: Wed, 30 Nov 2016 21:41:54 +0000 (-0800) Subject: colibri_vf: use device-tree for MTD partitions X-Git-Tag: v2017.01-rc2~6^2~66 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6119b0f764eb8b68d6148d4c017cbd343408c2d8;p=u-boot colibri_vf: use device-tree for MTD partitions Use device-tree fixup to communicate the MTD partitions to the kernel. U-Boot's mtdparts environment variable will be used as partition source for the device-tree based partition table too. Signed-off-by: Stefan Agner --- diff --git a/board/toradex/colibri_vf/colibri_vf.c b/board/toradex/colibri_vf/colibri_vf.c index 86f52c5f63..0f8b440df9 100644 --- a/board/toradex/colibri_vf/colibri_vf.c +++ b/board/toradex/colibri_vf/colibri_vf.c @@ -15,8 +15,11 @@ #include #include #include +#include #include +#include #include +#include #include #include #include @@ -532,6 +535,16 @@ int checkboard(void) #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) int ft_board_setup(void *blob, bd_t *bd) { +#ifdef CONFIG_FDT_FIXUP_PARTITIONS + static struct node_info nodes[] = { + { "fsl,vf610-nfc", MTD_DEV_TYPE_NAND, }, /* NAND flash */ + }; + + /* Update partition nodes using info from mtdparts env var */ + puts(" Updating MTD partitions...\n"); + fdt_fixup_mtdparts(blob, nodes, ARRAY_SIZE(nodes)); +#endif + return ft_common_board_setup(blob, bd); } #endif