diff options
| author | Tom Rini <trini@konsulko.com> | 2019-07-27 09:35:05 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-07-27 09:35:05 -0400 |
| commit | df9a7a195bdf0722399199bf373afc8309ae3ad7 (patch) | |
| tree | 5bf1e2e3388725131640aac7d120647820ca5b48 /cmd | |
| parent | 222701e157176a66628e4f399f52ca3307b018c9 (diff) | |
| parent | 4a6f5b4f56b8bc6f36736fc0a07c5c4f9069e69b (diff) | |
| download | u-boot-df9a7a195bdf0722399199bf373afc8309ae3ad7.tar.gz | |
Merge tag 'u-boot-imx-20190719' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
u-boot-imx-20190719
- CCF for i.MX6
- nandbcb command to write SPL into NAND
- Switch to DM (i.MX28)
- Boards: Toradex, engicam, DH
- Fixes for i.MX8
- Fixes for i.MX7ULP
Travis: https://travis-ci.org/sbabic/u-boot-imx/builds/561147504
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/Kconfig | 12 | ||||
| -rw-r--r-- | cmd/eeprom.c | 2 |
2 files changed, 11 insertions, 3 deletions
diff --git a/cmd/Kconfig b/cmd/Kconfig index 9e66cc110d..16cb5c2956 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -325,8 +325,8 @@ config CMD_SPL command. config CMD_SPL_NAND_OFS - hex "Offset of OS command line args for Falcon-mode NAND boot" - depends on CMD_SPL + hex "Offset of OS args or dtb for Falcon-mode NAND boot" + depends on CMD_SPL && (TPL_NAND_SUPPORT || SPL_NAND_SUPPORT) default 0 help This provides the offset of the command line arguments for Linux @@ -334,6 +334,14 @@ config CMD_SPL_NAND_OFS for full information about how to use this option (and also see board/gateworks/gw_ventana/README for an example). +config CMD_SPL_NOR_OFS + hex "Offset of OS args or dtb for Falcon-mode NOR boot" + depends on CMD_SPL && SPL_NOR_SUPPORT + default 0 + help + This provides the offset of the command line arguments or dtb for + Linux when booting from NOR in Falcon mode. + config CMD_SPL_WRITE_SIZE hex "Size of argument area" depends on CMD_SPL diff --git a/cmd/eeprom.c b/cmd/eeprom.c index 7b1f81477f..19953df082 100644 --- a/cmd/eeprom.c +++ b/cmd/eeprom.c @@ -108,7 +108,7 @@ static int eeprom_len(unsigned offset, unsigned end) /* * For a FRAM device there is no limit on the number of the - * bytes that can be ccessed with the single read or write + * bytes that can be accessed with the single read or write * operation. */ #if !defined(CONFIG_SYS_I2C_FRAM) |