diff options
| author | Tom Rini <trini@konsulko.com> | 2024-01-15 09:29:57 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-01-15 09:29:57 -0500 |
| commit | b9631fe7817e18f04ef556516af28b736d688b7e (patch) | |
| tree | b104156461c105115cb4e4192cbb7812563cb4af /arch | |
| parent | 697758e7c81131da6db0e3b10515019fe3aca8c9 (diff) | |
| parent | 4dfa08af79097d068d6657a4c77e7d474733b796 (diff) | |
Merge tag 'u-boot-nand-20240115' of https://source.denx.de/u-boot/custodians/u-boot-nand-flash
Pull request for u-boot-nand-20240115
The first patch is by Heinrich Schuchardt and fixes an integer overflow
The following two patches are by Dario Binacchi and add arguments check
to the nand_mtd_to_devnum() and nand_register() functions.
The remaining patches are by Roger Quadros and include various fixes for
the OMAP platform.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-k3/am642_init.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-k3/include/mach/am64_spl.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-k3/am642_init.c b/arch/arm/mach-k3/am642_init.c index 6085379f1d..ddf47ef0a9 100644 --- a/arch/arm/mach-k3/am642_init.c +++ b/arch/arm/mach-k3/am642_init.c @@ -348,6 +348,9 @@ static u32 __get_primary_bootmedia(u32 main_devstat) case BOOT_DEVICE_EMMC: return BOOT_DEVICE_MMC1; + case BOOT_DEVICE_NAND: + return BOOT_DEVICE_NAND; + case BOOT_DEVICE_MMC: if ((bootmode_cfg & MAIN_DEVSTAT_PRIMARY_MMC_PORT_MASK) >> MAIN_DEVSTAT_PRIMARY_MMC_PORT_SHIFT) diff --git a/arch/arm/mach-k3/include/mach/am64_spl.h b/arch/arm/mach-k3/include/mach/am64_spl.h index b4f396b2c0..a0a517019c 100644 --- a/arch/arm/mach-k3/include/mach/am64_spl.h +++ b/arch/arm/mach-k3/include/mach/am64_spl.h @@ -22,6 +22,7 @@ #define BOOT_DEVICE_USB 0x2A #define BOOT_DEVICE_DFU 0x0A +#define BOOT_DEVICE_NAND 0x0B #define BOOT_DEVICE_GPMC_NOR 0x0C #define BOOT_DEVICE_PCIE 0x0D #define BOOT_DEVICE_XSPI 0x0E |