diff options
| author | Tom Rini <trini@konsulko.com> | 2022-01-20 20:40:20 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-01-20 20:40:20 +0300 |
| commit | 2d7a463e82daeba4f6a7fb59bac0fe94d6f6d3a2 (patch) | |
| tree | 96e28ce689933dd4ebd120309a9caa2e02897d48 /configs | |
| parent | 3918376e91dac7711cf04bd06f8de80e797edfea (diff) | |
| parent | 8f880c3d89432e9988b23bb7099d6360c14a206f (diff) | |
| download | u-boot-2d7a463e82daeba4f6a7fb59bac0fe94d6f6d3a2.tar.xz | |
Merge https://source.denx.de/u-boot/custodians/u-boot-marvell
- fdt_support: Add fdt_for_each_node_by_compatible() helper macro
(Marek)
- turris_omnia: Fixup SATA or PCIe nodes at runtime in DT blob (Pali)
- pci_mvebu: Add support for Kirkwood PCIe controllers (Pali)
- SPL: More verifications for kwbimage in SPL (Pali)
- mvebu: Remove comphy_update_map() (Pali)
- Minor misc stuff
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/mvebu_db-88f3720_defconfig | 1 | ||||
| -rw-r--r-- | configs/mvebu_espressobin-88f3720_defconfig | 1 | ||||
| -rw-r--r-- | configs/turris_mox_defconfig | 1 | ||||
| -rw-r--r-- | configs/turris_omnia_defconfig | 1 | ||||
| -rw-r--r-- | configs/uDPU_defconfig | 1 |
5 files changed, 1 insertions, 4 deletions
diff --git a/configs/mvebu_db-88f3720_defconfig b/configs/mvebu_db-88f3720_defconfig index 931ca9c2fc..b600217692 100644 --- a/configs/mvebu_db-88f3720_defconfig +++ b/configs/mvebu_db-88f3720_defconfig @@ -64,7 +64,6 @@ CONFIG_PHY=y CONFIG_MVEBU_COMPHY_SUPPORT=y CONFIG_PINCTRL=y CONFIG_PINCTRL_ARMADA_37XX=y -CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_MVEBU_A3700_UART=y CONFIG_MVEBU_A3700_SPI=y CONFIG_USB=y diff --git a/configs/mvebu_espressobin-88f3720_defconfig b/configs/mvebu_espressobin-88f3720_defconfig index 3a69954fcd..ffe6518433 100644 --- a/configs/mvebu_espressobin-88f3720_defconfig +++ b/configs/mvebu_espressobin-88f3720_defconfig @@ -81,7 +81,6 @@ CONFIG_MVEBU_COMPHY_SUPPORT=y CONFIG_PINCTRL=y CONFIG_PINCTRL_ARMADA_37XX=y CONFIG_DM_REGULATOR_GPIO=y -CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_MVEBU_A3700_UART=y CONFIG_MVEBU_A3700_SPI=y CONFIG_USB=y diff --git a/configs/turris_mox_defconfig b/configs/turris_mox_defconfig index 3cae32f69b..415387b189 100644 --- a/configs/turris_mox_defconfig +++ b/configs/turris_mox_defconfig @@ -91,7 +91,6 @@ CONFIG_DM_RTC=y CONFIG_RTC_DS1307=y CONFIG_SCSI=y CONFIG_DM_SCSI=y -CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_MVEBU_A3700_UART=y CONFIG_MVEBU_A3700_SPI=y CONFIG_USB=y diff --git a/configs/turris_omnia_defconfig b/configs/turris_omnia_defconfig index 9d121b7982..d6f70caeaf 100644 --- a/configs/turris_omnia_defconfig +++ b/configs/turris_omnia_defconfig @@ -23,6 +23,7 @@ CONFIG_DEBUG_UART_BASE=0xd0012000 CONFIG_DEBUG_UART_CLOCK=250000000 CONFIG_DEBUG_UART=y CONFIG_AHCI=y +CONFIG_OF_BOARD_FIXUP=y CONFIG_DISTRO_DEFAULTS=y CONFIG_SYS_LOAD_ADDR=0x800000 CONFIG_FIT=y diff --git a/configs/uDPU_defconfig b/configs/uDPU_defconfig index fa2293bd3e..b5f2115e63 100644 --- a/configs/uDPU_defconfig +++ b/configs/uDPU_defconfig @@ -80,7 +80,6 @@ CONFIG_PINCTRL=y CONFIG_PINCTRL_ARMADA_37XX=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y -CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_MVEBU_A3700_UART=y CONFIG_MVEBU_A3700_SPI=y CONFIG_SYSINFO=y |