diff options
| author | Tom Rini <trini@konsulko.com> | 2021-10-20 21:24:09 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-10-20 21:24:09 +0300 |
| commit | 79b8849d4c1e73df2a79a1d5a5f6166d0dd67a12 (patch) | |
| tree | b630c9a63287d8586b85f2bdd00af56353c66b25 /drivers/mtd | |
| parent | 11c41192ec08ba6ded60b0d6e8257cfbd6ad1914 (diff) | |
| parent | f0045799c6957e374cc12a6146ac60881cd827d6 (diff) | |
| download | u-boot-79b8849d4c1e73df2a79a1d5a5f6166d0dd67a12.tar.xz | |
Merge tag 'u-boot-imx-20211020' of https://source.denx.de/u-boot/custodians/u-boot-imx
u-boot-imx-20211020
-------------------
First PR from u-boot-imx for 2022.01
CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/9535
- new board: kontron-sl-mx8mm
- imx8m:
- fix secure boot
- imx ESDHC: fixes
- i.MX53: Support thum2, bmode and fixes for Menlo board
usbarmory switch to Ethernet driver model
- imx6 :
- DDR calibration for Toradex boards
- imx7:
- Fixes
- Updated gateworks boards (ventana / venice)
# gpg verification failed.
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/raw/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/mtd/nand/raw/mxs_nand_spl.c | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/drivers/mtd/nand/raw/Kconfig b/drivers/mtd/nand/raw/Kconfig index 332f9d7591..cb0c0a1581 100644 --- a/drivers/mtd/nand/raw/Kconfig +++ b/drivers/mtd/nand/raw/Kconfig @@ -369,7 +369,7 @@ config NAND_MXC imply CMD_NAND help This enables the NAND driver for the NAND flash controller on the - i.MX27 / i.MX31 / i.MX5 rocessors. + i.MX27 / i.MX31 / i.MX5 processors. config NAND_MXS bool "MXS NAND support" diff --git a/drivers/mtd/nand/raw/mxs_nand_spl.c b/drivers/mtd/nand/raw/mxs_nand_spl.c index 6b70d68fe7..9e0b8afb52 100644 --- a/drivers/mtd/nand/raw/mxs_nand_spl.c +++ b/drivers/mtd/nand/raw/mxs_nand_spl.c @@ -296,3 +296,9 @@ int nand_default_bbt(struct mtd_info *mtd) void nand_deselect(void) { } + +u32 nand_spl_adjust_offset(u32 sector, u32 offs) +{ + /* Handle the offset adjust in nand_spl_load_image,*/ + return offs; +} |