aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--MAINTAINERS9
-rw-r--r--arch/arm/dts/am335x-evm-u-boot.dtsi30
-rw-r--r--arch/arm/dts/am335x-sancloud-bbe-lite-u-boot.dtsi44
-rw-r--r--arch/arm/dts/am335x-sancloud-bbe-lite.dts2
-rw-r--r--arch/arm/dts/am335x-sancloud-bbe-u-boot.dtsi6
-rw-r--r--board/raspberrypi/rpi/MAINTAINERS1
-rw-r--r--configs/am335x_evm_defconfig1
-rw-r--r--configs/am335x_evm_spiboot_defconfig5
-rw-r--r--configs/tools-only_defconfig1
-rw-r--r--drivers/Makefile2
-rw-r--r--drivers/bus/Kconfig9
-rw-r--r--drivers/bus/Makefile5
-rw-r--r--drivers/core/lists.c6
13 files changed, 111 insertions, 10 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index bc9081b62a..75b27bc1cc 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -192,6 +192,7 @@ N: aspeed
ARM BROADCOM BCM283X / BCM27XX
M: Matthias Brugger <mbrugger@suse.com>
+M: Peter Robinson <pbrobinson@gmail.com>
S: Maintained
F: arch/arm/dts/bcm283*
F: arch/arm/mach-bcm283x/
@@ -494,6 +495,12 @@ F: arch/arm/mach-exynos/
F: arch/arm/mach-s5pc1xx/
F: arch/arm/cpu/armv7/s5p-common/
+ARM SANCLOUD
+M: Paul Barker <paul.barker@sancloud.com>
+R: Marc Murphy <marc.murphy@sancloud.com>
+S: Supported
+F: arch/arm/dts/am335x-sancloud*
+
ARM SNAPDRAGON
M: Ramon Fried <rfried.dev@gmail.com>
S: Maintained
@@ -854,7 +861,6 @@ F: cmd/dfu.c
F: cmd/usb_*.c
F: common/dfu.c
F: common/update.c
-F: common/usb_storage.c
F: doc/api/dfu.rst
F: doc/usage/dfu.rst
F: drivers/dfu/
@@ -1482,6 +1488,7 @@ T: git https://source.denx.de/u-boot/custodians/u-boot-usb.git
F: drivers/usb/
F: common/usb.c
F: common/usb_kbd.c
+F: common/usb_storage.c
F: include/usb.h
USB xHCI
diff --git a/arch/arm/dts/am335x-evm-u-boot.dtsi b/arch/arm/dts/am335x-evm-u-boot.dtsi
index 4cf5f9928d..8fc65df2ef 100644
--- a/arch/arm/dts/am335x-evm-u-boot.dtsi
+++ b/arch/arm/dts/am335x-evm-u-boot.dtsi
@@ -6,9 +6,9 @@
#include "am33xx-u-boot.dtsi"
&l4_per {
-
+ u-boot,dm-pre-reloc;
segment@300000 {
-
+ u-boot,dm-pre-reloc;
target-module@e000 {
u-boot,dm-pre-reloc;
@@ -26,3 +26,29 @@
&usb0 {
dr_mode = "peripheral";
};
+
+&i2c0 {
+ u-boot,dm-pre-reloc;
+};
+
+&l4_wkup {
+ u-boot,dm-pre-reloc;
+ segment@200000 {
+ u-boot,dm-pre-reloc;
+ target-module@9000 {
+ u-boot,dm-pre-reloc;
+ };
+ };
+};
+
+&uart0 {
+ u-boot,dm-pre-reloc;
+};
+
+&mmc1 {
+ u-boot,dm-pre-reloc;
+};
+
+&mmc2 {
+ u-boot,dm-pre-reloc;
+};
diff --git a/arch/arm/dts/am335x-sancloud-bbe-lite-u-boot.dtsi b/arch/arm/dts/am335x-sancloud-bbe-lite-u-boot.dtsi
new file mode 100644
index 0000000000..01c105ebb3
--- /dev/null
+++ b/arch/arm/dts/am335x-sancloud-bbe-lite-u-boot.dtsi
@@ -0,0 +1,44 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/
+ * Copyright (C) 2021 SanCloud Ltd
+ */
+
+#include "am335x-sancloud-bbe-u-boot.dtsi"
+
+&l4_wkup {
+ segment@200000 {
+ target-module@0 {
+ u-boot,dm-pre-reloc;
+ };
+ };
+};
+
+&prcm {
+ u-boot,dm-pre-reloc;
+};
+
+&per_cm {
+ u-boot,dm-pre-reloc;
+};
+
+&l4ls_clkctrl {
+ u-boot,dm-pre-reloc;
+};
+
+&l4_per {
+ u-boot,dm-pre-reloc;
+ segment@0 {
+ u-boot,dm-pre-reloc;
+ target-module@30000 {
+ u-boot,dm-pre-reloc;
+ };
+ };
+};
+
+&spi0 {
+ u-boot,dm-pre-reloc;
+ channel@0 {
+ u-boot,dm-pre-reloc;
+ };
+};
diff --git a/arch/arm/dts/am335x-sancloud-bbe-lite.dts b/arch/arm/dts/am335x-sancloud-bbe-lite.dts
index d6ef19311a..8ffbc72dc5 100644
--- a/arch/arm/dts/am335x-sancloud-bbe-lite.dts
+++ b/arch/arm/dts/am335x-sancloud-bbe-lite.dts
@@ -41,7 +41,7 @@
#address-cells = <1>;
#size-cells = <0>;
- compatible = "micron,spi-authenta";
+ compatible = "micron,spi-authenta", "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <16000000>;
diff --git a/arch/arm/dts/am335x-sancloud-bbe-u-boot.dtsi b/arch/arm/dts/am335x-sancloud-bbe-u-boot.dtsi
new file mode 100644
index 0000000000..06e7554a63
--- /dev/null
+++ b/arch/arm/dts/am335x-sancloud-bbe-u-boot.dtsi
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2022 SanCloud Ltd
+ */
+
+#include "am335x-evm-u-boot.dtsi"
diff --git a/board/raspberrypi/rpi/MAINTAINERS b/board/raspberrypi/rpi/MAINTAINERS
index 4f1b23efc8..98935119f0 100644
--- a/board/raspberrypi/rpi/MAINTAINERS
+++ b/board/raspberrypi/rpi/MAINTAINERS
@@ -1,5 +1,6 @@
RPI BOARD
M: Matthias Brugger <mbrugger@suse.com>
+M: Peter Robinson <pbrobinson@gmail.com>
S: Maintained
F: board/raspberrypi/rpi/
F: include/configs/rpi.h
diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig
index f0fbe475b3..f73123e0b7 100644
--- a/configs/am335x_evm_defconfig
+++ b/configs/am335x_evm_defconfig
@@ -92,6 +92,7 @@ CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
CONFIG_SYS_NAND_U_BOOT_OFFS=0xc0000
CONFIG_DM_SPI_FLASH=y
CONFIG_SF_DEFAULT_SPEED=24000000
+CONFIG_SPI_FLASH_STMICRO=y
CONFIG_SPI_FLASH_WINBOND=y
CONFIG_PHY_ATHEROS=y
CONFIG_PHY_SMSC=y
diff --git a/configs/am335x_evm_spiboot_defconfig b/configs/am335x_evm_spiboot_defconfig
index 3d04e6fa93..7f422010c1 100644
--- a/configs/am335x_evm_spiboot_defconfig
+++ b/configs/am335x_evm_spiboot_defconfig
@@ -53,10 +53,14 @@ CONFIG_SPL_ENV_IS_NOWHERE=y
CONFIG_VERSION_VARIABLE=y
CONFIG_NET_RETRY_COUNT=10
CONFIG_BOOTP_SEND_HOSTNAME=y
+CONFIG_SPL_OF_TRANSLATE=y
+CONFIG_SPL_TI_SYSC=y
CONFIG_BOOTCOUNT_LIMIT=y
CONFIG_SYS_BOOTCOUNT_BE=y
CONFIG_CLK=y
+CONFIG_SPL_CLK=y
CONFIG_CLK_CDCE9XX=y
+CONFIG_CLK_TI_CTRL=y
CONFIG_DFU_TFTP=y
CONFIG_DFU_MMC=y
CONFIG_DFU_NAND=y
@@ -80,6 +84,7 @@ CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
CONFIG_SYS_NAND_U_BOOT_OFFS=0xc0000
CONFIG_DM_SPI_FLASH=y
CONFIG_SF_DEFAULT_SPEED=24000000
+CONFIG_SPI_FLASH_STMICRO=y
CONFIG_SPI_FLASH_WINBOND=y
CONFIG_PHY_ATHEROS=y
CONFIG_PHY_SMSC=y
diff --git a/configs/tools-only_defconfig b/configs/tools-only_defconfig
index 86464d2f07..de99f3857c 100644
--- a/configs/tools-only_defconfig
+++ b/configs/tools-only_defconfig
@@ -27,6 +27,7 @@ CONFIG_DM_RTC=y
CONFIG_SOUND=y
CONFIG_SYSRESET=y
CONFIG_TIMER=y
+CONFIG_VIDEO=y
# CONFIG_VIRTIO_MMIO is not set
# CONFIG_VIRTIO_PCI is not set
# CONFIG_VIRTIO_SANDBOX is not set
diff --git a/drivers/Makefile b/drivers/Makefile
index ac2d83af4e..6f1de58e00 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -37,6 +37,7 @@ obj-$(CONFIG_$(SPL_)SYSINFO) += sysinfo/
obj-$(CONFIG_$(SPL_TPL_)TPM) += tpm/
obj-$(CONFIG_XEN) += xen/
obj-$(CONFIG_$(SPL_)FPGA) += fpga/
+obj-y += bus/
ifndef CONFIG_TPL_BUILD
ifndef CONFIG_VPL_BUILD
@@ -77,7 +78,6 @@ ifeq ($(CONFIG_SPL_BUILD)$(CONFIG_TPL_BUILD),)
obj-y += adc/
obj-y += ata/
-obj-y += bus/
obj-$(CONFIG_DM_DEMO) += demo/
obj-$(CONFIG_BIOSEMU) += bios_emulator/
obj-y += block/
diff --git a/drivers/bus/Kconfig b/drivers/bus/Kconfig
index d742ed333b..e60aa722b9 100644
--- a/drivers/bus/Kconfig
+++ b/drivers/bus/Kconfig
@@ -13,7 +13,14 @@ config TI_PWMSS
config TI_SYSC
bool "TI sysc interconnect target module driver"
- depends on ARCH_OMAP2PLUS
+ depends on DM && ARCH_OMAP2PLUS
+ help
+ Generic driver for Texas Instruments interconnect target module
+ found on many TI SoCs.
+
+config SPL_TI_SYSC
+ bool "Support TI sysc interconnect in SPL"
+ depends on SPL_DM && TI_SYSC
help
Generic driver for Texas Instruments interconnect target module
found on many TI SoCs.
diff --git a/drivers/bus/Makefile b/drivers/bus/Makefile
index a2e71c7b3b..0802b9666b 100644
--- a/drivers/bus/Makefile
+++ b/drivers/bus/Makefile
@@ -3,6 +3,9 @@
# Makefile for the bus drivers.
#
+ifeq ($(CONFIG_SPL_BUILD)$(CONFIG_TPL_BUILD),)
obj-$(CONFIG_TI_PWMSS) += ti-pwmss.o
-obj-$(CONFIG_TI_SYSC) += ti-sysc.o
obj-$(CONFIG_UNIPHIER_SYSTEM_BUS) += uniphier-system-bus.o
+endif
+
+obj-$(CONFIG_$(SPL_)TI_SYSC) += ti-sysc.o
diff --git a/drivers/core/lists.c b/drivers/core/lists.c
index 3878957c9e..8034a8f48d 100644
--- a/drivers/core/lists.c
+++ b/drivers/core/lists.c
@@ -120,10 +120,10 @@ int lists_bind_drivers(struct udevice *parent, bool pre_reloc_only)
int ret;
ret = bind_drivers_pass(parent, pre_reloc_only);
- if (!ret)
- break;
- if (ret != -EAGAIN && !result)
+ if (!result || result == -EAGAIN)
result = ret;
+ if (ret != -EAGAIN)
+ break;
}
return result;
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-04 17:57:14 +0000