diff options
| author | Tom Rini <[email protected]> | 2023-04-17 10:47:33 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-04-17 10:47:33 -0400 |
| commit | 5db4972a5bbdbf9e3af48ffc9bc4fec73b7b6a79 (patch) | |
| tree | 59af02fa40552c4e3eb547019c4cc7d0aaaf2d35 /include | |
| parent | 10f8eec3e0f948005b208869a9ec26b1bf896f86 (diff) | |
| parent | 156968211ef0e155a198a2fe9e94187a91186ab9 (diff) | |
Merge tag 'u-boot-nand-20230417' of https://source.denx.de/u-boot/custodians/u-boot-nand-flash
Pull request for u-boot-nand-20230417
The first two patches are by Frieder Schrempf who joins as a reviewer for
the SPI NAND framework and drivers.
The following 2 patches are by Linus Walleij and are taken by the series
"Add Broadcom Northstar basic support".
Bin Meng makes static a list for octeontx.
Francesco Dolcini specifies MTD partitions on command line for
colibri-{imx6ull,imx7}.
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/colibri-imx6ull.h | 2 | ||||
| -rw-r--r-- | include/configs/colibri_imx7.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h index ba45ee4efd3..561a61ebc03 100644 --- a/include/configs/colibri-imx6ull.h +++ b/include/configs/colibri-imx6ull.h @@ -99,7 +99,7 @@ "${board}/flash_blk.img && source ${loadaddr}\0" \ "setup=setenv setupargs " \ "console=tty1 console=${console}" \ - ",${baudrate}n8 ${memargs} consoleblank=0\0" \ + ",${baudrate}n8 ${memargs} ${mtdparts} consoleblank=0\0" \ "setupdate=run setsdupdate || run setusbupdate || run setethupdate\0" \ "setusbupdate=usb start && setenv interface usb && " \ "fatload ${interface} 0:1 ${loadaddr} " \ diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index c568643977c..03f8ed14787 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -141,7 +141,7 @@ "${board}/flash_blk.img && source ${loadaddr}\0" \ "setup=setenv setupargs " \ "console=tty1 console=${console}" \ - ",${baudrate}n8 ${memargs} consoleblank=0\0" \ + ",${baudrate}n8 ${memargs} ${mtdparts} consoleblank=0\0" \ "setupdate=run setsdupdate || run setusbupdate || run setethupdate\0" \ "setusbupdate=usb start && setenv interface usb && " \ "fatload ${interface} 0:1 ${loadaddr} " \ |