Merge tag 'u-boot-rockchip-20230731' of https://source.denx.de/u-boot/custodians/u-boot-rockchip
- Update dwc3 generic driver and update support for rk3568/rk3328;
- Add boards:
rk3566: Pine64 Quartz64-A/B, SOQuartz on Model A/Blade/CM4-IO
rk3568: Radxa E25 Carrier Board
rk3588: Radxa ROCK5A
- Fixes and updates for chromebook veryon/jerry/speedy;
- SPI support fixes for rk3399/rk3568/rk3588;
- rk3588 usbdp phy support;
- dts and config updates for different boards;
diff --git a/board/radxa/rock5a-rk3588s/MAINTAINERS b/board/radxa/rock5a-rk3588s/MAINTAINERS
index 26e0ed9..62fb6b4 100644
--- a/board/radxa/rock5a-rk3588s/MAINTAINERS
+++ b/board/radxa/rock5a-rk3588s/MAINTAINERS
@@ -2,5 +2,5 @@
M: Eugen Hristev <eugen.hristev@collabora.com>
S: Maintained
F: board/radxa/rock5a-rk3588s
-F: include/configs/rock5a-rk3588.h
-F: configs/rock5a-rk3588_defconfig
+F: include/configs/rock5a-rk3588s.h
+F: configs/rock5a-rk3588s_defconfig
diff --git a/common/spl/spl.c b/common/spl/spl.c
index f09bb97..0062f3f 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -800,6 +800,13 @@
IS_ENABLED(CONFIG_SPL_ATF))
dram_init_banksize();
+ if (CONFIG_IS_ENABLED(PCI)) {
+ ret = pci_init();
+ if (ret)
+ puts(SPL_TPL_PROMPT "Cannot initialize PCI\n");
+ /* Don't fail. We still can try other boot methods. */
+ }
+
bootcount_inc();
/* Dump driver model states to aid analysis */
diff --git a/common/spl/spl_blk_fs.c b/common/spl/spl_blk_fs.c
index d97adc4..16ecece 100644
--- a/common/spl/spl_blk_fs.c
+++ b/common/spl/spl_blk_fs.c
@@ -43,7 +43,7 @@
struct spl_boot_device *bootdev,
enum uclass_id uclass_id, int devnum, int partnum)
{
- const char *filename = CONFIG_SPL_PAYLOAD;
+ const char *filename = CONFIG_SPL_FS_LOAD_PAYLOAD_NAME;
struct disk_partition part_info = {};
struct legacy_img_hdr *header;
struct blk_desc *blk_desc;
@@ -66,7 +66,7 @@
}
dev.ifname = blk_get_uclass_name(uclass_id);
- snprintf(dev.dev_part_str, sizeof(dev.dev_part_str) - 1, "%d:%d",
+ snprintf(dev.dev_part_str, sizeof(dev.dev_part_str) - 1, "%x:%x",
devnum, partnum);
ret = fs_set_blk_dev(dev.ifname, dev.dev_part_str, FS_TYPE_ANY);
if (ret) {
diff --git a/common/spl/spl_nvme.c b/common/spl/spl_nvme.c
index 2af63f1..c8774d6 100644
--- a/common/spl/spl_nvme.c
+++ b/common/spl/spl_nvme.c
@@ -7,7 +7,6 @@
#include <common.h>
#include <spl.h>
-#include <init.h>
#include <nvme.h>
static int spl_nvme_load_image(struct spl_image_info *spl_image,
@@ -15,10 +14,6 @@
{
int ret;
- ret = pci_init();
- if (ret < 0)
- return ret;
-
ret = nvme_scan_namespace();
if (ret < 0)
return ret;
diff --git a/disk/part.c b/disk/part.c
index 186ee96..eec02f5 100644
--- a/disk/part.c
+++ b/disk/part.c
@@ -508,9 +508,11 @@
#endif
/* If no dev_part_str, use bootdevice environment variable */
- if (!dev_part_str || !strlen(dev_part_str) ||
- !strcmp(dev_part_str, "-"))
- dev_part_str = env_get("bootdevice");
+ if (CONFIG_IS_ENABLED(ENV_SUPPORT)) {
+ if (!dev_part_str || !strlen(dev_part_str) ||
+ !strcmp(dev_part_str, "-"))
+ dev_part_str = env_get("bootdevice");
+ }
/* If still no dev_part_str, it's an error */
if (!dev_part_str) {
diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index aca439d..93e6f50 100644
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -41,7 +41,8 @@
Enable PCI memory and I/O space resource allocation and assignment.
config SPL_PCI_PNP
- bool "Enable Plug & Play support for PCI"
+ bool "Enable Plug & Play support for PCI in SPL"
+ depends on SPL_PCI
help
Enable PCI memory and I/O space resource allocation and assignment.