qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

colibri_imx7: use device-tree for MTD partitions 

Use device-tree fixup to communicate the MTD partitions to the
kernel. Remove mtdparts from the kernel command line.

Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
This commit is contained in:
Stefan Agner 2017-03-09 17:17:54 -08:00 committed by Stefano Babic
parent 05ed964d75
commit 640957042d
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
board/toradex/colibri_imx7/colibri_imx7.c
View File

@ -16,10 +16,13 @@
#include <common.h> #include <common.h>
#include <dm.h> #include <dm.h>
#include <dm/platform_data/serial_mxc.h> #include <dm/platform_data/serial_mxc.h>
#include <fdt_support.h>
#include <fsl_esdhc.h> #include <fsl_esdhc.h>
#include <jffs2/load_kernel.h>
#include <linux/sizes.h> #include <linux/sizes.h>
#include <mmc.h> #include <mmc.h>
#include <miiphy.h> #include <miiphy.h>
#include <mtd_node.h>
#include <netdev.h> #include <netdev.h>
#include <power/pmic.h> #include <power/pmic.h>
#include <power/rn5t567_pmic.h> #include <power/rn5t567_pmic.h>
@ -421,6 +424,16 @@ int checkboard(void)
#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
int ft_board_setup(void *blob, bd_t *bd) int ft_board_setup(void *blob, bd_t *bd)
{ {
#if defined(CONFIG_FDT_FIXUP_PARTITIONS)
static struct node_info nodes[] = {
{ "fsl,imx7d-gpmi-nand", 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); return ft_common_board_setup(blob, bd);
} }
#endif #endif

1
configs/colibri_imx7_defconfig
View File

@ -55,3 +55,4 @@ CONFIG_G_DNL_MANUFACTURER="Toradex"
CONFIG_G_DNL_VENDOR_NUM=0x1b67 CONFIG_G_DNL_VENDOR_NUM=0x1b67
CONFIG_G_DNL_PRODUCT_NUM=0x4000 CONFIG_G_DNL_PRODUCT_NUM=0x4000
CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_OF_LIBFDT_OVERLAY=y
CONFIG_FDT_FIXUP_PARTITIONS=y

2
include/configs/colibri_imx7.h
View File

@ -120,7 +120,7 @@
"${board}/flash_blk.img && source ${loadaddr}\0" \ "${board}/flash_blk.img && source ${loadaddr}\0" \
"setup=setenv setupargs " \ "setup=setenv setupargs " \
"console=tty1 console=${console}" \ "console=tty1 console=${console}" \
",${baudrate}n8 ${memargs} consoleblank=0 ${mtdparts}\0" \ ",${baudrate}n8 ${memargs} consoleblank=0\0" \
"setupdate=run setsdupdate || run setusbupdate || run setethupdate\0" \ "setupdate=run setsdupdate || run setusbupdate || run setethupdate\0" \
"setusbupdate=usb start && setenv interface usb && " \ "setusbupdate=usb start && setenv interface usb && " \
"fatload ${interface} 0:1 ${loadaddr} " \ "fatload ${interface} 0:1 ${loadaddr} " \