From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lukasz Majewski Date: Mon, 12 Nov 2018 11:59:23 +0100 Subject: [U-Boot] [PATCH v2 1/5] mtd: Use default mtdparts/mtids when not defined in the environment In-Reply-To: <20181112082809.7035-1-boris.brezillon@bootlin.com> References: <20181112082809.7035-1-boris.brezillon@bootlin.com> Message-ID: <20181112115923.6a97a15d@jawa> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi Boris, > U-boot provides a mean to define default values for mtdids and > mtdparts when they're not defined in the environment. Patch > mtd_probe_devices() to use those default values when > env_get("mtdparts") or env_get("mtdids") return NULL. > > This implementation is based on the logic found in cmd/mtdparts.c. > > Fixes: 5db66b3aee6f ("cmd: mtd: add 'mtd' command") > Reported-by: Stefan Roese > Signed-off-by: Boris Brezillon > Tested-by: Stefan Roese > --- > Changes in v2: > - none > --- > drivers/mtd/mtd_uboot.c | 62 > +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 60 > insertions(+), 2 deletions(-) > > diff --git a/drivers/mtd/mtd_uboot.c b/drivers/mtd/mtd_uboot.c > index 7d7a11c990d6..1d0a505754f2 100644 > --- a/drivers/mtd/mtd_uboot.c > +++ b/drivers/mtd/mtd_uboot.c > @@ -92,12 +92,70 @@ static void mtd_probe_uclass_mtd_devs(void) { } > #endif > > #if defined(CONFIG_MTD_PARTITIONS) > +extern void board_mtdparts_default(const char **mtdids, > + const char **mtdparts); > + > +static const char *get_mtdids(void) > +{ > + __maybe_unused const char *mtdparts = NULL; > + const char *mtdids = env_get("mtdids"); > + > + if (mtdids) > + return mtdids; > + > +#if defined(CONFIG_SYS_MTDPARTS_RUNTIME) > + board_mtdparts_default(&mtdids, &mtdparts); > +#elif defined(MTDIDS_DEFAULT) > + mtdids = MTDIDS_DEFAULT; > +#elif defined(CONFIG_MTDIDS_DEFAULT) > + mtdids = CONFIG_MTDIDS_DEFAULT; > +#endif > + > + if (mtdids) > + env_set("mtdids", mtdids); > + > + return mtdids; > +} > + > +#define MTDPARTS_MAXLEN 512 > + > +static const char *get_mtdparts(void) > +{ > + __maybe_unused const char *mtdids = NULL; > + static char tmp_parts[MTDPARTS_MAXLEN]; > + static bool use_defaults = true; > + const char *mtdparts = NULL; > + > + if (gd->flags & GD_FLG_ENV_READY) > + mtdparts = env_get("mtdparts"); > + else if (env_get_f("mtdparts", tmp_parts, > sizeof(tmp_parts) != -1)) > + mtdparts = tmp_parts; > + > + if (mtdparts || !use_defaults) > + return mtdparts; > + > +#if defined(CONFIG_SYS_MTDPARTS_RUNTIME) > + board_mtdparts_default(&mtdids, &mtdparts); > +#elif defined(MTDPARTS_DEFAULT) > + mtdparts = MTDPARTS_DEFAULT; > +#elif defined(CONFIG_MTDPARTS_DEFAULT) > + mtdparts = CONFIG_MTDPARTS_DEFAULT; > +#endif > + > + if (mtdparts) > + env_set("mtdparts", mtdparts); > + > + use_defaults = false; > + > + return mtdparts; > +} > + > int mtd_probe_devices(void) > { > static char *old_mtdparts; > static char *old_mtdids; > - const char *mtdparts = env_get("mtdparts"); > - const char *mtdids = env_get("mtdids"); > + const char *mtdparts = get_mtdparts(); > + const char *mtdids = get_mtdids(); > bool remaining_partitions = true; > struct mtd_info *mtd; > Reviewed-by: Lukasz Majewski Best regards, Lukasz Majewski -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 488 bytes Desc: OpenPGP digital signature URL: