diff options
author | Tom Rini <trini@konsulko.com> | 2021-07-31 08:18:14 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2021-07-31 08:18:14 -0400 |
commit | 85769006fce951d0ebf61585ae0ab6b7d880735d (patch) | |
tree | 12a2b59bf6475489ce9d20ba79b65dc26286b1fa /common/spl/Kconfig | |
parent | 15f7e0dc01d8a851fb1bfbf0e47eab5b67ed26b3 (diff) | |
parent | 2cc4be280c259ac1e8e74c643c72e0331266056f (diff) | |
download | u-boot-WIP/31Jul2021.zip u-boot-WIP/31Jul2021.tar.gz u-boot-WIP/31Jul2021.tar.bz2 |
Merge https://source.denx.de/u-boot/custodians/u-boot-marvellWIP/31Jul2021
- kwboot / kwbimage improvements reducing image size (Pali & Marek)
- a37xx: pinctrl: Correct PWM pins definitions (Marek)
- Convert the Dreamplug Ethernet and SATA to Driver Model (Tony)
- serial: a37xx: DEBUG_UART improvements / fixes (Pali)
Diffstat (limited to 'common/spl/Kconfig')
-rw-r--r-- | common/spl/Kconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 9552ed4..c155a3b 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -344,7 +344,7 @@ config SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR default 0x75 if ARCH_DAVINCI default 0x8a if ARCH_MX6 || ARCH_MX7 default 0x100 if ARCH_UNIPHIER - default 0x140 if ARCH_MVEBU + default 0x0 if ARCH_MVEBU default 0x200 if ARCH_SOCFPGA || ARCH_AT91 default 0x300 if ARCH_ZYNQ || ARCH_KEYSTONE || OMAP34XX || OMAP44XX || \ OMAP54XX || AM33XX || AM43XX || ARCH_K3 @@ -1099,6 +1099,7 @@ config SPL_SATA_SUPPORT config SPL_SATA_RAW_U_BOOT_USE_SECTOR bool "SATA raw mode: by sector" depends on SPL_SATA_SUPPORT + default y if ARCH_MVEBU help Use sector number for specifying U-Boot location on SATA disk in raw mode. @@ -1106,6 +1107,7 @@ config SPL_SATA_RAW_U_BOOT_USE_SECTOR config SPL_SATA_RAW_U_BOOT_SECTOR hex "Sector on the SATA disk to load U-Boot from" depends on SPL_SATA_RAW_U_BOOT_USE_SECTOR + default 0x1 if ARCH_MVEBU help Sector on the SATA disk to load U-Boot from, when the SATA disk is being used in raw mode. Units: SATA disk sectors (1 sector = 512 bytes). |