Re: [U-Boot] [PATCH v2] spl: eMMC/SD: Provide one __weak spl_boot_mode() function
Hi Jonathan, > On Sat, Feb 10, 2018 at 10:57:26AM +0100, Lukasz Majewski wrote: > > Hi Jonathan, > > > > > On Sat, Feb 10, 2018 at 01:45:16AM +0100, Lukasz Majewski wrote: > > > > Hi Jonathan, > > > > > > > > > On Sat, Feb 03, 2018 at 11:00:35AM -0200, Fabio Estevam > > > > > wrote: > > > > > > On Sat, Feb 3, 2018 at 5:29 AM, Lukasz Majewski > > > > > >wrote: > > > > > > > The goal of this patch is to clean up the code related to > > > > > > > choosing SPL MMC boot mode. > > > > > > > > > > > > > > The spl_boot_mode() now is called only in > > > > > > > spl_mmc_load_image() function, which is only compiled in > > > > > > > if CONFIG_SPL_MMC_SUPPORT is enabled. > > > > > > > > > > > > > > To achieve the goal, all per mach/arch implementations > > > > > > > eligible for unification has been replaced with one __weak > > > > > > > implementation. > > > > > > > > > > > > > > Signed-off-by: Lukasz Majewski > > > > > > > Reviewed-by: Marek Vasut > > > > > > > Reviewed-by: Stefano Babic > > > > > > > Acked-by: Michal Simek (For > > > > > > > ZynqMP) > > > > > > > > > > > > Nice cleanup: > > > > > > > > > > > > Reviewed-by: Fabio Estevam > > > > > > > > > > This has broken booting via mmc with mx6cuboxi for me. > > > > > > > > > > SPL loops on > > > > > > > > > > U-Boot SPL 2018.03-rc1-00212-g48914fc119 (Feb 10 2018 - > > > > > 11:04:33 +1300) Trying to boot from MMC1 > > > > > Failed to mount ext2 filesystem... > > > > > spl_load_image_ext: ext4fs mount err - 0 > > > > > > > > Could you check what is the status of following defines in > > > > your .config file: > > > > > > > > CONFIG_SPL_FAT_SUPPORT > > > > CONFIG_SUPPORT_EMMC_BOOT > > > > > > "# CONFIG_SPL_FAT_SUPPORT is not set" > > > > > > CONFIG_SUPPORT_EMMC_BOOT is not in the .config at all > > > > > > CONFIG_SPL_EXT_SUPPORT previously for imx6 would result in > > > MMCSD_MODE_RAW but now it results in MMCSD_MODE_FS. > > > > > > > > > > > And if by any chance your don't have: > > > > CONFIG_SPL_EXT_SUPPORT defined? > > > > > > CONFIG_SPL_EXT_SUPPORT=y > > > > Could you for test comment out the above define? > > Removing CONFIG_SPL_EXT_SUPPORT=y from the defconfig or using the > following diff makes the system boot. > > diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c > index 351f4edd41..1541a4837d 100644 > --- a/common/spl/spl_mmc.c > +++ b/common/spl/spl_mmc.c > @@ -283,7 +283,7 @@ static int spl_mmc_do_fs_boot(struct > spl_image_info *spl_image, struct mmc *mmc) > u32 __weak spl_boot_mode(const u32 boot_device) > { > -#if defined(CONFIG_SPL_FAT_SUPPORT) || > defined(CONFIG_SPL_EXT_SUPPORT) +#if defined(CONFIG_SPL_FAT_SUPPORT) > return MMCSD_MODE_FS; > #elif defined(CONFIG_SUPPORT_EMMC_BOOT) > return MMCSD_MODE_EMMCBOOT; Original iMX code (CONFIG_SPL_EXT_SUPPORT is not taken into account at all): -#if defined(CONFIG_SPL_MMC_SUPPORT) -/* called from spl_mmc to see type of boot mode for storage (RAW or FAT) */ -u32 spl_boot_mode(const u32 boot_device) -{ - switch (spl_boot_device()) { - /* for MMC return either RAW or FAT mode */ - case BOOT_DEVICE_MMC1: - case BOOT_DEVICE_MMC2: -#if defined(CONFIG_SPL_FAT_SUPPORT) - return MMCSD_MODE_FS; -#elif defined(CONFIG_SUPPORT_EMMC_BOOT) - return MMCSD_MODE_EMMCBOOT; -#else - return MMCSD_MODE_RAW; -#endif - break; - default: - puts("spl: ERROR: unsupported device\n"); - hang(); - } -} -#endif Current code (socfpga): +u32 __weak spl_boot_mode(const u32 boot_device) +{ +#if defined(CONFIG_SPL_FAT_SUPPORT) || defined(CONFIG_SPL_EXT_SUPPORT) + return MMCSD_MODE_FS; +#elif defined(CONFIG_SUPPORT_EMMC_BOOT) + return MMCSD_MODE_EMMCBOOT; +#else + return MMCSD_MODE_RAW; +#endif +} So with the original iMX code the MMCSD_MODE_RAW is returned even when you do have CONFIG_SPL_EXT_SUPPORT enabled. 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: w...@denx.de pgpRZHHKmFRR1.pgp Description: OpenPGP digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v2] spl: eMMC/SD: Provide one __weak spl_boot_mode() function
On Sat, Feb 10, 2018 at 10:57:26AM +0100, Lukasz Majewski wrote: > Hi Jonathan, > > > On Sat, Feb 10, 2018 at 01:45:16AM +0100, Lukasz Majewski wrote: > > > Hi Jonathan, > > > > > > > On Sat, Feb 03, 2018 at 11:00:35AM -0200, Fabio Estevam wrote: > > > > > On Sat, Feb 3, 2018 at 5:29 AM, Lukasz Majewski> > > > > wrote: > > > > > > The goal of this patch is to clean up the code related to > > > > > > choosing SPL MMC boot mode. > > > > > > > > > > > > The spl_boot_mode() now is called only in spl_mmc_load_image() > > > > > > function, which is only compiled in if CONFIG_SPL_MMC_SUPPORT > > > > > > is enabled. > > > > > > > > > > > > To achieve the goal, all per mach/arch implementations > > > > > > eligible for unification has been replaced with one __weak > > > > > > implementation. > > > > > > > > > > > > Signed-off-by: Lukasz Majewski > > > > > > Reviewed-by: Marek Vasut > > > > > > Reviewed-by: Stefano Babic > > > > > > Acked-by: Michal Simek (For > > > > > > ZynqMP) > > > > > > > > > > Nice cleanup: > > > > > > > > > > Reviewed-by: Fabio Estevam > > > > > > > > This has broken booting via mmc with mx6cuboxi for me. > > > > > > > > SPL loops on > > > > > > > > U-Boot SPL 2018.03-rc1-00212-g48914fc119 (Feb 10 2018 - 11:04:33 > > > > +1300) Trying to boot from MMC1 > > > > Failed to mount ext2 filesystem... > > > > spl_load_image_ext: ext4fs mount err - 0 > > > > > > Could you check what is the status of following defines in > > > your .config file: > > > > > > CONFIG_SPL_FAT_SUPPORT > > > CONFIG_SUPPORT_EMMC_BOOT > > > > "# CONFIG_SPL_FAT_SUPPORT is not set" > > > > CONFIG_SUPPORT_EMMC_BOOT is not in the .config at all > > > > CONFIG_SPL_EXT_SUPPORT previously for imx6 would result in > > MMCSD_MODE_RAW but now it results in MMCSD_MODE_FS. > > > > > > > > And if by any chance your don't have: > > > CONFIG_SPL_EXT_SUPPORT defined? > > > > CONFIG_SPL_EXT_SUPPORT=y > > Could you for test comment out the above define? Removing CONFIG_SPL_EXT_SUPPORT=y from the defconfig or using the following diff makes the system boot. diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index 351f4edd41..1541a4837d 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -283,7 +283,7 @@ static int spl_mmc_do_fs_boot(struct spl_image_info *spl_image, struct mmc *mmc) u32 __weak spl_boot_mode(const u32 boot_device) { -#if defined(CONFIG_SPL_FAT_SUPPORT) || defined(CONFIG_SPL_EXT_SUPPORT) +#if defined(CONFIG_SPL_FAT_SUPPORT) return MMCSD_MODE_FS; #elif defined(CONFIG_SUPPORT_EMMC_BOOT) return MMCSD_MODE_EMMCBOOT; ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v2] spl: eMMC/SD: Provide one __weak spl_boot_mode() function
On 02/10/2018 11:25 AM, Lukasz Majewski wrote: > On Sat, 10 Feb 2018 11:00:12 +0100 > Marek Vasutwrote: > >> On 02/10/2018 10:57 AM, Lukasz Majewski wrote: >>> Hi Jonathan, >>> On Sat, Feb 10, 2018 at 01:45:16AM +0100, Lukasz Majewski wrote: > Hi Jonathan, > >> On Sat, Feb 03, 2018 at 11:00:35AM -0200, Fabio Estevam >> wrote: >>> On Sat, Feb 3, 2018 at 5:29 AM, Lukasz Majewski >>> wrote: The goal of this patch is to clean up the code related to choosing SPL MMC boot mode. The spl_boot_mode() now is called only in spl_mmc_load_image() function, which is only compiled in if CONFIG_SPL_MMC_SUPPORT is enabled. To achieve the goal, all per mach/arch implementations eligible for unification has been replaced with one __weak implementation. Signed-off-by: Lukasz Majewski Reviewed-by: Marek Vasut Reviewed-by: Stefano Babic Acked-by: Michal Simek (For ZynqMP) >>> >>> Nice cleanup: >>> >>> Reviewed-by: Fabio Estevam >> >> This has broken booting via mmc with mx6cuboxi for me. >> >> SPL loops on >> >> U-Boot SPL 2018.03-rc1-00212-g48914fc119 (Feb 10 2018 - 11:04:33 >> +1300) Trying to boot from MMC1 >> Failed to mount ext2 filesystem... >> spl_load_image_ext: ext4fs mount err - 0 > > Could you check what is the status of following defines in > your .config file: > > CONFIG_SPL_FAT_SUPPORT > CONFIG_SUPPORT_EMMC_BOOT "# CONFIG_SPL_FAT_SUPPORT is not set" CONFIG_SUPPORT_EMMC_BOOT is not in the .config at all CONFIG_SPL_EXT_SUPPORT previously for imx6 would result in MMCSD_MODE_RAW but now it results in MMCSD_MODE_FS. > > And if by any chance your don't have: > CONFIG_SPL_EXT_SUPPORT defined? CONFIG_SPL_EXT_SUPPORT=y >>> >>> Could you for test comment out the above define? >> >> If you look at the logic in spl_mmc.c , you'll see this will work. But >> what about users who have EXT enabled and want to use it as fallback >> after loading from RAW failed ? :) >> > > The code now in __weak function has been took directly from socfpga > port (as looked as clean and simple). > > Apparently, this port did not provide such fallback facility :-) That's correct (for reasons which are beyond the scope of this discussion). > It seems to me that the code from imx function would need to be used > instead. The code in IMX will fail if you have only CONFIG_SPL_FAT_SUPPORT enabled in SPL . Give it some more thought and look esp. for the case fallthroughs in the spl_mmc code, that makes it nasty. The RAW support is there only to support legacy stuff until those ports discover filesystems and their benefits (IMO). -- Best regards, Marek Vasut ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v2] spl: eMMC/SD: Provide one __weak spl_boot_mode() function
On Sat, 10 Feb 2018 11:00:12 +0100 Marek Vasutwrote: > On 02/10/2018 10:57 AM, Lukasz Majewski wrote: > > Hi Jonathan, > > > >> On Sat, Feb 10, 2018 at 01:45:16AM +0100, Lukasz Majewski wrote: > >>> Hi Jonathan, > >>> > On Sat, Feb 03, 2018 at 11:00:35AM -0200, Fabio Estevam > wrote: > > On Sat, Feb 3, 2018 at 5:29 AM, Lukasz Majewski > > wrote: > >> The goal of this patch is to clean up the code related to > >> choosing SPL MMC boot mode. > >> > >> The spl_boot_mode() now is called only in spl_mmc_load_image() > >> function, which is only compiled in if CONFIG_SPL_MMC_SUPPORT > >> is enabled. > >> > >> To achieve the goal, all per mach/arch implementations > >> eligible for unification has been replaced with one __weak > >> implementation. > >> > >> Signed-off-by: Lukasz Majewski > >> Reviewed-by: Marek Vasut > >> Reviewed-by: Stefano Babic > >> Acked-by: Michal Simek (For > >> ZynqMP) > > > > Nice cleanup: > > > > Reviewed-by: Fabio Estevam > > This has broken booting via mmc with mx6cuboxi for me. > > SPL loops on > > U-Boot SPL 2018.03-rc1-00212-g48914fc119 (Feb 10 2018 - 11:04:33 > +1300) Trying to boot from MMC1 > Failed to mount ext2 filesystem... > spl_load_image_ext: ext4fs mount err - 0 > >>> > >>> Could you check what is the status of following defines in > >>> your .config file: > >>> > >>> CONFIG_SPL_FAT_SUPPORT > >>> CONFIG_SUPPORT_EMMC_BOOT > >> > >> "# CONFIG_SPL_FAT_SUPPORT is not set" > >> > >> CONFIG_SUPPORT_EMMC_BOOT is not in the .config at all > >> > >> CONFIG_SPL_EXT_SUPPORT previously for imx6 would result in > >> MMCSD_MODE_RAW but now it results in MMCSD_MODE_FS. > >> > >>> > >>> And if by any chance your don't have: > >>> CONFIG_SPL_EXT_SUPPORT defined? > >> > >> CONFIG_SPL_EXT_SUPPORT=y > > > > Could you for test comment out the above define? > > If you look at the logic in spl_mmc.c , you'll see this will work. But > what about users who have EXT enabled and want to use it as fallback > after loading from RAW failed ? :) > The code now in __weak function has been took directly from socfpga port (as looked as clean and simple). Apparently, this port did not provide such fallback facility :-) It seems to me that the code from imx function would need to be used instead. 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: w...@denx.de pgpCEEkJy_3e8.pgp Description: OpenPGP digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v2] spl: eMMC/SD: Provide one __weak spl_boot_mode() function
On 02/10/2018 10:57 AM, Lukasz Majewski wrote: > Hi Jonathan, > >> On Sat, Feb 10, 2018 at 01:45:16AM +0100, Lukasz Majewski wrote: >>> Hi Jonathan, >>> On Sat, Feb 03, 2018 at 11:00:35AM -0200, Fabio Estevam wrote: > On Sat, Feb 3, 2018 at 5:29 AM, Lukasz Majewski> wrote: >> The goal of this patch is to clean up the code related to >> choosing SPL MMC boot mode. >> >> The spl_boot_mode() now is called only in spl_mmc_load_image() >> function, which is only compiled in if CONFIG_SPL_MMC_SUPPORT >> is enabled. >> >> To achieve the goal, all per mach/arch implementations >> eligible for unification has been replaced with one __weak >> implementation. >> >> Signed-off-by: Lukasz Majewski >> Reviewed-by: Marek Vasut >> Reviewed-by: Stefano Babic >> Acked-by: Michal Simek (For >> ZynqMP) > > Nice cleanup: > > Reviewed-by: Fabio Estevam This has broken booting via mmc with mx6cuboxi for me. SPL loops on U-Boot SPL 2018.03-rc1-00212-g48914fc119 (Feb 10 2018 - 11:04:33 +1300) Trying to boot from MMC1 Failed to mount ext2 filesystem... spl_load_image_ext: ext4fs mount err - 0 >>> >>> Could you check what is the status of following defines in >>> your .config file: >>> >>> CONFIG_SPL_FAT_SUPPORT >>> CONFIG_SUPPORT_EMMC_BOOT >> >> "# CONFIG_SPL_FAT_SUPPORT is not set" >> >> CONFIG_SUPPORT_EMMC_BOOT is not in the .config at all >> >> CONFIG_SPL_EXT_SUPPORT previously for imx6 would result in >> MMCSD_MODE_RAW but now it results in MMCSD_MODE_FS. >> >>> >>> And if by any chance your don't have: >>> CONFIG_SPL_EXT_SUPPORT defined? >> >> CONFIG_SPL_EXT_SUPPORT=y > > Could you for test comment out the above define? If you look at the logic in spl_mmc.c , you'll see this will work. But what about users who have EXT enabled and want to use it as fallback after loading from RAW failed ? :) -- Best regards, Marek Vasut ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v2] spl: eMMC/SD: Provide one __weak spl_boot_mode() function
Hi Jonathan, > On Sat, Feb 10, 2018 at 01:45:16AM +0100, Lukasz Majewski wrote: > > Hi Jonathan, > > > > > On Sat, Feb 03, 2018 at 11:00:35AM -0200, Fabio Estevam wrote: > > > > On Sat, Feb 3, 2018 at 5:29 AM, Lukasz Majewski> > > > wrote: > > > > > The goal of this patch is to clean up the code related to > > > > > choosing SPL MMC boot mode. > > > > > > > > > > The spl_boot_mode() now is called only in spl_mmc_load_image() > > > > > function, which is only compiled in if CONFIG_SPL_MMC_SUPPORT > > > > > is enabled. > > > > > > > > > > To achieve the goal, all per mach/arch implementations > > > > > eligible for unification has been replaced with one __weak > > > > > implementation. > > > > > > > > > > Signed-off-by: Lukasz Majewski > > > > > Reviewed-by: Marek Vasut > > > > > Reviewed-by: Stefano Babic > > > > > Acked-by: Michal Simek (For > > > > > ZynqMP) > > > > > > > > Nice cleanup: > > > > > > > > Reviewed-by: Fabio Estevam > > > > > > This has broken booting via mmc with mx6cuboxi for me. > > > > > > SPL loops on > > > > > > U-Boot SPL 2018.03-rc1-00212-g48914fc119 (Feb 10 2018 - 11:04:33 > > > +1300) Trying to boot from MMC1 > > > Failed to mount ext2 filesystem... > > > spl_load_image_ext: ext4fs mount err - 0 > > > > Could you check what is the status of following defines in > > your .config file: > > > > CONFIG_SPL_FAT_SUPPORT > > CONFIG_SUPPORT_EMMC_BOOT > > "# CONFIG_SPL_FAT_SUPPORT is not set" > > CONFIG_SUPPORT_EMMC_BOOT is not in the .config at all > > CONFIG_SPL_EXT_SUPPORT previously for imx6 would result in > MMCSD_MODE_RAW but now it results in MMCSD_MODE_FS. > > > > > And if by any chance your don't have: > > CONFIG_SPL_EXT_SUPPORT defined? > > CONFIG_SPL_EXT_SUPPORT=y Could you for test comment out the above define? Thanks in advance, Łukasz > CONFIG_SPL_MMC_SUPPORT=y > > mx6cuboxi_defconfig with no changes > > > > > From what you have written above I assume that you boot from the > > same medium - i.e. eMMC (so SPL and u-boot.img are on the same > > medium) ? > > Both SPL and u-boot.img are on a microsd card. > > The set CONFIG_SPL_* in .config are > > CONFIG_SPL_SYS_THUMB_BUILD=y > CONFIG_SPL_USE_ARCH_MEMCPY=y > CONFIG_SPL_USE_ARCH_MEMSET=y > CONFIG_SPL_LDSCRIPT="arch/arm/mach-omap2/u-boot-spl.lds" > CONFIG_SPL_GPIO_SUPPORT=y > CONFIG_SPL_LIBCOMMON_SUPPORT=y > CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_SPL_MMC_SUPPORT=y > CONFIG_SPL_SERIAL_SUPPORT=y > CONFIG_SPL_LIBDISK_SUPPORT=y > CONFIG_SPL_WATCHDOG_SUPPORT=y > CONFIG_SPL_SYS_MALLOC_F_LEN=0x400 > CONFIG_SPL_BOOTSTAGE_RECORD_COUNT=5 > CONFIG_SPL_LOGLEVEL=4 > CONFIG_SPL=y > CONFIG_SPL_LEGACY_IMAGE_SUPPORT=y > CONFIG_SPL_EXT_SUPPORT=y > CONFIG_SPL_I2C_SUPPORT=y > CONFIG_SPL_DOS_PARTITION=y > CONFIG_SPL_ISO_PARTITION=y > CONFIG_SPL_EFI_PARTITION=y 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: w...@denx.de pgpDeOMz56_VG.pgp Description: OpenPGP digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v2] spl: eMMC/SD: Provide one __weak spl_boot_mode() function
On Sat, Feb 10, 2018 at 01:45:16AM +0100, Lukasz Majewski wrote: > Hi Jonathan, > > > On Sat, Feb 03, 2018 at 11:00:35AM -0200, Fabio Estevam wrote: > > > On Sat, Feb 3, 2018 at 5:29 AM, Lukasz Majewski> > > wrote: > > > > The goal of this patch is to clean up the code related to > > > > choosing SPL MMC boot mode. > > > > > > > > The spl_boot_mode() now is called only in spl_mmc_load_image() > > > > function, which is only compiled in if CONFIG_SPL_MMC_SUPPORT is > > > > enabled. > > > > > > > > To achieve the goal, all per mach/arch implementations eligible > > > > for unification has been replaced with one __weak implementation. > > > > > > > > Signed-off-by: Lukasz Majewski > > > > Reviewed-by: Marek Vasut > > > > Reviewed-by: Stefano Babic > > > > Acked-by: Michal Simek (For ZynqMP) > > > > > > Nice cleanup: > > > > > > Reviewed-by: Fabio Estevam > > > > This has broken booting via mmc with mx6cuboxi for me. > > > > SPL loops on > > > > U-Boot SPL 2018.03-rc1-00212-g48914fc119 (Feb 10 2018 - 11:04:33 > > +1300) Trying to boot from MMC1 > > Failed to mount ext2 filesystem... > > spl_load_image_ext: ext4fs mount err - 0 > > Could you check what is the status of following defines in your .config > file: > > CONFIG_SPL_FAT_SUPPORT > CONFIG_SUPPORT_EMMC_BOOT "# CONFIG_SPL_FAT_SUPPORT is not set" CONFIG_SUPPORT_EMMC_BOOT is not in the .config at all CONFIG_SPL_EXT_SUPPORT previously for imx6 would result in MMCSD_MODE_RAW but now it results in MMCSD_MODE_FS. > > And if by any chance your don't have: > CONFIG_SPL_EXT_SUPPORT defined? CONFIG_SPL_EXT_SUPPORT=y CONFIG_SPL_MMC_SUPPORT=y mx6cuboxi_defconfig with no changes > > From what you have written above I assume that you boot from the > same medium - i.e. eMMC (so SPL and u-boot.img are on the same medium) ? Both SPL and u-boot.img are on a microsd card. The set CONFIG_SPL_* in .config are CONFIG_SPL_SYS_THUMB_BUILD=y CONFIG_SPL_USE_ARCH_MEMCPY=y CONFIG_SPL_USE_ARCH_MEMSET=y CONFIG_SPL_LDSCRIPT="arch/arm/mach-omap2/u-boot-spl.lds" CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_SPL_SYS_MALLOC_F_LEN=0x400 CONFIG_SPL_BOOTSTAGE_RECORD_COUNT=5 CONFIG_SPL_LOGLEVEL=4 CONFIG_SPL=y CONFIG_SPL_LEGACY_IMAGE_SUPPORT=y CONFIG_SPL_EXT_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_DOS_PARTITION=y CONFIG_SPL_ISO_PARTITION=y CONFIG_SPL_EFI_PARTITION=y ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v2] spl: eMMC/SD: Provide one __weak spl_boot_mode() function
Hi Jonathan, > On Sat, Feb 03, 2018 at 11:00:35AM -0200, Fabio Estevam wrote: > > On Sat, Feb 3, 2018 at 5:29 AM, Lukasz Majewski> > wrote: > > > The goal of this patch is to clean up the code related to > > > choosing SPL MMC boot mode. > > > > > > The spl_boot_mode() now is called only in spl_mmc_load_image() > > > function, which is only compiled in if CONFIG_SPL_MMC_SUPPORT is > > > enabled. > > > > > > To achieve the goal, all per mach/arch implementations eligible > > > for unification has been replaced with one __weak implementation. > > > > > > Signed-off-by: Lukasz Majewski > > > Reviewed-by: Marek Vasut > > > Reviewed-by: Stefano Babic > > > Acked-by: Michal Simek (For ZynqMP) > > > > Nice cleanup: > > > > Reviewed-by: Fabio Estevam > > This has broken booting via mmc with mx6cuboxi for me. > > SPL loops on > > U-Boot SPL 2018.03-rc1-00212-g48914fc119 (Feb 10 2018 - 11:04:33 > +1300) Trying to boot from MMC1 > Failed to mount ext2 filesystem... > spl_load_image_ext: ext4fs mount err - 0 Could you check what is the status of following defines in your .config file: CONFIG_SPL_FAT_SUPPORT CONFIG_SUPPORT_EMMC_BOOT And if by any chance your don't have: CONFIG_SPL_EXT_SUPPORT defined? From what you have written above I assume that you boot from the same medium - i.e. eMMC (so SPL and u-boot.img are on the same medium) ? Best regards, Łukasz Majewski > > There is no ext2/ext3/ext4 fs, next U-Boot stage is raw, ie > > dd if=mx6cuboxi/SPL of=/dev/sd2c bs=1024 seek=1 > dd if=mx6cuboxi/u-boot.img of=/dev/sd2c bs=1024 seek=69 > > => part list mmc 0 > > Partition Map for MMC device 0 -- Partition Type: DOS > > PartStart SectorNum Sectors UUIDType > 1 204832768 -01 0c Boot > 4 34816 15642624-04 a6 > > With this commit reverted: > > U-Boot SPL 2018.03-rc1-00214-ge3f2485203 (Feb 10 2018 - 12:38:46 > +1300) Trying to boot from MMC1 > > > U-Boot 2018.03-rc1-00214-ge3f2485203 (Feb 10 2018 - 12:38:46 +1300) > > CPU: Freescale i.MX6Q rev1.5 996 MHz (running at 792 MHz) > CPU: Extended Commercial temperature grade (-20C to 105C) at 27C > Reset cause: POR > Board: MX6 Cubox-i > DRAM: 2 GiB > MMC: FSL_SDHC: 0 > Loading Environment from MMC... OK > No panel detected: default to HDMI > Display: HDMI (1024x768) > In:serial > Out: serial > Err: serial > Net: FEC > Hit any key to stop autoboot: 0 > switch to partitions #0, OK > mmc0 is current device > Scanning mmc 0:1... > 37503 bytes read in 18 ms (2 MiB/s) > Found EFI removable media binary efi/boot/bootarm.efi > Scanning disks on usb... > Disk usb0 not ready > Disk usb1 not ready > Disk usb2 not ready > Disk usb3 not ready > Scanning disks on mmc... > MMC Device 1 not found > MMC Device 2 not found > MMC Device 3 not found > Scanning disks on sata... > Disk sata0 not ready > Found 3 disks > 76528 bytes read in 30 ms (2.4 MiB/s) > ## Starting EFI application at 1200 ... > >> OpenBSD/armv7 BOOTARM 1.0 > boot> > booting sd0a:/bsd: 4531856+203028+560156 > [277405+90+281904+244582]=0x5d6b88 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: w...@denx.de pgp2z7p_p4_c4.pgp Description: OpenPGP digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v2] spl: eMMC/SD: Provide one __weak spl_boot_mode() function
On Sat, Feb 03, 2018 at 11:00:35AM -0200, Fabio Estevam wrote: > On Sat, Feb 3, 2018 at 5:29 AM, Lukasz Majewskiwrote: > > The goal of this patch is to clean up the code related to choosing SPL > > MMC boot mode. > > > > The spl_boot_mode() now is called only in spl_mmc_load_image() function, > > which is only compiled in if CONFIG_SPL_MMC_SUPPORT is enabled. > > > > To achieve the goal, all per mach/arch implementations eligible for > > unification has been replaced with one __weak implementation. > > > > Signed-off-by: Lukasz Majewski > > Reviewed-by: Marek Vasut > > Reviewed-by: Stefano Babic > > Acked-by: Michal Simek (For ZynqMP) > > Nice cleanup: > > Reviewed-by: Fabio Estevam This has broken booting via mmc with mx6cuboxi for me. SPL loops on U-Boot SPL 2018.03-rc1-00212-g48914fc119 (Feb 10 2018 - 11:04:33 +1300) Trying to boot from MMC1 Failed to mount ext2 filesystem... spl_load_image_ext: ext4fs mount err - 0 There is no ext2/ext3/ext4 fs, next U-Boot stage is raw, ie dd if=mx6cuboxi/SPL of=/dev/sd2c bs=1024 seek=1 dd if=mx6cuboxi/u-boot.img of=/dev/sd2c bs=1024 seek=69 => part list mmc 0 Partition Map for MMC device 0 -- Partition Type: DOS PartStart SectorNum Sectors UUIDType 1 204832768 -01 0c Boot 4 34816 15642624-04 a6 With this commit reverted: U-Boot SPL 2018.03-rc1-00214-ge3f2485203 (Feb 10 2018 - 12:38:46 +1300) Trying to boot from MMC1 U-Boot 2018.03-rc1-00214-ge3f2485203 (Feb 10 2018 - 12:38:46 +1300) CPU: Freescale i.MX6Q rev1.5 996 MHz (running at 792 MHz) CPU: Extended Commercial temperature grade (-20C to 105C) at 27C Reset cause: POR Board: MX6 Cubox-i DRAM: 2 GiB MMC: FSL_SDHC: 0 Loading Environment from MMC... OK No panel detected: default to HDMI Display: HDMI (1024x768) In:serial Out: serial Err: serial Net: FEC Hit any key to stop autoboot: 0 switch to partitions #0, OK mmc0 is current device Scanning mmc 0:1... 37503 bytes read in 18 ms (2 MiB/s) Found EFI removable media binary efi/boot/bootarm.efi Scanning disks on usb... Disk usb0 not ready Disk usb1 not ready Disk usb2 not ready Disk usb3 not ready Scanning disks on mmc... MMC Device 1 not found MMC Device 2 not found MMC Device 3 not found Scanning disks on sata... Disk sata0 not ready Found 3 disks 76528 bytes read in 30 ms (2.4 MiB/s) ## Starting EFI application at 1200 ... >> OpenBSD/armv7 BOOTARM 1.0 boot> booting sd0a:/bsd: 4531856+203028+560156 [277405+90+281904+244582]=0x5d6b88 ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v2] spl: eMMC/SD: Provide one __weak spl_boot_mode() function
On Sat, Feb 3, 2018 at 5:29 AM, Lukasz Majewskiwrote: > The goal of this patch is to clean up the code related to choosing SPL > MMC boot mode. > > The spl_boot_mode() now is called only in spl_mmc_load_image() function, > which is only compiled in if CONFIG_SPL_MMC_SUPPORT is enabled. > > To achieve the goal, all per mach/arch implementations eligible for > unification has been replaced with one __weak implementation. > > Signed-off-by: Lukasz Majewski > Reviewed-by: Marek Vasut > Reviewed-by: Stefano Babic > Acked-by: Michal Simek (For ZynqMP) Nice cleanup: Reviewed-by: Fabio Estevam ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot