aboutsummaryrefslogtreecommitdiff
path: root/Kconfig
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2023-04-30 21:29:50 -0400
committerTom Rini <trini@konsulko.com>2023-04-30 21:29:50 -0400
commit27dc8826441f0c5dd6aa6617a32909d9049f1202 (patch)
tree18a2dcc2249614fe95b52983a5abe5e992d74840 /Kconfig
parentfe3a77cb157a6210d8036845f5f80ea67c183563 (diff)
parent25bc7bfc30532098d9207783ff2ca45cdc5a0161 (diff)
downloadu-boot-27dc8826441f0c5dd6aa6617a32909d9049f1202.zip
u-boot-27dc8826441f0c5dd6aa6617a32909d9049f1202.tar.gz
u-boot-27dc8826441f0c5dd6aa6617a32909d9049f1202.tar.bz2
Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-sunxiWIP/30Apr2023
Please pull the second part of the sunxi pull request for this cycle. Another bunch of patches that replace old-school U-Boot hacks with proper DM based code, this time for the raw NAND flash driver, and the USB PHY VBUS detection code. Plus two smaller patches that were sitting in my inbox for a while. Gitlab CI passed. In lack of some supported board with NAND flash I couldn't really test this part, but apparently this was tested by the reviewer. I briefly ran the branch on some boards with USB-OTG, and this still worked.
Diffstat (limited to 'Kconfig')
-rw-r--r--Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/Kconfig b/Kconfig
index 888b998..a372378 100644
--- a/Kconfig
+++ b/Kconfig
@@ -437,7 +437,7 @@ config BUILD_TARGET
default "u-boot-with-spl.sfp" if TARGET_SOCFPGA_ARRIA10
default "u-boot-with-spl.sfp" if TARGET_SOCFPGA_GEN5
default "u-boot.itb" if !BINMAN && SPL_LOAD_FIT && (ARCH_ROCKCHIP || \
- ARCH_SUNXI || RISCV || ARCH_ZYNQMP)
+ RISCV || ARCH_ZYNQMP)
default "u-boot.kwb" if (ARCH_KIRKWOOD || ARMADA_32BIT) && !SPL
help
Some SoCs need special image types (e.g. U-Boot binary