From: Francesco Dolcini <francesco@dolcini.it>
To: Simon Glass <sjg@chromium.org>,
u-boot@lists.denx.de,
Marcel Ziswiler <marcel.ziswiler@toradex.com>
Cc: Francesco Dolcini <francesco.dolcini@toradex.com>,
Marek Vasut <marex@denx.de>,
Miquel Raynal <miquel.raynal@bootlin.com>
Subject: [PATCH v2 3/3] colibri-imx6ull: specify MTD partitions on command line
Date: Mon, 6 Feb 2023 23:48:38 +0100 [thread overview]
Message-ID: <20230206224838.75963-4-francesco@dolcini.it> (raw)
In-Reply-To: <20230206224838.75963-1-francesco@dolcini.it>
From: Francesco Dolcini <francesco.dolcini@toradex.com>
Disable fdt_fixup_mtdparts() and pass MTD partition on the command
line. Dynamically editing the fdt with a static partitions configuration
is not required and there is no advantages compared to using the command
line. This change should prevent boot failures as the one in [0].
Cc: Marek Vasut <marex@denx.de>
Cc: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/all/Y4dgBTGNWpM6SQXI@francesco-nb.int.toradex.com/ [0]
Link: https://lore.kernel.org/all/20230105123334.7f90c289@xps-13/
Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com>
---
v2:
- removed dead code
- improved commit message
---
board/toradex/colibri-imx6ull/colibri-imx6ull.c | 11 -----------
configs/colibri-imx6ull_defconfig | 1 -
include/configs/colibri-imx6ull.h | 2 +-
3 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/board/toradex/colibri-imx6ull/colibri-imx6ull.c b/board/toradex/colibri-imx6ull/colibri-imx6ull.c
index 6007f110e4ba..48fdb1e09712 100644
--- a/board/toradex/colibri-imx6ull/colibri-imx6ull.c
+++ b/board/toradex/colibri-imx6ull/colibri-imx6ull.c
@@ -212,17 +212,6 @@ int checkboard(void)
#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
int ft_board_setup(void *blob, struct bd_info *bd)
{
-#if defined(CONFIG_FDT_FIXUP_PARTITIONS)
- static struct node_info nodes[] = {
- { "fsl,imx6ull-gpmi-nand", MTD_DEV_TYPE_NAND, },
- { "fsl,imx6q-gpmi-nand", MTD_DEV_TYPE_NAND, },
- };
-
- /* 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
diff --git a/configs/colibri-imx6ull_defconfig b/configs/colibri-imx6ull_defconfig
index f2a0d79ccca9..fbab687f5ab8 100644
--- a/configs/colibri-imx6ull_defconfig
+++ b/configs/colibri-imx6ull_defconfig
@@ -104,4 +104,3 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x4000
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_OF_LIBFDT_OVERLAY=y
-CONFIG_FDT_FIXUP_PARTITIONS=y
diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h
index ba45ee4efd37..561a61ebc03c 100644
--- a/include/configs/colibri-imx6ull.h
+++ b/include/configs/colibri-imx6ull.h
@@ -99,7 +99,7 @@
"${board}/flash_blk.img && source ${loadaddr}\0" \
"setup=setenv setupargs " \
"console=tty1 console=${console}" \
- ",${baudrate}n8 ${memargs} consoleblank=0\0" \
+ ",${baudrate}n8 ${memargs} ${mtdparts} consoleblank=0\0" \
"setupdate=run setsdupdate || run setusbupdate || run setethupdate\0" \
"setusbupdate=usb start && setenv interface usb && " \
"fatload ${interface} 0:1 ${loadaddr} " \
--
2.25.1
next prev parent reply other threads:[~2023-02-06 22:49 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-06 22:48 [PATCH v2 0/3] fdt: Fix mtparts fixup Francesco Dolcini
2023-02-06 22:48 ` [PATCH v2 1/3] fdt: validate/fix cells count on mtdpart fixup Francesco Dolcini
2023-02-06 23:17 ` Tom Rini
2023-04-04 16:18 ` Francesco Dolcini
2023-04-06 15:25 ` Tom Rini
2023-04-14 6:29 ` Francesco Dolcini
2023-02-06 22:48 ` [PATCH v2 2/3] colibri-imx7: specify MTD partitions on command line Francesco Dolcini
2023-04-14 6:34 ` Francesco Dolcini
2023-02-06 22:48 ` Francesco Dolcini [this message]
2023-04-17 9:21 ` Dario Binacchi
2023-04-17 9:26 ` [PATCH v2 3/3] colibri-imx6ull: " Dario Binacchi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230206224838.75963-4-francesco@dolcini.it \
--to=francesco@dolcini.it \
--cc=francesco.dolcini@toradex.com \
--cc=marcel.ziswiler@toradex.com \
--cc=marex@denx.de \
--cc=miquel.raynal@bootlin.com \
--cc=sjg@chromium.org \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).