dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-02 01:02:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

mx7: Remove BMODE support

Browse Source 
i.MX7 does not support BMODE due to the erratum e10574 ("Watchdog:
A watchdog timeout or software trigger will not reset the SOC"), so
remove its support.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
This commit is contained in:
Fabio Estevam
2018-06-22 13:54:55 -03:00
committed by Stefano Babic
parent 9236269de5
commit 2756d31fae
4 changed files with 1 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-imx/Kconfig
View File

@@ -46,7 +46,7 @@ config SECURE_BOOT
config CMD_BMODE config CMD_BMODE
bool "Support the 'bmode' command" bool "Support the 'bmode' command"
default y default y
depends on ARCH_MX7 || ARCH_MX6 || ARCH_MX5 depends on ARCH_MX6 || ARCH_MX5
help help
This enables the 'bmode' (bootmode) command for forcing This enables the 'bmode' (bootmode) command for forcing
a boot from specific media. a boot from specific media.

1
arch/arm/mach-imx/mx7/Kconfig
View File

@@ -50,7 +50,6 @@ config TARGET_WARP7
config TARGET_COLIBRI_IMX7 config TARGET_COLIBRI_IMX7
bool "Support Colibri iMX7S/iMX7D modules" bool "Support Colibri iMX7S/iMX7D modules"
select BOARD_LATE_INIT
select DM select DM
select DM_SERIAL select DM_SERIAL
select DM_THERMAL select DM_THERMAL

25
arch/arm/mach-imx/mx7/soc.c
View File

@@ -8,7 +8,6 @@
#include <asm/arch/imx-regs.h> #include <asm/arch/imx-regs.h>
#include <asm/arch/clock.h> #include <asm/arch/clock.h>
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>
#include <asm/mach-imx/boot_mode.h>
#include <asm/mach-imx/dma.h> #include <asm/mach-imx/dma.h>
#include <asm/mach-imx/hab.h> #include <asm/mach-imx/hab.h>
#include <asm/mach-imx/rdc-sema.h> #include <asm/mach-imx/rdc-sema.h>
@@ -254,30 +253,6 @@ void set_wdog_reset(struct wdog_regs *wdog)
writew(reg, &wdog->wcr); writew(reg, &wdog->wcr);
} }
/*
* cfg_val will be used for
* Boot_cfg4[7:0]:Boot_cfg3[7:0]:Boot_cfg2[7:0]:Boot_cfg1[7:0]
* After reset, if GPR10[28] is 1, ROM will copy GPR9[25:0]
* to SBMR1, which will determine the boot device.
*/
const struct boot_mode soc_boot_modes[] = {
{"ecspi1:0", MAKE_CFGVAL(0x00, 0x60, 0x00, 0x00)},
{"ecspi1:1", MAKE_CFGVAL(0x40, 0x62, 0x00, 0x00)},
{"ecspi1:2", MAKE_CFGVAL(0x80, 0x64, 0x00, 0x00)},
{"ecspi1:3", MAKE_CFGVAL(0xc0, 0x66, 0x00, 0x00)},
{"weim", MAKE_CFGVAL(0x00, 0x50, 0x00, 0x00)},
{"qspi1", MAKE_CFGVAL(0x10, 0x40, 0x00, 0x00)},
/* 4 bit bus width */
{"usdhc1", MAKE_CFGVAL(0x10, 0x10, 0x00, 0x00)},
{"usdhc2", MAKE_CFGVAL(0x10, 0x14, 0x00, 0x00)},
{"usdhc3", MAKE_CFGVAL(0x10, 0x18, 0x00, 0x00)},
{"mmc1", MAKE_CFGVAL(0x10, 0x20, 0x00, 0x00)},
{"mmc2", MAKE_CFGVAL(0x10, 0x24, 0x00, 0x00)},
{"mmc3", MAKE_CFGVAL(0x10, 0x28, 0x00, 0x00)},
{NULL, 0},
};
void s_init(void) void s_init(void)
{ {
/* clock configuration. */ /* clock configuration. */

19
board/toradex/colibri_imx7/colibri_imx7.c
View File

@@ -9,7 +9,6 @@
#include <asm/arch/mx7-pins.h> #include <asm/arch/mx7-pins.h>
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>
#include <asm/gpio.h> #include <asm/gpio.h>
#include <asm/mach-imx/boot_mode.h>
#include <asm/mach-imx/iomux-v3.h> #include <asm/mach-imx/iomux-v3.h>
#include <asm/io.h> #include <asm/io.h>
#include <common.h> #include <common.h>
@@ -322,24 +321,6 @@ int board_init(void)
return 0; return 0;
} }
#ifdef CONFIG_CMD_BMODE
static const struct boot_mode board_boot_modes[] = {
/* 4 bit bus width */
{"nand", MAKE_CFGVAL(0x40, 0x34, 0x00, 0x00)},
{"sd1", MAKE_CFGVAL(0x10, 0x10, 0x00, 0x00)},
{NULL, 0},
};
#endif
int board_late_init(void)
{
#ifdef CONFIG_CMD_BMODE
add_board_boot_modes(board_boot_modes);
#endif
return 0;
}
#ifdef CONFIG_DM_PMIC #ifdef CONFIG_DM_PMIC
int power_init_board(void) int power_init_board(void)
{ {