Message ID | 1396939160-13823-1-git-send-email-oe5hpm@oevsv.at |
---|---|
State | Accepted |
Delegated to: | Pantelis Antoniou |
Headers | show |
Hi Hannes, On Apr 8, 2014, at 9:39 AM, Hannes Petermaier wrote: > Since B&R boards uses only MMC-Controller #1, it only > wastes time if we initialize #0 first to see that there is nothing. > > Cc: <trini@ti.com> > Signed-off-by: Hannes Petermaier <oe5hpm@oevsv.at> > --- > board/BuR/common/common.c | 7 +++++++ > include/configs/kwb.h | 2 +- > include/configs/tseries.h | 2 +- > 3 files changed, 9 insertions(+), 2 deletions(-) > > diff --git a/board/BuR/common/common.c b/board/BuR/common/common.c > index 4c926ce..25cbe62 100644 > --- a/board/BuR/common/common.c > +++ b/board/BuR/common/common.c > @@ -19,6 +19,7 @@ > #include <asm/arch/clock.h> > #include <asm/arch/gpio.h> > #include <asm/arch/sys_proto.h> > +#include <asm/arch/mmc_host_def.h> > #include <asm/io.h> > #include <asm/gpio.h> > #include <i2c.h> > @@ -214,3 +215,9 @@ int board_eth_init(bd_t *bis) > return rv; > } > #endif /* CONFIG_DRIVER_TI_CPSW */ > +#if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD) > +int board_mmc_init(bd_t *bis) > +{ > + return omap_mmc_init(1, 0, 0, -1, -1); > +} > +#endif > diff --git a/include/configs/kwb.h b/include/configs/kwb.h > index 0f631c0..0860434 100644 > --- a/include/configs/kwb.h > +++ b/include/configs/kwb.h > @@ -109,7 +109,7 @@ > > #undef CONFIG_ENV_IS_NOWHERE > #define CONFIG_ENV_IS_IN_MMC > -#define CONFIG_SYS_MMC_ENV_DEV 1 > +#define CONFIG_SYS_MMC_ENV_DEV 0 > #define CONFIG_SYS_MMC_ENV_PART 2 > #define CONFIG_ENV_OFFSET 0x40000 /* TODO: Adresse definieren */ > #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) > diff --git a/include/configs/tseries.h b/include/configs/tseries.h > index 8fb87ac..e550afa 100644 > --- a/include/configs/tseries.h > +++ b/include/configs/tseries.h > @@ -237,7 +237,7 @@ > #elif defined(CONFIG_EMMC_BOOT) > #undef CONFIG_ENV_IS_NOWHERE > #define CONFIG_ENV_IS_IN_MMC > -#define CONFIG_SYS_MMC_ENV_DEV 1 > +#define CONFIG_SYS_MMC_ENV_DEV 0 > #define CONFIG_SYS_MMC_ENV_PART 2 > #define CONFIG_ENV_OFFSET 0x40000 /* TODO: Adresse definieren */ > #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) > -- > 1.7.9.5 > Applied Thanks -- Pantelis Acked-by: Pantelis Antoniou <panto@antoniou-consulting.com> > _______________________________________________ > U-Boot mailing list > U-Boot@lists.denx.de > http://lists.denx.de/mailman/listinfo/u-boot
diff --git a/board/BuR/common/common.c b/board/BuR/common/common.c index 4c926ce..25cbe62 100644 --- a/board/BuR/common/common.c +++ b/board/BuR/common/common.c @@ -19,6 +19,7 @@ #include <asm/arch/clock.h> #include <asm/arch/gpio.h> #include <asm/arch/sys_proto.h> +#include <asm/arch/mmc_host_def.h> #include <asm/io.h> #include <asm/gpio.h> #include <i2c.h> @@ -214,3 +215,9 @@ int board_eth_init(bd_t *bis) return rv; } #endif /* CONFIG_DRIVER_TI_CPSW */ +#if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD) +int board_mmc_init(bd_t *bis) +{ + return omap_mmc_init(1, 0, 0, -1, -1); +} +#endif diff --git a/include/configs/kwb.h b/include/configs/kwb.h index 0f631c0..0860434 100644 --- a/include/configs/kwb.h +++ b/include/configs/kwb.h @@ -109,7 +109,7 @@ #undef CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_IS_IN_MMC -#define CONFIG_SYS_MMC_ENV_DEV 1 +#define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 2 #define CONFIG_ENV_OFFSET 0x40000 /* TODO: Adresse definieren */ #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) diff --git a/include/configs/tseries.h b/include/configs/tseries.h index 8fb87ac..e550afa 100644 --- a/include/configs/tseries.h +++ b/include/configs/tseries.h @@ -237,7 +237,7 @@ #elif defined(CONFIG_EMMC_BOOT) #undef CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_IS_IN_MMC -#define CONFIG_SYS_MMC_ENV_DEV 1 +#define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 2 #define CONFIG_ENV_OFFSET 0x40000 /* TODO: Adresse definieren */ #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
Since B&R boards uses only MMC-Controller #1, it only wastes time if we initialize #0 first to see that there is nothing. Cc: <trini@ti.com> Signed-off-by: Hannes Petermaier <oe5hpm@oevsv.at> --- board/BuR/common/common.c | 7 +++++++ include/configs/kwb.h | 2 +- include/configs/tseries.h | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-)