ti: boot: Register the MMC controllers in SPL in the same way as in u-boot
Subsystems (3)
PATCH 1/1 ti: boot: Register the MMC controllers in SPL in the same way as in u-boot
To keep a consistent MMC device mapping in SPL and in u-boot, let's register the MMC controllers the same way in u-boot and in the SPL. In terms of boot time, it doesn't hurt to register more controllers than needed because the MMC device is initialized only prior being accessed for the first time.
Having the same device mapping in SPL and u-boot allows us to use the environment in SPL whatever the MMC boot device.
---
This has been tested on DRA7 platforms, AM437x Starter Kit and Beaglebone Black. I also checked that building the TI-based platforms was okay using buildman:tools/buildman/buildman -d -e -l omap am33 davinci
arch/arm/mach-omap2/am33xx/board.c | 2 +- arch/arm/mach-omap2/boot-common.c | 15 --------------- board/BuR/common/common.c | 2 +- board/amazon/kc1/kc1.c | 2 -- board/compulab/cm_t35/cm_t35.c | 2 +- board/compulab/cm_t3517/cm_t3517.c | 2 +- board/compulab/cm_t54/cm_t54.c | 2 +- board/corscience/tricorder/tricorder.c | 2 +- board/gumstix/duovero/duovero.c | 4 +++- board/htkw/mcx/mcx.c | 2 +- board/isee/igep00x0/igep00x0.c | 2 +- board/lg/sniper/sniper.c | 2 -- board/logicpd/am3517evm/am3517evm.c | 2 +- board/logicpd/omap3som/omap3logic.c | 2 +- board/quipos/cairo/cairo.c | 2 +- board/technexion/tao3530/tao3530.c | 2 +- board/technexion/twister/twister.c | 3 +-- board/teejet/mt_ventoux/mt_ventoux.c | 3 +-- board/ti/am3517crane/am3517crane.c | 2 +- board/ti/am57xx/board.c | 2 +- board/ti/beagle/beagle.c | 2 +- board/ti/dra7xx/evm.c | 2 +- board/ti/evm/evm.c | 2 +- board/ti/ks2_evm/board_k2g.c | 2 +- board/ti/omap5_uevm/evm.c | 2 +- board/ti/panda/panda.c | 4 +++- board/ti/sdp4430/sdp.c | 4 +++- board/ti/ti814x/evm.c | 2 +- board/timll/devkit8000/devkit8000.c | 2 +- 29 files changed, 32 insertions(+), 47 deletions(-)
arch/arm/mach-omap2/am33xx/board.c +1 -1
@@ -105,7 +105,7 @@ static const struct gpio_bank gpio_bank_am33xx[] = {const struct gpio_bank *const omap_gpio_bank = gpio_bank_am33xx;#endif -#if defined(CONFIG_OMAP_HSMMC ) && !defined(CONFIG_SPL_BUILD ) +#if defined(CONFIG_OMAP_HSMMC )int cpu_mmc_init (bd_t *bis) {int ret;
arch/arm/mach-omap2/boot-common.c +0 -15
@@ -205,21 +205,6 @@ void spl_board_init(void)#endif } -__weak int board_mmc_init (bd_t *bis) -{ -switch (spl_boot_device ()) { -case BOOT_DEVICE_MMC1 : -omap_mmc_init (0 ,0 ,0 ,-1 ,-1 ); -break ; -case BOOT_DEVICE_MMC2 : -case BOOT_DEVICE_MMC2_2 : -omap_mmc_init (0 ,0 ,0 ,-1 ,-1 ); -omap_mmc_init (1 ,0 ,0 ,-1 ,-1 ); -break ; - } -return 0 ; -} -void __noreturn jump_to_image_no_args (struct spl_image_info *spl_image) {typedef void __noreturn (*image_entry_noargs_t )(u32 *);
board/BuR/common/common.c +1 -1
@@ -684,7 +684,7 @@ int board_eth_init(bd_t *bis)return rv; }#endif /* defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD) */ -#if defined(CONFIG_GENERIC_MMC ) && !defined(CONFIG_SPL_BUILD ) +#if defined(CONFIG_GENERIC_MMC )int board_mmc_init (bd_t *bis) {return omap_mmc_init (1 ,0 ,0 ,-1 ,-1 );
board/amazon/kc1/kc1.c +0 -2
@@ -166,12 +166,10 @@ int fb_set_reboot_flag(void)return omap_reboot_mode_store ("b" ); } -#ifndef CONFIG_SPL_BUILD int board_mmc_init (bd_t *bis) {return omap_mmc_init (1 ,0 ,0 ,-1 ,-1 ); } -#endif void board_mmc_power_init (void ) {
board/compulab/cm_t35/cm_t35.c +1 -1
@@ -372,7 +372,7 @@ void set_muxconf_regs(void)cm_t3730_set_muxconf (); } -#if defined(CONFIG_GENERIC_MMC ) && !defined(CONFIG_SPL_BUILD ) +#if defined(CONFIG_GENERIC_MMC )#define SB_T35_WP_GPIO 59int board_mmc_getcd (struct mmc *mmc)
board/compulab/cm_t3517/cm_t3517.c +1 -1
@@ -115,7 +115,7 @@ int misc_init_r(void)return 0 ; } -#if defined(CONFIG_GENERIC_MMC ) && !defined(CONFIG_SPL_BUILD ) +#if defined(CONFIG_GENERIC_MMC )#define SB_T35_CD_GPIO 144#define SB_T35_WP_GPIO 59
board/compulab/cm_t54/cm_t54.c +1 -1
@@ -96,7 +96,7 @@ uint mmc_get_env_part(struct mmc *mmc) }#endif -#if defined(CONFIG_GENERIC_MMC ) && !defined(CONFIG_SPL_BUILD ) +#if defined(CONFIG_GENERIC_MMC )#define SB_T54_CD_GPIO 228#define SB_T54_WP_GPIO 229
board/corscience/tricorder/tricorder.c +1 -1
@@ -140,7 +140,7 @@ void set_muxconf_regs(void)MUX_TRICORDER (); } -#if defined(CONFIG_GENERIC_MMC ) && !(defined(CONFIG_SPL_BUILD )) +#if defined(CONFIG_GENERIC_MMC )int board_mmc_init (bd_t *bis) {return omap_mmc_init (0 ,0 ,0 ,-1 ,-1 );
board/gumstix/duovero/duovero.c +3 -1
@@ -110,17 +110,19 @@ void set_muxconf_regs(void) sizeof(struct pad_conf_entry)); } -#if !defined(CONFIG_SPL_BUILD ) && defined(CONFIG_GENERIC_MMC ) +#if defined(CONFIG_GENERIC_MMC )int board_mmc_init (bd_t *bis) {return omap_mmc_init (0 ,0 ,0 ,-1 ,-1 ); } +#if !defined(CONFIG_SPL_BUILD )void board_mmc_power_init (void ) {twl6030_power_mmc_init (0 ); }#endif +#endif #if defined(CONFIG_CMD_NET )
board/htkw/mcx/mcx.c +1 -1
@@ -100,7 +100,7 @@ void set_muxconf_regs(void)MUX_MCX (); } -#if defined(CONFIG_OMAP_HSMMC ) && !defined(CONFIG_SPL_BUILD ) +#if defined(CONFIG_OMAP_HSMMC )int board_mmc_init (bd_t *bis) {return omap_mmc_init (0 ,0 ,0 ,-1 ,-1 );
board/isee/igep00x0/igep00x0.c +1 -1
@@ -196,7 +196,7 @@ int board_eth_init(bd_t *bis)static inline void setup_net_chip (void ) {}#endif -#if defined(CONFIG_GENERIC_MMC ) && !defined(CONFIG_SPL_BUILD ) +#if defined(CONFIG_GENERIC_MMC )int board_mmc_init (bd_t *bis) {return omap_mmc_init (0 ,0 ,0 ,-1 ,-1 );
board/lg/sniper/sniper.c +0 -2
@@ -178,12 +178,10 @@ int fb_set_reboot_flag(void)return omap_reboot_mode_store ("b" ); } -#ifndef CONFIG_SPL_BUILD int board_mmc_init (bd_t *bis) {return omap_mmc_init (1 ,0 ,0 ,-1 ,-1 ); } -#endif void board_mmc_power_init (void ) {
board/logicpd/am3517evm/am3517evm.c +1 -1
@@ -152,7 +152,7 @@ void set_muxconf_regs(void)MUX_AM3517EVM (); } -#if defined(CONFIG_GENERIC_MMC ) && !defined(CONFIG_SPL_BUILD ) +#if defined(CONFIG_GENERIC_MMC )int board_mmc_init (bd_t *bis) {return omap_mmc_init (0 ,0 ,0 ,-1 ,-1 );
board/logicpd/omap3som/omap3logic.c +1 -1
@@ -244,7 +244,7 @@ int board_late_init(void) }#endif -#if defined(CONFIG_GENERIC_MMC ) && !defined(CONFIG_SPL_BUILD ) +#if defined(CONFIG_GENERIC_MMC )int board_mmc_init (bd_t *bis) {return omap_mmc_init (0 ,0 ,0 ,-1 ,-1 );
board/quipos/cairo/cairo.c +1 -1
@@ -62,7 +62,7 @@ void set_muxconf_regs(void)MUX_CAIRO (); } -#if defined(CONFIG_GENERIC_MMC ) && !defined(CONFIG_SPL_BUILD ) +#if defined(CONFIG_GENERIC_MMC )int board_mmc_init (bd_t *bis) {return omap_mmc_init (0 ,0 ,0 ,-1 ,-1 );
board/technexion/tao3530/tao3530.c +1 -1
@@ -179,7 +179,7 @@ void set_muxconf_regs(void)#endif } -#if defined(CONFIG_GENERIC_MMC ) && !defined(CONFIG_SPL_BUILD ) +#if defined(CONFIG_GENERIC_MMC )int board_mmc_init (bd_t *bis) {omap_mmc_init (0 ,0 ,0 ,-1 ,-1 );
board/technexion/twister/twister.c +1 -2
@@ -130,8 +130,7 @@ int board_eth_init(bd_t *bis)return 0 ; } -#if defined(CONFIG_OMAP_HSMMC ) && \ - !defined(CONFIG_SPL_BUILD ) +#if defined(CONFIG_OMAP_HSMMC )int board_mmc_init (bd_t *bis) {return omap_mmc_init (0 ,0 ,0 ,-1 ,-1 );
board/teejet/mt_ventoux/mt_ventoux.c +1 -2
@@ -291,8 +291,7 @@ int board_eth_init(bd_t *bis)return 0 ; } -#if defined(CONFIG_OMAP_HSMMC ) && \ - !defined(CONFIG_SPL_BUILD ) +#if defined(CONFIG_OMAP_HSMMC )int board_mmc_init (bd_t *bis) {return omap_mmc_init (0 ,0 ,0 ,-1 ,-1 );
board/ti/am3517crane/am3517crane.c +1 -1
@@ -63,7 +63,7 @@ void set_muxconf_regs(void)MUX_AM3517CRANE (); } -#if defined(CONFIG_GENERIC_MMC ) && !defined(CONFIG_SPL_BUILD ) +#if defined(CONFIG_GENERIC_MMC )int board_mmc_init (bd_t *bis) {return omap_mmc_init (0 ,0 ,0 ,-1 ,-1 );
board/ti/am57xx/board.c +1 -1
@@ -557,7 +557,7 @@ err: }#endif -#if !defined(CONFIG_SPL_BUILD ) && defined(CONFIG_GENERIC_MMC ) +#if defined(CONFIG_GENERIC_MMC )int board_mmc_init (bd_t *bis) {omap_mmc_init (0 ,0 ,0 ,-1 ,-1 );
board/ti/beagle/beagle.c +1 -1
@@ -523,7 +523,7 @@ void set_muxconf_regs(void)MUX_BEAGLE (); } -#if defined(CONFIG_GENERIC_MMC ) && !defined(CONFIG_SPL_BUILD ) +#if defined(CONFIG_GENERIC_MMC )int board_mmc_init (bd_t *bis) {return omap_mmc_init (0 ,0 ,0 ,-1 ,-1 );
board/ti/dra7xx/evm.c +1 -1
@@ -679,7 +679,7 @@ err: }#endif -#if !defined(CONFIG_SPL_BUILD ) && defined(CONFIG_GENERIC_MMC ) +#if defined(CONFIG_GENERIC_MMC )int board_mmc_init (bd_t *bis) {omap_mmc_init (0 ,0 ,0 ,-1 ,-1 );
board/ti/evm/evm.c +1 -1
@@ -259,7 +259,7 @@ int board_eth_init(bd_t *bis) }#endif /* CONFIG_CMD_NET */ -#if defined(CONFIG_GENERIC_MMC ) && !defined(CONFIG_SPL_BUILD ) +#if defined(CONFIG_GENERIC_MMC )int board_mmc_init (bd_t *bis) {return omap_mmc_init (0 ,0 ,0 ,-1 ,-1 );
board/ti/ks2_evm/board_k2g.c +1 -1
@@ -102,7 +102,7 @@ s16 divn_val[16] = {-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 }; -#if !defined(CONFIG_SPL_BUILD ) && defined(CONFIG_GENERIC_MMC ) +#if defined(CONFIG_GENERIC_MMC )int board_mmc_init (bd_t *bis) {if (psc_enable_module (KS2_LPSC_MMC )) {
board/ti/omap5_uevm/evm.c +1 -1
@@ -211,7 +211,7 @@ void set_muxconf_regs(void) sizeof(struct pad_conf_entry)); } -#if !defined(CONFIG_SPL_BUILD ) && defined(CONFIG_GENERIC_MMC ) +#if defined(CONFIG_GENERIC_MMC )int board_mmc_init (bd_t *bis) {omap_mmc_init (0 ,0 ,0 ,-1 ,-1 );
board/ti/panda/panda.c +3 -1
@@ -287,17 +287,19 @@ void set_muxconf_regs(void) sizeof(struct pad_conf_entry)); } -#if !defined(CONFIG_SPL_BUILD ) && defined(CONFIG_GENERIC_MMC ) +#if defined(CONFIG_GENERIC_MMC )int board_mmc_init (bd_t *bis) {return omap_mmc_init (0 ,0 ,0 ,-1 ,-1 ); } +#if !defined(CONFIG_SPL_BUILD )void board_mmc_power_init (void ) {twl6030_power_mmc_init (0 ); }#endif +#endif #ifdef CONFIG_USB_EHCI
board/ti/sdp4430/sdp.c +3 -1
@@ -73,7 +73,7 @@ void set_muxconf_regs(void) sizeof(struct pad_conf_entry)); } -#if !defined(CONFIG_SPL_BUILD ) && defined(CONFIG_GENERIC_MMC ) +#if defined(CONFIG_GENERIC_MMC )int board_mmc_init (bd_t *bis) {omap_mmc_init (0 ,0 ,0 ,-1 ,-1 );
@@ -81,12 +81,14 @@ int board_mmc_init(bd_t *bis) return 0; } +#if !defined(CONFIG_SPL_BUILD )void board_mmc_power_init (void ) {twl6030_power_mmc_init (0 );twl6030_power_mmc_init (1 ); }#endif +#endif /* * get_board_rev() - get board revision
board/ti/ti814x/evm.c +1 -1
@@ -111,7 +111,7 @@ int board_init(void)return 0 ; } -#if !defined(CONFIG_SPL_BUILD ) && defined(CONFIG_GENERIC_MMC ) +#if defined(CONFIG_GENERIC_MMC )int board_mmc_init (bd_t *bis) {omap_mmc_init (1 ,0 ,0 ,-1 ,-1 );
board/timll/devkit8000/devkit8000.c +1 -1
@@ -130,7 +130,7 @@ void set_muxconf_regs(void)MUX_DEVKIT8000 (); } -#if defined(CONFIG_GENERIC_MMC ) && !defined(CONFIG_SPL_BUILD ) +#if defined(CONFIG_GENERIC_MMC )int board_mmc_init (bd_t *bis) {return omap_mmc_init (0 ,0 ,0 ,-1 ,-1 );
Signature · 1 line
1.9.1
PATCH 1/1 ti: boot: Register the MMC controllers in SPL in the same way as in u-boot
Quoted 8 lines · Jean-Jacques Hiblot
To keep a consistent MMC device mapping in SPL and in u-boot, let's register the MMC controllers the same way in u-boot and in the SPL. In terms of boot time, it doesn't hurt to register more controllers than needed because the MMC device is initialized only prior being accessed for the first time.
Having the same device mapping in SPL and u-boot allows us to use the environment in SPL whatever the MMC boot device.
Quoted 6 lines
Signed-off-by Jean-Jacques Hiblot <[email protected]>---
This has been tested on DRA7 platforms, AM437x Starter Kit and Beaglebone Black. I also checked that building the TI-based platforms was okay using buildman:
tools/buildman/buildman-d -e -l omap am33 davinci
Did you test this around falcon mode and bootcount as well? Thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170203/8cce2dae/attachment.sig>
PATCH 1/1 ti: boot: Register the MMC controllers in SPL in the same way as in u-boot
Quoted 9 lines · Tom Rini
Quoted 8 lines · Jean-Jacques Hiblot
To keep a consistent MMC device mapping in SPL and in u-boot, let's register the MMC controllers the same way in u-boot and in the SPL. In terms of boot time, it doesn't hurt to register more controllers than needed because the MMC device is initialized only prior being accessed for the first time.
Having the same device mapping in SPL and u-boot allows us to use the environment in SPL whatever the MMC boot device.
Quoted 7 lines
Quoted 6 lines
Signed-off-by Jean-Jacques Hiblot <[email protected]>---
This has been tested on DRA7 platforms, AM437x Starter Kit and Beaglebone Black. I also checked that building the TI-based platforms was okay using buildman:
tools/buildman/buildman-d -e -l omap am33 davinciDid you test this around falcon mode and bootcount as well? Thanks!
I tested the falcon boot on beaglebone, DRA7 and am437x. Note that more changes are required to make it work properly: FDT memory nodes fixup + support for spl_start_uboot() for the am437x SK. They'll be submitted later.
I didn't check bootcount because I didn't know about it. I don't think it could have broken since it's not used in SPL and I checked that the env was working in u-boot: I'm setting the variable 'boot_os' from the u-boot prompt to activate/deactivate the falcon boot.
Quoted 1 line
PATCH 1/1 ti: boot: Register the MMC controllers in SPL in the same way as in u-boot
Quoted 15 lines · Jean-Jacques Hiblot
Quoted 12 lines · Tom Rini
Quoted 11 lines · Jean-Jacques Hiblot
To keep a consistent MMC device mapping in SPL and in u-boot, let's register the MMC controllers the same way in u-boot and in the SPL. In terms of boot time, it doesn't hurt to register more controllers than needed because the MMC device is initialized only prior being accessed for the first time.
Having the same device mapping in SPL and u-boot allows us to use the environment in SPL whatever the MMC boot device.Signed-off-by Jean-Jacques Hiblot <[email protected]>---
Quoted 8 lines
Quoted 4 lines
Quoted 3 lines
This has been tested on DRA7 platforms, AM437x Starter Kit and Beaglebone Black. I also checked that building the TI-based platforms was okay using buildman:
tools/buildman/buildman-d -e -l omap am33 davinciDid you test this around falcon mode and bootcount as well? Thanks!
I tested the falcon boot on beaglebone, DRA7 and am437x. Note that more changes are required to make it work properly: FDT memory nodes fixup + support for
spl_start_uboot()for the am437x SK. They'll be submitted later.
Er, SK being broken is confusing since 'spl export' should prepare the whole DTB.
Quoted 5 lines
I didn't check bootcount because I didn't know about it. I don't think it could have broken since it's not used in SPL and I checked that the env was working in u-boot: I'm setting the variable '
boot_os' from the u-boot prompt to activate/deactivate the falcon boot.
Ah yes, nevermind, that never made it into mainline, nevermind.
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170206/68537792/attachment.sig>
PATCH 1/1 ti: boot: Register the MMC controllers in SPL in the same way as in u-boot
Quoted 18 lines · Tom Rini
Quoted 17 lines · Jean-Jacques Hiblot
Quoted 15 lines · Tom Rini
Quoted 14 lines · Jean-Jacques Hiblot
To keep a consistent MMC device mapping in SPL and in u-boot, let's register the MMC controllers the same way in u-boot and in the SPL. In terms of boot time, it doesn't hurt to register more controllers than needed because the MMC device is initialized only prior being accessed for the first time.
Having the same device mapping in SPL and u-boot allows us to use the environment in SPL whatever the MMC boot device.Signed-off-by Jean-Jacques Hiblot <[email protected]>---
This has been tested on DRA7 platforms, AM437x Starter Kit and Beaglebone Black. I also checked that building the TI-based platforms was okay using buildman:
tools/buildman/buildman-d -e -l omap am33 davinci
Quoted 7 lines
Quoted 5 lines
Quoted 1 line
Did you test this around falcon mode and bootcount as well? Thanks!
I tested the falcon boot on beaglebone, DRA7 and am437x. Note that more changes are required to make it work properly: FDT memory nodes fixup + support for
spl_start_uboot()for the am437x SK. They'll be submitted later.Er, SK being broken is confusing since 'spl export' should prepare the whole DTB.
I didn't write the FDT memory fixup patch so I'm not 100% confident in what my following comment: This patch adjusts dynamically the memory nodes in the DTB. I guess that's required because the amount of memory is read from an on-board EEPROM.
Quoted 8 lines
Quoted 6 lines
I didn't check bootcount because I didn't know about it. I don't think it could have broken since it's not used in SPL and I checked that the env was working in u-boot: I'm setting the variable '
boot_os' from the u-boot prompt to activate/deactivate the falcon boot.Ah yes, nevermind, that never made it into mainline, nevermind.
PATCH 1/1 ti: boot: Register the MMC controllers in SPL in the same way as in u-boot
Quoted 30 lines · Jean-Jacques Hiblot
Quoted 27 lines · Tom Rini
Quoted 26 lines · Jean-Jacques Hiblot
Quoted 14 lines · Tom Rini
Quoted 13 lines · Jean-Jacques Hiblot
To keep a consistent MMC device mapping in SPL and in u-boot, let's register the MMC controllers the same way in u-boot and in the SPL. In terms of boot time, it doesn't hurt to register more controllers than
needed because the MMC device is initialized only prior being accessed for
the first time.
Having the same device mapping in SPL and u-boot allows us to use the environment in SPL whatever the MMC boot device.Signed-off-by Jean-Jacques Hiblot <[email protected]>---
Quoted 6 lines
Quoted 5 lines
This has been tested on DRA7 platforms, AM437x Starter Kit and Beaglebone Black.
I also checked that building the TI-based platforms was okay using buildman:tools/buildman/buildman-d -e -l omap am33 davinciDid you test this around falcon mode and bootcount as well? Thanks!
I tested the falcon boot on beaglebone, DRA7 and am437x. Note that more changes are required to make it work properly: FDT memory nodes fixup + support for
spl_start_uboot()for the am437x SK. They'll be submitted later.
Quoted 6 lines
Quoted 2 lines
Er, SK being broken is confusing since 'spl export' should prepare the whole DTB.
I didn't write the FDT memory fixup patch so I'm not 100% confident in what my following comment: This patch adjusts dynamically the memory nodes in the DTB. I guess that's required because the amount of memory is read from an on-board EEPROM.
After a bit of research here is the explanation, the patch adds a call to arch_fixup_fdt() so that the memory banks are properly described in the dtb.
This is required in our case because of the way the dtb is programmed in the flash/mmc: we don't use "spl export", instead we write the dtb as-is (though we do customize it on dev station with fdtput).
JJ
Quoted 9 lines
Quoted 8 lines
Quoted 6 lines
I didn't check bootcount because I didn't know about it. I don't think it could have broken since it's not used in SPL and I checked that the env was working in u-boot: I'm setting the variable '
boot_os' from the u-boot prompt to activate/deactivate the falcon boot.Ah yes, nevermind, that never made it into mainline, nevermind.
PATCH 1/1 ti: boot: Register the MMC controllers in SPL in the same way as in u-boot
Quoted 40 lines · Jean-Jacques Hiblot
Quoted 30 lines · Jean-Jacques Hiblot
Quoted 27 lines · Tom Rini
Quoted 26 lines · Jean-Jacques Hiblot
Quoted 14 lines · Tom Rini
Quoted 13 lines · Jean-Jacques Hiblot
To keep a consistent MMC device mapping in SPL and in u-boot, let's register the MMC controllers the same way in u-boot and in the SPL. In terms of boot time, it doesn't hurt to register more controllers than
needed because the MMC device is initialized only prior being accessed for
the first time.
Having the same device mapping in SPL and u-boot allows us to use the environment in SPL whatever the MMC boot device.Signed-off-by Jean-Jacques Hiblot <[email protected]>---
Quoted 6 lines
Quoted 5 lines
This has been tested on DRA7 platforms, AM437x Starter Kit and Beaglebone Black.
I also checked that building the TI-based platforms was okay using buildman:tools/buildman/buildman-d -e -l omap am33 davinciDid you test this around falcon mode and bootcount as well? Thanks!
I tested the falcon boot on beaglebone, DRA7 and am437x. Note that more changes are required to make it work properly: FDT memory nodes fixup + support for
spl_start_uboot()for the am437x SK. They'll be submitted later.Quoted 6 lines
Quoted 2 lines
Er, SK being broken is confusing since 'spl export' should prepare the whole DTB.
I didn't write the FDT memory fixup patch so I'm not 100% confident in what my following comment: This patch adjusts dynamically the memory nodes in the DTB. I guess that's required because the amount of memory is read from an on-board EEPROM.
Quoted 7 lines
After a bit of research here is the explanation, the patch adds a call to
arch_fixup_fdt()so that the memory banks are properly described in the dtb.
This is required in our case because of the way the dtb is programmed in the flash/mmc: we don't use "spl export", instead we write the dtb as-is (though we do customize it on dev station with fdtput).
So, yes. If you don't use the built-in mechanism to prepare a DTB for use with falcon you do have to set all of the values required via fdtput/similar (I've suggested as much for customers wanting to productize falcon mode, "spl export" doesn't fit as well into upgrade paths when run via Linux for example).
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170210/8f601746/attachment.sig>
Quoted 9 lines · Jean-Jacques Hiblot
To keep a consistent MMC device mapping in SPL and in u-boot, let's register the MMC controllers the same way in u-boot and in the SPL. In terms of boot time, it doesn't hurt to register more controllers than needed because the MMC device is initialized only prior being accessed for the first time.
Having the same device mapping in SPL and u-boot allows us to use the environment in SPL whatever the MMC boot device.Signed-off-by Jean-Jacques Hiblot <[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: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170320/945207a9/attachment.sig>