spl: eMMC/SD: Provide one __weak spl_boot_mode() function
Subsystems (10)
PATCH v2 1/1 spl: eMMC/SD: Provide one __weak spl_boot_mode() function
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.
---
Changes in v2:
- Update the code to be applied on top of newest master:
SHA1: b2153075f42c2d46d310778e226bcb11f0af47f5
Travis-Ci:
https://travis-ci.org/lmajewski/u-boot-dfu/builds/336770052
arch/arm/cpu/arm1136/mx35/generic.c | 21 --------------------- arch/arm/cpu/armv7/ls102xa/spl.c | 17 ----------------- arch/arm/cpu/armv8/fsl-layerscape/spl.c | 17 ----------------- arch/arm/cpu/armv8/zynqmp/spl.c | 14 -------------- arch/arm/mach-at91/spl.c | 15 --------------- arch/arm/mach-davinci/spl.c | 5 ----- arch/arm/mach-imx/spl.c | 23 ----------------------- arch/arm/mach-mvebu/spl.c | 7 ------- arch/arm/mach-rockchip/rk3188-board-spl.c | 5 ----- arch/arm/mach-rockchip/rk3288-board-spl.c | 5 ----- arch/arm/mach-rockchip/rk3368-board-spl.c | 5 ----- arch/arm/mach-rockchip/rk3399-board-spl.c | 5 ----- arch/arm/mach-socfpga/spl.c | 11 ----------- arch/arm/mach-sunxi/board.c | 6 ------ arch/arm/mach-zynq/spl.c | 7 ------- common/spl/spl_mmc.c | 11 +++++++++++ 16 files changed, 11 insertions(+), 163 deletions(-)
arch/arm/cpu/arm1136/mx35/generic.c +0 -21
@@ -524,24 +524,3 @@ u32 spl_boot_device(void)return BOOT_DEVICE_NONE ; } - -#ifdef CONFIG_SPL_BUILD -u32 spl_boot_mode (const u32 boot_device) -{ -switch (spl_boot_device ()) { -case BOOT_DEVICE_MMC1 : -#ifdef CONFIG_SPL_FAT_SUPPORT -return MMCSD_MODE_FS ; -#else -return MMCSD_MODE_RAW ; -#endif -break ; -case BOOT_DEVICE_NAND : -return 0 ; -break ; -default : -puts ("spl: ERROR: unsupported device\n" ); -hang (); - } -} -#endif
arch/arm/cpu/armv7/ls102xa/spl.c +0 -17
@@ -14,20 +14,3 @@ u32 spl_boot_device(void)#endif return BOOT_DEVICE_NAND ; } - -u32 spl_boot_mode (const u32 boot_device) -{ -switch (spl_boot_device ()) { -case BOOT_DEVICE_MMC1 : -#ifdef CONFIG_SPL_FAT_SUPPORT -return MMCSD_MODE_FS ; -#else -return MMCSD_MODE_RAW ; -#endif -case BOOT_DEVICE_NAND : -return 0 ; -default : -puts ("spl: error: unsupported device\n" ); -hang (); - } -}
arch/arm/cpu/armv8/fsl-layerscape/spl.c +0 -17
@@ -26,23 +26,6 @@ u32 spl_boot_device(void)return 0 ; } -u32 spl_boot_mode (const u32 boot_device) -{ -switch (spl_boot_device ()) { -case BOOT_DEVICE_MMC1 : -#ifdef CONFIG_SPL_FAT_SUPPORT -return MMCSD_MODE_FS ; -#else -return MMCSD_MODE_RAW ; -#endif -case BOOT_DEVICE_NAND : -return 0 ; -default : -puts ("spl: error: unsupported device\n" ); -hang (); - } -} -#ifdef CONFIG_SPL_BUILD void spl_board_init (void )
arch/arm/cpu/armv8/zynqmp/spl.c +0 -14
@@ -115,20 +115,6 @@ u32 spl_boot_device(void)return 0 ; } -u32 spl_boot_mode (const u32 boot_device) -{ -switch (boot_device) { -case BOOT_DEVICE_RAM : -return 0 ; -case BOOT_DEVICE_MMC1 : -case BOOT_DEVICE_MMC2 : -return MMCSD_MODE_FS ; -default : -puts ("spl: error: unsupported device\n" ); -hang (); - } -} -#ifdef CONFIG_SPL_OS_BOOT int spl_start_uboot (void ) {
arch/arm/mach-at91/spl.c +0 -15
@@ -87,18 +87,3 @@ u32 spl_boot_device(void) return BOOT_DEVICE_NONE; }#endif - -u32 spl_boot_mode (const u32 boot_device) -{ -switch (boot_device) { -#if defined(CONFIG_SYS_USE_MMC ) || defined(CONFIG_SD_BOOT ) -case BOOT_DEVICE_MMC1 : -case BOOT_DEVICE_MMC2 : -return MMCSD_MODE_FS ; -break ; -#endif -case BOOT_DEVICE_NONE : -default : -hang (); - } -}
arch/arm/mach-davinci/spl.c +0 -5
@@ -45,11 +45,6 @@ void spl_board_init(void)preloader_console_init (); } -u32 spl_boot_mode (const u32 boot_device) -{ -return MMCSD_MODE_RAW ; -} -u32 spl_boot_device (void ) {switch (davinci_syscfg_regs->bootcfg) {
arch/arm/mach-imx/spl.c +0 -23
@@ -130,29 +130,6 @@ int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name) }#endif -#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 -#if defined(CONFIG_SECURE_BOOT )/*
arch/arm/mach-mvebu/spl.c +0 -7
@@ -70,13 +70,6 @@ u32 spl_boot_device(void)return get_boot_device (); } -#ifdef CONFIG_SPL_MMC_SUPPORT -u32 spl_boot_mode (const u32 boot_device) -{ -return MMCSD_MODE_RAW ; -} -#endif -void board_init_f (ulong dummy) {int ret;
arch/arm/mach-rockchip/rk3188-board-spl.c +0 -5
@@ -72,11 +72,6 @@ fallback:return BOOT_DEVICE_MMC1 ; } -u32 spl_boot_mode (const u32 boot_device) -{ -return MMCSD_MODE_RAW ; -} -static int setup_arm_clock (void ) {struct udevice *dev;
arch/arm/mach-rockchip/rk3288-board-spl.c +0 -5
@@ -78,11 +78,6 @@ fallback:return BOOT_DEVICE_MMC1 ; } -u32 spl_boot_mode (const u32 boot_device) -{ -return MMCSD_MODE_RAW ; -} -#ifdef CONFIG_SPL_MMC_SUPPORT static int configure_emmc (struct udevice *pinctrl) {
arch/arm/mach-rockchip/rk3368-board-spl.c +0 -5
@@ -57,11 +57,6 @@ void board_init_f(ulong dummy) } } -u32 spl_boot_mode (const u32 boot_device) -{ -return MMCSD_MODE_RAW ; -} -u32 spl_boot_device (void ) {return BOOT_DEVICE_MMC1 ;
arch/arm/mach-rockchip/rk3399-board-spl.c +0 -5
@@ -60,11 +60,6 @@ u32 spl_boot_device(void)return boot_device; } -u32 spl_boot_mode (const u32 boot_device) -{ -return MMCSD_MODE_RAW ; -} -#define TIMER_CHN10_BASE 0xff8680a0#define TIMER_END_COUNT_L 0x00#define TIMER_END_COUNT_H 0x04
arch/arm/mach-socfpga/spl.c +0 -11
@@ -66,17 +66,6 @@ u32 spl_boot_device(void) } } -#ifdef CONFIG_SPL_MMC_SUPPORT -u32 spl_boot_mode (const u32 boot_device) -{ -#if defined(CONFIG_SPL_FAT_SUPPORT ) || defined(CONFIG_SPL_EXT_SUPPORT ) -return MMCSD_MODE_FS ; -#else -return MMCSD_MODE_RAW ; -#endif -} -#endif -#if defined(CONFIG_TARGET_SOCFPGA_GEN5 )static void socfpga_nic301_slave_ns (void ) {
arch/arm/mach-sunxi/board.c +0 -6
@@ -260,12 +260,6 @@ u32 spl_boot_device(void)return sunxi_get_boot_device (); } -/* No confirmation data available in SPL yet. Hardcode bootmode */ -u32 spl_boot_mode (const u32 boot_device) -{ -return MMCSD_MODE_RAW ; -} -void board_init_f (ulong dummy) {spl_init ();
arch/arm/mach-zynq/spl.c +0 -7
@@ -69,13 +69,6 @@ u32 spl_boot_device(void)return mode; } -#ifdef CONFIG_SPL_MMC_SUPPORT -u32 spl_boot_mode (const u32 boot_device) -{ -return MMCSD_MODE_FS ; -} -#endif -#ifdef CONFIG_SPL_OS_BOOT int spl_start_uboot (void ) {
common/spl/spl_mmc.c +11 -0
@@ -281,6 +281,17 @@ static int spl_mmc_do_fs_boot(struct spl_image_info *spl_image, struct mmc *mmc) }#endif +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 +} +int spl_mmc_load_image (struct spl_image_info *spl_image,struct spl_boot_device *bootdev) {
Signature · 1 line
2.11.0
Fabio Estevam
reviewerPATCH v2 1/1 spl: eMMC/SD: Provide one __weak spl_boot_mode() function
Quoted 6 lines · Lukasz Majewski
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 inspl_mmc_load_image()function, which is only compiled in ifCONFIG_SPL_MMC_SUPPORTis enabled.
Quoted 7 lines
To achieve the goal, all per mach/arch implementations eligible for unification has been replaced with one
__weakimplementation.Signed-off-by Lukasz Majewski <[email protected]>Reviewed-by Marek Vasut <[email protected]>Reviewed-by Stefano Babic <[email protected]>
Nice cleanup:
PATCH v2 1/1 spl: eMMC/SD: Provide one __weak spl_boot_mode() function
Quoted 10 lines · Fabio Estevam
Quoted 9 lines · Lukasz Majewski
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 inspl_mmc_load_image()function, which is only compiled in ifCONFIG_SPL_MMC_SUPPORTis enabled.To achieve the goal, all per mach/arch implementations eligible for unification has been replaced with one
__weakimplementation.
Quoted 8 lines
Quoted 4 lines
Signed-off-by Lukasz Majewski <[email protected]>Reviewed-by Marek Vasut <[email protected]>Reviewed-by Stefano Babic <[email protected]>Nice cleanup:
Reviewed-by Fabio Estevam <[email protected]>
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
Part Start Sector Num Sectors UUID Type 1 2048 32768 00000000-01 0c Boot 4 34816 15642624 00000000-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 12000000 ...
Quoted 1 line
Quoted 1 line
OpenBSD/armv7 BOOTARM 1.0
boot>
booting sd0a:/bsd: 4531856+203028+560156 [277405+90+281904+244582]=0x5d6b88
PATCH v2 1/1 spl: eMMC/SD: Provide one __weak spl_boot_mode() function
Hi Jonathan,
Quoted 22 lines · Fabio Estevam
Quoted 12 lines
Quoted 10 lines · Lukasz Majewski
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 inspl_mmc_load_image()function, which is only compiled in ifCONFIG_SPL_MMC_SUPPORTis enabled.To achieve the goal, all per mach/arch implementations eligible for unification has been replaced with one
__weakimplementation.Quoted 8 lines
Quoted 4 lines
Signed-off-by Lukasz Majewski <[email protected]>Reviewed-by Marek Vasut <[email protected]>Reviewed-by Stefano Babic <[email protected]>Nice cleanup:
Reviewed-by Fabio Estevam <[email protected]>
Quoted 8 lines
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_SUPPORTCONFIG_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
Quoted 55 lines
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
Part Start Sector Num Sectors UUID Type 1 2048 32768 00000000-01 0c Boot 4 34816 15642624 00000000-04 a6With 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: 0switch 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 12000000 ...
Quoted 4 lines
Quoted 1 line
Quoted 1 line
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: 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: <http://lists.denx.de/pipermail/u-boot/attachments/20180210/91a6a8a2/attachment.sig>
PATCH v2 1/1 spl: eMMC/SD: Provide one __weak spl_boot_mode() function
Quoted 33 lines · Lukasz Majewski
Hi Jonathan,
Quoted 22 lines · Fabio Estevam
Quoted 12 lines
Quoted 10 lines · Lukasz Majewski
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 inspl_mmc_load_image()function, which is only compiled in ifCONFIG_SPL_MMC_SUPPORTis enabled.To achieve the goal, all per mach/arch implementations eligible for unification has been replaced with one
__weakimplementation.Quoted 8 lines
Quoted 4 lines
Signed-off-by Lukasz Majewski <[email protected]>Reviewed-by Marek Vasut <[email protected]>Reviewed-by Stefano Babic <[email protected]>Nice cleanup:
Reviewed-by Fabio Estevam <[email protected]>Quoted 8 lines
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
Quoted 5 lines
Could you check what is the status of following defines in your .config file:
CONFIG_SPL_FAT_SUPPORTCONFIG_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.
Quoted 3 lines
And if by any chance your don't have:
CONFIG_SPL_EXT_SUPPORTdefined?
CONFIG_SPL_EXT_SUPPORT=yCONFIG_SPL_MMC_SUPPORT=y
mx6cuboxi_defconfig with no changes
Quoted 3 lines
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=4CONFIG_SPL=yCONFIG_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
PATCH v2 1/1 spl: eMMC/SD: Provide one __weak spl_boot_mode() function
Hi Jonathan,
Quoted 46 lines · Lukasz Majewski
Quoted 35 lines
Hi Jonathan,
Quoted 24 lines · Fabio Estevam
Quoted 19 lines
Quoted 11 lines · Lukasz Majewski
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 inspl_mmc_load_image()function, which is only compiled in ifCONFIG_SPL_MMC_SUPPORTis enabled.To achieve the goal, all per mach/arch implementations eligible for unification has been replaced with one
__weakimplementation.Quoted 5 lines
Signed-off-by Lukasz Majewski <[email protected]>Reviewed-by Marek Vasut <[email protected]>Reviewed-by Stefano Babic <[email protected]>ZynqMP)
Quoted 3 lines
Nice cleanup:
Reviewed-by Fabio Estevam <[email protected]>Quoted 8 lines
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 - 0Quoted 5 lines
Could you check what is the status of following defines in your .config file:
CONFIG_SPL_FAT_SUPPORTCONFIG_SUPPORT_EMMC_BOOT"#
CONFIG_SPL_FAT_SUPPORTis not set"
CONFIG_SUPPORT_EMMC_BOOTis not in the .config at all
Quoted 8 lines
CONFIG_SPL_EXT_SUPPORTpreviously for imx6 would result inMMCSD_MODE_RAWbut now it results inMMCSD_MODE_FS.Quoted 3 lines
And if by any chance your don't have:
CONFIG_SPL_EXT_SUPPORTdefined?
CONFIG_SPL_EXT_SUPPORT=y
Could you for test comment out the above define?
Thanks in advance,
Łukasz
Quoted 26 lines
CONFIG_SPL_MMC_SUPPORT=y
mx6cuboxi_defconfigwith no changesQuoted 4 lines
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=yCONFIG_SPL_USE_ARCH_MEMCPY=yCONFIG_SPL_USE_ARCH_MEMSET=yCONFIG_SPL_LDSCRIPT="arch/arm/mach-omap2/u-boot-spl.lds"CONFIG_SPL_GPIO_SUPPORT=yCONFIG_SPL_LIBCOMMON_SUPPORT=yCONFIG_SPL_LIBGENERIC_SUPPORT=yCONFIG_SPL_MMC_SUPPORT=yCONFIG_SPL_SERIAL_SUPPORT=yCONFIG_SPL_LIBDISK_SUPPORT=yCONFIG_SPL_WATCHDOG_SUPPORT=yCONFIG_SPL_SYS_MALLOC_F_LEN=0x400CONFIG_SPL_BOOTSTAGE_RECORD_COUNT=5
Quoted 8 lines
CONFIG_SPL_LOGLEVEL=4CONFIG_SPL=yCONFIG_SPL_LEGACY_IMAGE_SUPPORT=yCONFIG_SPL_EXT_SUPPORT=yCONFIG_SPL_I2C_SUPPORT=yCONFIG_SPL_DOS_PARTITION=yCONFIG_SPL_ISO_PARTITION=yCONFIG_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: 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: <http://lists.denx.de/pipermail/u-boot/attachments/20180210/a4b2995b/attachment.sig>
PATCH v2 1/1 spl: eMMC/SD: Provide one __weak spl_boot_mode() function
Quoted 52 lines · Lukasz Majewski
Hi Jonathan,
Quoted 50 lines · Lukasz Majewski
Quoted 35 lines
Hi Jonathan,
Quoted 24 lines · Fabio Estevam
Quoted 19 lines
Quoted 11 lines · Lukasz Majewski
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 inspl_mmc_load_image()function, which is only compiled in ifCONFIG_SPL_MMC_SUPPORTis enabled.To achieve the goal, all per mach/arch implementations eligible for unification has been replaced with one
__weakimplementation.Quoted 5 lines
Signed-off-by Lukasz Majewski <[email protected]>Reviewed-by Marek Vasut <[email protected]>Reviewed-by Stefano Babic <[email protected]>ZynqMP)
Quoted 3 lines
Nice cleanup:
Reviewed-by Fabio Estevam <[email protected]>Quoted 8 lines
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 - 0Quoted 5 lines
Could you check what is the status of following defines in your .config file:
CONFIG_SPL_FAT_SUPPORTCONFIG_SUPPORT_EMMC_BOOT"#
CONFIG_SPL_FAT_SUPPORTis not set"
CONFIG_SUPPORT_EMMC_BOOTis not in the .config at all
CONFIG_SPL_EXT_SUPPORTpreviously for imx6 would result inMMCSD_MODE_RAWbut now it results inMMCSD_MODE_FS.Quoted 1 line
Quoted 6 lines
Quoted 4 lines
Quoted 2 lines
And if by any chance your don't have:
CONFIG_SPL_EXT_SUPPORTdefined?
CONFIG_SPL_EXT_SUPPORT=yCould 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 ? :)
Signature · 2 lines
Best regards, Marek Vasut
PATCH v2 1/1 spl: eMMC/SD: Provide one __weak spl_boot_mode() function
Quoted 57 lines · On Sat, 10 Feb 2018 11:00:12 +0100 Marek Vasut <[email protected]> wrote:
Quoted 56 lines · Lukasz Majewski
Hi Jonathan,
Quoted 54 lines · Lukasz Majewski
Quoted 36 lines
Hi Jonathan,
Quoted 25 lines
Quoted 19 lines · Fabio Estevam
Quoted 11 lines · Lukasz Majewski
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 inspl_mmc_load_image()function, which is only compiled in ifCONFIG_SPL_MMC_SUPPORTis enabled.To achieve the goal, all per mach/arch implementations eligible for unification has been replaced with one
__weakimplementation.Quoted 5 lines
Signed-off-by Lukasz Majewski <[email protected]>Reviewed-by Marek Vasut <[email protected]>Reviewed-by Stefano Babic <[email protected]>ZynqMP)
Quoted 3 lines
Nice cleanup:
Reviewed-by Fabio Estevam <[email protected]>Quoted 8 lines
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 - 0Quoted 5 lines
Could you check what is the status of following defines in your .config file:
CONFIG_SPL_FAT_SUPPORTCONFIG_SUPPORT_EMMC_BOOT"#
CONFIG_SPL_FAT_SUPPORTis not set"
CONFIG_SUPPORT_EMMC_BOOTis not in the .config at all
CONFIG_SPL_EXT_SUPPORTpreviously for imx6 would result inMMCSD_MODE_RAWbut now it results inMMCSD_MODE_FS.Quoted 3 lines
And if by any chance your don't have:
CONFIG_SPL_EXT_SUPPORTdefined?
Quoted 8 lines
Quoted 3 lines
Quoted 1 line
CONFIG_SPL_EXT_SUPPORT=yCould 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: 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: <http://lists.denx.de/pipermail/u-boot/attachments/20180210/7020dfe0/attachment.sig>
PATCH v2 1/1 spl: eMMC/SD: Provide one __weak spl_boot_mode() function
Quoted 69 lines · Lukasz Majewski
Quoted 57 lines · On Sat, 10 Feb 2018 11:00:12 +0100 Marek Vasut <[email protected]> wrote:
Quoted 56 lines · Lukasz Majewski
Hi Jonathan,
Quoted 54 lines · Lukasz Majewski
Quoted 36 lines
Hi Jonathan,
Quoted 25 lines
Quoted 19 lines · Fabio Estevam
Quoted 11 lines · Lukasz Majewski
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 inspl_mmc_load_image()function, which is only compiled in ifCONFIG_SPL_MMC_SUPPORTis enabled.To achieve the goal, all per mach/arch implementations eligible for unification has been replaced with one
__weakimplementation.Quoted 5 lines
Signed-off-by Lukasz Majewski <[email protected]>Reviewed-by Marek Vasut <[email protected]>Reviewed-by Stefano Babic <[email protected]>ZynqMP)
Quoted 3 lines
Nice cleanup:
Reviewed-by Fabio Estevam <[email protected]>Quoted 8 lines
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 - 0Quoted 5 lines
Could you check what is the status of following defines in your .config file:
CONFIG_SPL_FAT_SUPPORTCONFIG_SUPPORT_EMMC_BOOT"#
CONFIG_SPL_FAT_SUPPORTis not set"
CONFIG_SUPPORT_EMMC_BOOTis not in the .config at all
CONFIG_SPL_EXT_SUPPORTpreviously for imx6 would result inMMCSD_MODE_RAWbut now it results inMMCSD_MODE_FS.Quoted 3 lines
And if by any chance your don't have:
CONFIG_SPL_EXT_SUPPORTdefined?Quoted 8 lines
Quoted 3 lines
Quoted 1 line
CONFIG_SPL_EXT_SUPPORT=yCould 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 ? :)
Quoted 4 lines
The code now in
__weakfunction 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).
Quoted 2 lines
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).
Signature · 2 lines
Best regards, Marek Vasut
PATCH v2 1/1 spl: eMMC/SD: Provide one __weak spl_boot_mode() function
In reply to Lukasz MajewskiQuoted 52 lines · Lukasz Majewski
Hi Jonathan,
Quoted 50 lines · Lukasz Majewski
Quoted 35 lines
Hi Jonathan,
Quoted 24 lines · Fabio Estevam
Quoted 19 lines
Quoted 11 lines · Lukasz Majewski
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 inspl_mmc_load_image()function, which is only compiled in ifCONFIG_SPL_MMC_SUPPORTis enabled.To achieve the goal, all per mach/arch implementations eligible for unification has been replaced with one
__weakimplementation.Quoted 5 lines
Signed-off-by Lukasz Majewski <[email protected]>Reviewed-by Marek Vasut <[email protected]>Reviewed-by Stefano Babic <[email protected]>ZynqMP)
Quoted 3 lines
Nice cleanup:
Reviewed-by Fabio Estevam <[email protected]>Quoted 8 lines
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 - 0Quoted 5 lines
Could you check what is the status of following defines in your .config file:
CONFIG_SPL_FAT_SUPPORTCONFIG_SUPPORT_EMMC_BOOT"#
CONFIG_SPL_FAT_SUPPORTis not set"
CONFIG_SUPPORT_EMMC_BOOTis not in the .config at all
CONFIG_SPL_EXT_SUPPORTpreviously for imx6 would result inMMCSD_MODE_RAWbut now it results inMMCSD_MODE_FS.Quoted 1 line
Quoted 6 lines
Quoted 4 lines
Quoted 2 lines
And if by any chance your don't have:
CONFIG_SPL_EXT_SUPPORTdefined?
CONFIG_SPL_EXT_SUPPORT=yCould 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.
common/spl/spl_mmc.c +1 -1
@@ -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 ;
PATCH v2 1/1 spl: eMMC/SD: Provide one __weak spl_boot_mode() function
Hi Jonathan,
Quoted 69 lines · Lukasz Majewski
Quoted 53 lines
Hi Jonathan,
Quoted 51 lines · Lukasz Majewski
Quoted 36 lines
Hi Jonathan,
Quoted 25 lines
Quoted 19 lines · Fabio Estevam
Quoted 11 lines · Lukasz Majewski
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 inspl_mmc_load_image()function, which is only compiled in ifCONFIG_SPL_MMC_SUPPORTis enabled.To achieve the goal, all per mach/arch implementations eligible for unification has been replaced with one
__weakimplementation.Quoted 5 lines
Signed-off-by Lukasz Majewski <[email protected]>Reviewed-by Marek Vasut <[email protected]>Reviewed-by Stefano Babic <[email protected]>ZynqMP)
Quoted 3 lines
Nice cleanup:
Reviewed-by Fabio Estevam <[email protected]>Quoted 8 lines
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 - 0Quoted 5 lines
Could you check what is the status of following defines in your .config file:
CONFIG_SPL_FAT_SUPPORTCONFIG_SUPPORT_EMMC_BOOT"#
CONFIG_SPL_FAT_SUPPORTis not set"
CONFIG_SUPPORT_EMMC_BOOTis not in the .config at all
CONFIG_SPL_EXT_SUPPORTpreviously for imx6 would result inMMCSD_MODE_RAWbut now it results inMMCSD_MODE_FS.Quoted 1 line
Quoted 6 lines
Quoted 4 lines
Quoted 2 lines
And if by any chance your don't have:
CONFIG_SPL_EXT_SUPPORTdefined?
CONFIG_SPL_EXT_SUPPORT=yCould you for test comment out the above define?
Removing
CONFIG_SPL_EXT_SUPPORT=yfrom the defconfig or using the following diff makes the system boot.common/spl/spl_mmc.c +0
-0
common/spl/spl_mmc.c static int spl_mmc_do_fs_boot(struct · line 289
Quoted 8 lines
common/spl/spl_mmc.c +0
-1@@ -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: 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: <http://lists.denx.de/pipermail/u-boot/attachments/20180210/c664eaee/attachment.sig>
PATCH v2 1/1 spl: eMMC/SD: Provide one __weak spl_boot_mode() function
In reply to Lukasz MajewskiQuoted 6 lines · Lukasz Majewski
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 inspl_mmc_load_image()function, which is only compiled in ifCONFIG_SPL_MMC_SUPPORTis enabled.
Quoted 8 lines
To achieve the goal, all per mach/arch implementations eligible for unification has been replaced with one
__weakimplementation.Signed-off-by Lukasz Majewski <[email protected]>Reviewed-by Marek Vasut <[email protected]>Reviewed-by Stefano Babic <[email protected]>Reviewed-by Fabio Estevam <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180208/20f235e3/attachment.sig>