* [PATCH] cmd: mmc: add mmcboot command @ 2020-12-23 19:57 ` Ravik Hasija 2020-12-27 22:58 ` Jaehoon Chung ` (2 more replies) 0 siblings, 3 replies; 9+ messages in thread From: Ravik Hasija @ 2020-12-23 19:57 UTC (permalink / raw) To: u-boot Similar to usbboot, add command line to boot from raw mmc partition using common_diskboot(), which supports legacy or FIT images. Usage: mmcboot loadAaddr dev:part Where <loadAddr> defaults to CONFIG_SYS_LOAD_ADDR, and <dev:part> defaults to ${bootdevice}. Also fixing config macro usage for CONFIG_SUPPORT_EMMC_BOOT (suggested by checkpatch.pl). Signed-off-by: Ravik Hasija <rahasij@linux.microsoft.com> Signed-off-by: Dhananjay Phadke <dphadke@linux.microsoft.com> --- cmd/mmc.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/cmd/mmc.c b/cmd/mmc.c index 1529a3e05d..4d134e35a1 100644 --- a/cmd/mmc.c +++ b/cmd/mmc.c @@ -711,7 +711,7 @@ static int do_mmc_hwpartition(struct cmd_tbl *cmdtp, int flag, } #endif -#ifdef CONFIG_SUPPORT_EMMC_BOOT +#if CONFIG_IS_ENABLED(SUPPORT_EMMC_BOOT) static int do_mmc_bootbus(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { @@ -950,7 +950,7 @@ static struct cmd_tbl cmd_mmc[] = { #if CONFIG_IS_ENABLED(MMC_HW_PARTITIONING) U_BOOT_CMD_MKENT(hwpartition, 28, 0, do_mmc_hwpartition, "", ""), #endif -#ifdef CONFIG_SUPPORT_EMMC_BOOT +#if CONFIG_IS_ENABLED(SUPPORT_EMMC_BOOT) U_BOOT_CMD_MKENT(bootbus, 5, 0, do_mmc_bootbus, "", ""), U_BOOT_CMD_MKENT(bootpart-resize, 4, 0, do_mmc_boot_resize, "", ""), U_BOOT_CMD_MKENT(partconf, 5, 0, do_mmc_partconf, "", ""), @@ -992,6 +992,14 @@ static int do_mmcops(struct cmd_tbl *cmdtp, int flag, int argc, return cp->cmd(cmdtp, flag, argc, argv); } +#if CONFIG_IS_ENABLED(SUPPORT_EMMC_BOOT) +static int do_mmcboot(cmd_tbl_t *cmdtp, int flag, int argc, + char *const argv[]) +{ + return common_diskboot(cmdtp, "mmc", argc, argv); +} +#endif + U_BOOT_CMD( mmc, 29, 1, do_mmcops, "MMC sub system", @@ -1016,7 +1024,7 @@ U_BOOT_CMD( " WARNING: Partitioning is a write-once setting once it is set to complete.\n" " Power cycling is required to initialize partitions after set to complete.\n" #endif -#ifdef CONFIG_SUPPORT_EMMC_BOOT +#if CONFIG_IS_ENABLED(SUPPORT_EMMC_BOOT) "mmc bootbus dev boot_bus_width reset_boot_bus_width boot_mode\n" " - Set the BOOT_BUS_WIDTH field of the specified device\n" "mmc bootpart-resize <dev> <boot part size MB> <RPMB part size MB>\n" @@ -1046,3 +1054,11 @@ U_BOOT_CMD( "display MMC info", "- display info of the current MMC device" ); + +#if CONFIG_IS_ENABLED(SUPPORT_EMMC_BOOT) +U_BOOT_CMD( + mmcboot, 3, 1, do_mmcboot, + "boot from eMMC", + "loadAddr dev:part" +); +#endif -- 2.17.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH] cmd: mmc: add mmcboot command 2020-12-23 19:57 ` [PATCH] cmd: mmc: add mmcboot command Ravik Hasija @ 2020-12-27 22:58 ` Jaehoon Chung 2021-01-01 9:56 ` Heinrich Schuchardt 2020-12-29 3:32 ` Simon Glass 2021-01-04 18:40 ` [PATCH v2] " Ravik Hasija 2 siblings, 1 reply; 9+ messages in thread From: Jaehoon Chung @ 2020-12-27 22:58 UTC (permalink / raw) To: u-boot Hi Ravik, On 12/24/20 4:57 AM, Ravik Hasija wrote: > Similar to usbboot, add command line to boot from raw mmc partition > using common_diskboot(), which supports legacy or FIT images. > > Usage: > mmcboot loadAaddr dev:part > > Where <loadAddr> defaults to CONFIG_SYS_LOAD_ADDR, and <dev:part> > defaults to ${bootdevice}. > > Also fixing config macro usage for CONFIG_SUPPORT_EMMC_BOOT (suggested > by checkpatch.pl). Could you check a build error? > > Signed-off-by: Ravik Hasija <rahasij@linux.microsoft.com> > Signed-off-by: Dhananjay Phadke <dphadke@linux.microsoft.com> > --- > cmd/mmc.c | 22 +++++++++++++++++++--- > 1 file changed, 19 insertions(+), 3 deletions(-) > > diff --git a/cmd/mmc.c b/cmd/mmc.c > index 1529a3e05d..4d134e35a1 100644 > --- a/cmd/mmc.c > +++ b/cmd/mmc.c > @@ -711,7 +711,7 @@ static int do_mmc_hwpartition(struct cmd_tbl *cmdtp, int flag, > } > #endif > > -#ifdef CONFIG_SUPPORT_EMMC_BOOT > +#if CONFIG_IS_ENABLED(SUPPORT_EMMC_BOOT) > static int do_mmc_bootbus(struct cmd_tbl *cmdtp, int flag, > int argc, char *const argv[]) > { > @@ -950,7 +950,7 @@ static struct cmd_tbl cmd_mmc[] = { > #if CONFIG_IS_ENABLED(MMC_HW_PARTITIONING) > U_BOOT_CMD_MKENT(hwpartition, 28, 0, do_mmc_hwpartition, "", ""), > #endif > -#ifdef CONFIG_SUPPORT_EMMC_BOOT > +#if CONFIG_IS_ENABLED(SUPPORT_EMMC_BOOT) > U_BOOT_CMD_MKENT(bootbus, 5, 0, do_mmc_bootbus, "", ""), > U_BOOT_CMD_MKENT(bootpart-resize, 4, 0, do_mmc_boot_resize, "", ""), > U_BOOT_CMD_MKENT(partconf, 5, 0, do_mmc_partconf, "", ""), > @@ -992,6 +992,14 @@ static int do_mmcops(struct cmd_tbl *cmdtp, int flag, int argc, > return cp->cmd(cmdtp, flag, argc, argv); > } > > +#if CONFIG_IS_ENABLED(SUPPORT_EMMC_BOOT) > +static int do_mmcboot(cmd_tbl_t *cmdtp, int flag, int argc, > + char *const argv[]) cmd/mmc.c:996:23: error: unknown type name 'cmd_tbl_t' 996 | static int do_mmcboot(cmd_tbl_t *cmdtp, int flag, int argc, | ^~~~~~~~~ > +{ > + return common_diskboot(cmdtp, "mmc", argc, argv); common_diskboot is depend on CONFIG_CMD_IDE, so i think that you have to enable CMD_IDE. > +} > +#endif > + > U_BOOT_CMD( > mmc, 29, 1, do_mmcops, > "MMC sub system", > @@ -1016,7 +1024,7 @@ U_BOOT_CMD( > " WARNING: Partitioning is a write-once setting once it is set to complete.\n" > " Power cycling is required to initialize partitions after set to complete.\n" > #endif > -#ifdef CONFIG_SUPPORT_EMMC_BOOT > +#if CONFIG_IS_ENABLED(SUPPORT_EMMC_BOOT) > "mmc bootbus dev boot_bus_width reset_boot_bus_width boot_mode\n" > " - Set the BOOT_BUS_WIDTH field of the specified device\n" > "mmc bootpart-resize <dev> <boot part size MB> <RPMB part size MB>\n" > @@ -1046,3 +1054,11 @@ U_BOOT_CMD( > "display MMC info", > "- display info of the current MMC device" > ); > + > +#if CONFIG_IS_ENABLED(SUPPORT_EMMC_BOOT) > +U_BOOT_CMD( > + mmcboot, 3, 1, do_mmcboot, > + "boot from eMMC", > + "loadAddr dev:part" Update the usage which arguments are optional or mandatory with <>, []. Best Regards, Jaehoon Chung > +); > +#endif > ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH] cmd: mmc: add mmcboot command 2020-12-27 22:58 ` Jaehoon Chung @ 2021-01-01 9:56 ` Heinrich Schuchardt 0 siblings, 0 replies; 9+ messages in thread From: Heinrich Schuchardt @ 2021-01-01 9:56 UTC (permalink / raw) To: u-boot On 12/27/20 11:58 PM, Jaehoon Chung wrote: > Hi Ravik, > > On 12/24/20 4:57 AM, Ravik Hasija wrote: >> Similar to usbboot, add command line to boot from raw mmc partition >> using common_diskboot(), which supports legacy or FIT images. >> >> Usage: >> mmcboot loadAaddr dev:part >> >> Where <loadAddr> defaults to CONFIG_SYS_LOAD_ADDR, and <dev:part> >> defaults to ${bootdevice}. >> Please, add a man-page under doc/usage/. You can use doc/usage/button.rst as template. Best regards Heinrich >> Also fixing config macro usage for CONFIG_SUPPORT_EMMC_BOOT (suggested >> by checkpatch.pl). > > Could you check a build error? > >> >> Signed-off-by: Ravik Hasija <rahasij@linux.microsoft.com> >> Signed-off-by: Dhananjay Phadke <dphadke@linux.microsoft.com> >> --- >> cmd/mmc.c | 22 +++++++++++++++++++--- >> 1 file changed, 19 insertions(+), 3 deletions(-) >> >> diff --git a/cmd/mmc.c b/cmd/mmc.c >> index 1529a3e05d..4d134e35a1 100644 >> --- a/cmd/mmc.c >> +++ b/cmd/mmc.c >> @@ -711,7 +711,7 @@ static int do_mmc_hwpartition(struct cmd_tbl *cmdtp, int flag, >> } >> #endif >> >> -#ifdef CONFIG_SUPPORT_EMMC_BOOT >> +#if CONFIG_IS_ENABLED(SUPPORT_EMMC_BOOT) >> static int do_mmc_bootbus(struct cmd_tbl *cmdtp, int flag, >> int argc, char *const argv[]) >> { >> @@ -950,7 +950,7 @@ static struct cmd_tbl cmd_mmc[] = { >> #if CONFIG_IS_ENABLED(MMC_HW_PARTITIONING) >> U_BOOT_CMD_MKENT(hwpartition, 28, 0, do_mmc_hwpartition, "", ""), >> #endif >> -#ifdef CONFIG_SUPPORT_EMMC_BOOT >> +#if CONFIG_IS_ENABLED(SUPPORT_EMMC_BOOT) >> U_BOOT_CMD_MKENT(bootbus, 5, 0, do_mmc_bootbus, "", ""), >> U_BOOT_CMD_MKENT(bootpart-resize, 4, 0, do_mmc_boot_resize, "", ""), >> U_BOOT_CMD_MKENT(partconf, 5, 0, do_mmc_partconf, "", ""), >> @@ -992,6 +992,14 @@ static int do_mmcops(struct cmd_tbl *cmdtp, int flag, int argc, >> return cp->cmd(cmdtp, flag, argc, argv); >> } >> >> +#if CONFIG_IS_ENABLED(SUPPORT_EMMC_BOOT) >> +static int do_mmcboot(cmd_tbl_t *cmdtp, int flag, int argc, >> + char *const argv[]) > > cmd/mmc.c:996:23: error: unknown type name 'cmd_tbl_t' > 996 | static int do_mmcboot(cmd_tbl_t *cmdtp, int flag, int argc, > | ^~~~~~~~~ > > >> +{ >> + return common_diskboot(cmdtp, "mmc", argc, argv); > > common_diskboot is depend on CONFIG_CMD_IDE, so i think that you have to enable CMD_IDE. > >> +} >> +#endif >> + >> U_BOOT_CMD( >> mmc, 29, 1, do_mmcops, >> "MMC sub system", >> @@ -1016,7 +1024,7 @@ U_BOOT_CMD( >> " WARNING: Partitioning is a write-once setting once it is set to complete.\n" >> " Power cycling is required to initialize partitions after set to complete.\n" >> #endif >> -#ifdef CONFIG_SUPPORT_EMMC_BOOT >> +#if CONFIG_IS_ENABLED(SUPPORT_EMMC_BOOT) >> "mmc bootbus dev boot_bus_width reset_boot_bus_width boot_mode\n" >> " - Set the BOOT_BUS_WIDTH field of the specified device\n" >> "mmc bootpart-resize <dev> <boot part size MB> <RPMB part size MB>\n" >> @@ -1046,3 +1054,11 @@ U_BOOT_CMD( >> "display MMC info", >> "- display info of the current MMC device" >> ); >> + >> +#if CONFIG_IS_ENABLED(SUPPORT_EMMC_BOOT) >> +U_BOOT_CMD( >> + mmcboot, 3, 1, do_mmcboot, >> + "boot from eMMC", >> + "loadAddr dev:part" > > Update the usage which arguments are optional or mandatory with <>, []. > >> +); >> +#endif >> > ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH] cmd: mmc: add mmcboot command 2020-12-23 19:57 ` [PATCH] cmd: mmc: add mmcboot command Ravik Hasija 2020-12-27 22:58 ` Jaehoon Chung @ 2020-12-29 3:32 ` Simon Glass 2021-01-04 18:40 ` [PATCH v2] " Ravik Hasija 2 siblings, 0 replies; 9+ messages in thread From: Simon Glass @ 2020-12-29 3:32 UTC (permalink / raw) To: u-boot On Wed, 23 Dec 2020 at 12:57, Ravik Hasija <rahasij@linux.microsoft.com> wrote: > > Similar to usbboot, add command line to boot from raw mmc partition > using common_diskboot(), which supports legacy or FIT images. > > Usage: > mmcboot loadAaddr dev:part > > Where <loadAddr> defaults to CONFIG_SYS_LOAD_ADDR, and <dev:part> > defaults to ${bootdevice}. > > Also fixing config macro usage for CONFIG_SUPPORT_EMMC_BOOT (suggested > by checkpatch.pl). > > Signed-off-by: Ravik Hasija <rahasij@linux.microsoft.com> > Signed-off-by: Dhananjay Phadke <dphadke@linux.microsoft.com> > --- > cmd/mmc.c | 22 +++++++++++++++++++--- > 1 file changed, 19 insertions(+), 3 deletions(-) > Reviewed-by: Simon Glass <sjg@chromium.org> ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2] cmd: mmc: add mmcboot command 2020-12-23 19:57 ` [PATCH] cmd: mmc: add mmcboot command Ravik Hasija 2020-12-27 22:58 ` Jaehoon Chung 2020-12-29 3:32 ` Simon Glass @ 2021-01-04 18:40 ` Ravik Hasija 2021-01-04 19:56 ` Marek Vasut 2021-01-04 23:49 ` Jaehoon Chung 2 siblings, 2 replies; 9+ messages in thread From: Ravik Hasija @ 2021-01-04 18:40 UTC (permalink / raw) To: u-boot Similar to usbboot, add command line to boot from raw mmc partition using common_diskboot(), which supports legacy or FIT images. Usage: mmcboot [loadAaddr] [dev:part] Where [loadAddr] defaults to CONFIG_SYS_LOAD_ADDR, and [dev:part] defaults to ${bootdevice}. Also fixing config macro usage for CONFIG_SUPPORT_EMMC_BOOT (suggested by checkpatch.pl). Signed-off-by: Ravik Hasija <rahasij@linux.microsoft.com> Signed-off-by: Dhananjay Phadke <dphadke@linux.microsoft.com> Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com> Reviewed-by: Simon Glass <sjg@chromium.org> --- v2: * Fixed build failure. * Updated syntax of mmcboot cmd. --- cmd/Makefile | 2 +- cmd/mmc.c | 22 +++++++++++++++++++--- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/cmd/Makefile b/cmd/Makefile index dd86675bf2..573e4776f5 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -97,7 +97,7 @@ obj-$(CONFIG_CMD_MII) += mii.o obj-$(CONFIG_CMD_MISC) += misc.o obj-$(CONFIG_CMD_MDIO) += mdio.o obj-$(CONFIG_CMD_SLEEP) += sleep.o -obj-$(CONFIG_CMD_MMC) += mmc.o +obj-$(CONFIG_CMD_MMC) += mmc.o disk.o obj-$(CONFIG_CMD_OPTEE_RPMB) += optee_rpmb.o obj-$(CONFIG_MP) += mp.o obj-$(CONFIG_CMD_MTD) += mtd.o diff --git a/cmd/mmc.c b/cmd/mmc.c index 1529a3e05d..0c3ed6c108 100644 --- a/cmd/mmc.c +++ b/cmd/mmc.c @@ -711,7 +711,7 @@ static int do_mmc_hwpartition(struct cmd_tbl *cmdtp, int flag, } #endif -#ifdef CONFIG_SUPPORT_EMMC_BOOT +#if CONFIG_IS_ENABLED(SUPPORT_EMMC_BOOT) static int do_mmc_bootbus(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { @@ -950,7 +950,7 @@ static struct cmd_tbl cmd_mmc[] = { #if CONFIG_IS_ENABLED(MMC_HW_PARTITIONING) U_BOOT_CMD_MKENT(hwpartition, 28, 0, do_mmc_hwpartition, "", ""), #endif -#ifdef CONFIG_SUPPORT_EMMC_BOOT +#if CONFIG_IS_ENABLED(SUPPORT_EMMC_BOOT) U_BOOT_CMD_MKENT(bootbus, 5, 0, do_mmc_bootbus, "", ""), U_BOOT_CMD_MKENT(bootpart-resize, 4, 0, do_mmc_boot_resize, "", ""), U_BOOT_CMD_MKENT(partconf, 5, 0, do_mmc_partconf, "", ""), @@ -992,6 +992,14 @@ static int do_mmcops(struct cmd_tbl *cmdtp, int flag, int argc, return cp->cmd(cmdtp, flag, argc, argv); } +#if CONFIG_IS_ENABLED(SUPPORT_EMMC_BOOT) +static int do_mmcboot(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) +{ + return common_diskboot(cmdtp, "mmc", argc, argv); +} +#endif + U_BOOT_CMD( mmc, 29, 1, do_mmcops, "MMC sub system", @@ -1016,7 +1024,7 @@ U_BOOT_CMD( " WARNING: Partitioning is a write-once setting once it is set to complete.\n" " Power cycling is required to initialize partitions after set to complete.\n" #endif -#ifdef CONFIG_SUPPORT_EMMC_BOOT +#if CONFIG_IS_ENABLED(SUPPORT_EMMC_BOOT) "mmc bootbus dev boot_bus_width reset_boot_bus_width boot_mode\n" " - Set the BOOT_BUS_WIDTH field of the specified device\n" "mmc bootpart-resize <dev> <boot part size MB> <RPMB part size MB>\n" @@ -1046,3 +1054,11 @@ U_BOOT_CMD( "display MMC info", "- display info of the current MMC device" ); + +#if CONFIG_IS_ENABLED(SUPPORT_EMMC_BOOT) +U_BOOT_CMD( + mmcboot, 3, 1, do_mmcboot, + "boot from eMMC", + "[loadAddr] [dev:part]" +); +#endif -- 2.17.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v2] cmd: mmc: add mmcboot command 2021-01-04 18:40 ` [PATCH v2] " Ravik Hasija @ 2021-01-04 19:56 ` Marek Vasut 2021-01-05 18:21 ` Ravik Hasija 2021-01-04 23:49 ` Jaehoon Chung 1 sibling, 1 reply; 9+ messages in thread From: Marek Vasut @ 2021-01-04 19:56 UTC (permalink / raw) To: u-boot On 1/4/21 7:40 PM, Ravik Hasija wrote: > Similar to usbboot, add command line to boot from raw mmc partition > using common_diskboot(), which supports legacy or FIT images. > > Usage: > mmcboot [loadAaddr] [dev:part] > > Where [loadAddr] defaults to CONFIG_SYS_LOAD_ADDR, and [dev:part] > defaults to ${bootdevice}. > > Also fixing config macro usage for CONFIG_SUPPORT_EMMC_BOOT (suggested > by checkpatch.pl). Can this not be implemented by some U-Boot script ? I can imagine that reading the first few bytes from the partition (mmc read) would permit you to obtain the uImage/fitImage header from the partition, from which you can obtain the image size, which is the total number of bytes to read (iminfo might help , or fdt header), and then read out the entire image and bootm it. ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2] cmd: mmc: add mmcboot command 2021-01-04 19:56 ` Marek Vasut @ 2021-01-05 18:21 ` Ravik Hasija 0 siblings, 0 replies; 9+ messages in thread From: Ravik Hasija @ 2021-01-05 18:21 UTC (permalink / raw) To: u-boot > Can this not be implemented by some U-Boot script ? > I can imagine that reading the first few bytes from the partition (mmc > read) would permit you to obtain the uImage/fitImage header from the > partition, from which you can obtain the image size, which is the total > number of bytes to read (iminfo might help , or fdt header), and then > read out the entire image and bootm it. Using this command provides the advantage to reduce code replication & maintainence by leveraging existing APIs (common_diskboot) which functionally does the same thing as a uboot script would do read one block, get size from header, read whole image, and bootm it, while additionally doing basic checks. -- Sent from: http://u-boot.10912.n7.nabble.com/ ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2] cmd: mmc: add mmcboot command 2021-01-04 18:40 ` [PATCH v2] " Ravik Hasija 2021-01-04 19:56 ` Marek Vasut @ 2021-01-04 23:49 ` Jaehoon Chung 2021-01-07 20:23 ` Ravik Hasija 1 sibling, 1 reply; 9+ messages in thread From: Jaehoon Chung @ 2021-01-04 23:49 UTC (permalink / raw) To: u-boot On 1/5/21 3:40 AM, Ravik Hasija wrote: > Similar to usbboot, add command line to boot from raw mmc partition > using common_diskboot(), which supports legacy or FIT images. > > Usage: > mmcboot [loadAaddr] [dev:part] > > Where [loadAddr] defaults to CONFIG_SYS_LOAD_ADDR, and [dev:part] > defaults to ${bootdevice}. > > Also fixing config macro usage for CONFIG_SUPPORT_EMMC_BOOT (suggested > by checkpatch.pl). > > Signed-off-by: Ravik Hasija <rahasij@linux.microsoft.com> > Signed-off-by: Dhananjay Phadke <dphadke@linux.microsoft.com> > Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com> > Reviewed-by: Simon Glass <sjg@chromium.org> > --- > v2: > * Fixed build failure. > * Updated syntax of mmcboot cmd. > --- > cmd/Makefile | 2 +- > cmd/mmc.c | 22 +++++++++++++++++++--- > 2 files changed, 20 insertions(+), 4 deletions(-) > > diff --git a/cmd/Makefile b/cmd/Makefile > index dd86675bf2..573e4776f5 100644 > --- a/cmd/Makefile > +++ b/cmd/Makefile > @@ -97,7 +97,7 @@ obj-$(CONFIG_CMD_MII) += mii.o > obj-$(CONFIG_CMD_MISC) += misc.o > obj-$(CONFIG_CMD_MDIO) += mdio.o > obj-$(CONFIG_CMD_SLEEP) += sleep.o > -obj-$(CONFIG_CMD_MMC) += mmc.o > +obj-$(CONFIG_CMD_MMC) += mmc.o disk.o I think that it's not good about building disk.c by default when CONFIG_CMD_MMC is enabled. Best Regards, Jaehoon Chung > obj-$(CONFIG_CMD_OPTEE_RPMB) += optee_rpmb.o > obj-$(CONFIG_MP) += mp.o > obj-$(CONFIG_CMD_MTD) += mtd.o > diff --git a/cmd/mmc.c b/cmd/mmc.c > index 1529a3e05d..0c3ed6c108 100644 > --- a/cmd/mmc.c > +++ b/cmd/mmc.c > @@ -711,7 +711,7 @@ static int do_mmc_hwpartition(struct cmd_tbl *cmdtp, int flag, > } > #endif > > -#ifdef CONFIG_SUPPORT_EMMC_BOOT > +#if CONFIG_IS_ENABLED(SUPPORT_EMMC_BOOT) > static int do_mmc_bootbus(struct cmd_tbl *cmdtp, int flag, > int argc, char *const argv[]) > { > @@ -950,7 +950,7 @@ static struct cmd_tbl cmd_mmc[] = { > #if CONFIG_IS_ENABLED(MMC_HW_PARTITIONING) > U_BOOT_CMD_MKENT(hwpartition, 28, 0, do_mmc_hwpartition, "", ""), > #endif > -#ifdef CONFIG_SUPPORT_EMMC_BOOT > +#if CONFIG_IS_ENABLED(SUPPORT_EMMC_BOOT) > U_BOOT_CMD_MKENT(bootbus, 5, 0, do_mmc_bootbus, "", ""), > U_BOOT_CMD_MKENT(bootpart-resize, 4, 0, do_mmc_boot_resize, "", ""), > U_BOOT_CMD_MKENT(partconf, 5, 0, do_mmc_partconf, "", ""), > @@ -992,6 +992,14 @@ static int do_mmcops(struct cmd_tbl *cmdtp, int flag, int argc, > return cp->cmd(cmdtp, flag, argc, argv); > } > > +#if CONFIG_IS_ENABLED(SUPPORT_EMMC_BOOT) > +static int do_mmcboot(struct cmd_tbl *cmdtp, int flag, int argc, > + char *const argv[]) > +{ > + return common_diskboot(cmdtp, "mmc", argc, argv); > +} > +#endif > + > U_BOOT_CMD( > mmc, 29, 1, do_mmcops, > "MMC sub system", > @@ -1016,7 +1024,7 @@ U_BOOT_CMD( > " WARNING: Partitioning is a write-once setting once it is set to complete.\n" > " Power cycling is required to initialize partitions after set to complete.\n" > #endif > -#ifdef CONFIG_SUPPORT_EMMC_BOOT > +#if CONFIG_IS_ENABLED(SUPPORT_EMMC_BOOT) > "mmc bootbus dev boot_bus_width reset_boot_bus_width boot_mode\n" > " - Set the BOOT_BUS_WIDTH field of the specified device\n" > "mmc bootpart-resize <dev> <boot part size MB> <RPMB part size MB>\n" > @@ -1046,3 +1054,11 @@ U_BOOT_CMD( > "display MMC info", > "- display info of the current MMC device" > ); > + > +#if CONFIG_IS_ENABLED(SUPPORT_EMMC_BOOT) > +U_BOOT_CMD( > + mmcboot, 3, 1, do_mmcboot, > + "boot from eMMC", > + "[loadAddr] [dev:part]" > +); > +#endif > ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2] cmd: mmc: add mmcboot command 2021-01-04 23:49 ` Jaehoon Chung @ 2021-01-07 20:23 ` Ravik Hasija 0 siblings, 0 replies; 9+ messages in thread From: Ravik Hasija @ 2021-01-07 20:23 UTC (permalink / raw) To: u-boot > I think that it's not good about building disk.c by default when CONFIG_CMD_MMC is enabled. Agree, its not an optimal solution. However, we chose to do it this way because: - It causes minimal change to the size of binary (~200 bytes). - To be consistent with upstream code where it is built similarly for usb/scsi etc. -- Sent from: http://u-boot.10912.n7.nabble.com/ ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2021-01-07 20:23 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <CGME20201223195751epcas1p488f3f465492b11d4c8fd328c3b3dc193@epcas1p4.samsung.com>
2020-12-23 19:57 ` [PATCH] cmd: mmc: add mmcboot command Ravik Hasija
2020-12-27 22:58 ` Jaehoon Chung
2021-01-01 9:56 ` Heinrich Schuchardt
2020-12-29 3:32 ` Simon Glass
2021-01-04 18:40 ` [PATCH v2] " Ravik Hasija
2021-01-04 19:56 ` Marek Vasut
2021-01-05 18:21 ` Ravik Hasija
2021-01-04 23:49 ` Jaehoon Chung
2021-01-07 20:23 ` Ravik Hasija
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.