a8a0d9c12f
Update to version 2024.01 to remove upstream patches. The remaining patches come from this repository: https://github.com/smaeul/u-boot/tree/d1-wip [for Dongshan Nezha STU, Nezha D1] Tested-by: Zoltan HERPAI <wigyori@uid0.hu> Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn>
52 lines
1.5 KiB
Diff
52 lines
1.5 KiB
Diff
From cfe45b43247eca1f3ca82c76a114dd0201b23b40 Mon Sep 17 00:00:00 2001
|
|
From: Samuel Holland <samuel@sholland.org>
|
|
Date: Thu, 4 Aug 2022 23:29:13 -0500
|
|
Subject: [PATCH 11/68] sunxi: Add missing dependencies to Kconfig selections
|
|
|
|
Some of the selected symbols have a user-visible dependency. Make the
|
|
selections conditional on that dependency to avoid creating invalid
|
|
configurations.
|
|
|
|
Signed-off-by: Samuel Holland <samuel@sholland.org>
|
|
---
|
|
arch/arm/Kconfig | 14 +++++++-------
|
|
1 file changed, 7 insertions(+), 7 deletions(-)
|
|
|
|
--- a/arch/arm/Kconfig
|
|
+++ b/arch/arm/Kconfig
|
|
@@ -1122,28 +1122,28 @@ config ARCH_SOCFPGA
|
|
config ARCH_SUNXI
|
|
bool "Support sunxi (Allwinner) SoCs"
|
|
select BINMAN
|
|
- select CMD_GPIO
|
|
+ select CMD_GPIO if GPIO
|
|
select CMD_MMC if MMC
|
|
select CMD_USB if DISTRO_DEFAULTS && USB_HOST
|
|
select CLK
|
|
select DM
|
|
- select DM_GPIO
|
|
+ select DM_GPIO if GPIO
|
|
select DM_I2C if I2C
|
|
+ select DM_SCSI if SCSI
|
|
+ select DM_SERIAL if SERIAL
|
|
select DM_SPI if SPI
|
|
select DM_SPI_FLASH if SPI
|
|
- select DM_SCSI if SCSI
|
|
- select DM_SERIAL
|
|
select OF_BOARD_SETUP
|
|
select OF_CONTROL
|
|
select OF_SEPARATE
|
|
select PINCTRL
|
|
- select SPECIFY_CONSOLE_INDEX
|
|
+ select SPECIFY_CONSOLE_INDEX if SERIAL
|
|
select SPL_SEPARATE_BSS if SPL
|
|
select SPL_STACK_R if SPL
|
|
select SPL_SYS_MALLOC_SIMPLE if SPL
|
|
select SPL_SYS_THUMB_BUILD if !ARM64
|
|
- select SUNXI_GPIO
|
|
- select SYS_NS16550
|
|
+ select SUNXI_GPIO if GPIO
|
|
+ select SYS_NS16550 if SERIAL
|
|
select SYS_THUMB_BUILD if !ARM64
|
|
select USB if DISTRO_DEFAULTS
|
|
select USB_KEYBOARD if DISTRO_DEFAULTS && USB_HOST
|