random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-11-04 05:50:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pull request for spl-2023-10-rc2

Browse Source 
SPL:
 
 * use CONFIG_SPL_FS_LOAD_PAYLOAD_NAME when booting from NVMe
 * initialize PCI before booting
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEbcT5xx8ppvoGt20zxIHbvCwFGsQFAmTGlsYACgkQxIHbvCwF
 GsRh0Q//XvugoZ0iuEwX3EKrMCQ8sKhulvPM2R9lvNC5ZeZtchMRyfoHNsuNQNLf
 AT2m291sZiTTK34RaecKImmmnHL1q1NOqhLlnjFNf0BUJu5pFvajLkLjBKmbQgsU
 60lgjBDSR8oAwpeM1s/1VQDUpheEy9xPSfFItiZ3KJvwCvbHTkhlURBe8CAAfs4O
 kUf1QVZSaxLvg7rH5+BOuzTQNdtGRGDahiRLcMCPtNSzb7Nogy03suiXFKeXpIkw
 S0++fxujDhHVlQBWJ13t6xZ9ElDq+SQKy37XO+MXio977ycWxBZQY4oVtBUOkd4j
 eV20Hktey2NmXteBVsqcsAT6lAx1a8CfUgabAgBqqpOhu6tjyfDzcNLz2/X0PyDe
 i5KMG8lLtvwukst4Gd76rEi0Enbc91ls7vPIE1FYdSJmbYqKZ9F7tRHpz8zF6rNj
 Fqj05zHvsB8vSGvtFgtoGcg+5umj+nHZIwAw6qztaMyXvwLTBGXE1p7plNEQgS9m
 MY/Y83jL5SKOijZB3QzKukI60FKweJkeF6m/Z9MrtT51mMgnhP9CJqkyWtBDaehg
 679aNezaNAudd4iQcvef9kpRt1lT+QKXwywqOi/+wVci0mqGRZVkAgoJmCMXx7+y
 Km3ohWTSRHmjNj33lw5VjkyLkTF0RRBoD3720igOY6QsiW8jijk=
 =cPZt
 -----END PGP SIGNATURE-----

Merge tag 'spl-2023-10-rc2' of https://source.denx.de/u-boot/custodians/u-boot-efi

Pull request for spl-2023-10-rc2

SPL:

* use CONFIG_SPL_FS_LOAD_PAYLOAD_NAME when booting from NVMe
* initialize PCI before booting
This commit is contained in:
Tom Rini 2023-07-30 17:14:22 -04:00
commit 6aab91a8da
5 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/spl/spl.c
View File

@ -800,6 +800,13 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
IS_ENABLED(CONFIG_SPL_ATF)) IS_ENABLED(CONFIG_SPL_ATF))
dram_init_banksize(); 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(); bootcount_inc();
/* Dump driver model states to aid analysis */ /* Dump driver model states to aid analysis */

4
common/spl/spl_blk_fs.c
View File

@ -43,7 +43,7 @@ int spl_blk_load_image(struct spl_image_info *spl_image,
struct spl_boot_device *bootdev, struct spl_boot_device *bootdev,
enum uclass_id uclass_id, int devnum, int partnum) 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 disk_partition part_info = {};
struct legacy_img_hdr *header; struct legacy_img_hdr *header;
struct blk_desc *blk_desc; struct blk_desc *blk_desc;
@ -66,7 +66,7 @@ int spl_blk_load_image(struct spl_image_info *spl_image,
} }
dev.ifname = blk_get_uclass_name(uclass_id); 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); devnum, partnum);
ret = fs_set_blk_dev(dev.ifname, dev.dev_part_str, FS_TYPE_ANY); ret = fs_set_blk_dev(dev.ifname, dev.dev_part_str, FS_TYPE_ANY);
if (ret) { if (ret) {

5
common/spl/spl_nvme.c
View File

@ -7,7 +7,6 @@
#include <common.h> #include <common.h>
#include <spl.h> #include <spl.h>
#include <init.h>
#include <nvme.h> #include <nvme.h>
static int spl_nvme_load_image(struct spl_image_info *spl_image, static int spl_nvme_load_image(struct spl_image_info *spl_image,
@ -15,10 +14,6 @@ static int spl_nvme_load_image(struct spl_image_info *spl_image,
{ {
int ret; int ret;
ret = pci_init();
if (ret < 0)
return ret;
ret = nvme_scan_namespace(); ret = nvme_scan_namespace();
if (ret < 0) if (ret < 0)
return ret; return ret;

2
disk/part.c
View File

@ -508,9 +508,11 @@ int blk_get_device_part_str(const char *ifname, const char *dev_part_str,
#endif #endif
/* If no dev_part_str, use bootdevice environment variable */ /* If no dev_part_str, use bootdevice environment variable */
if (CONFIG_IS_ENABLED(ENV_SUPPORT)) {
if (!dev_part_str || !strlen(dev_part_str) || if (!dev_part_str || !strlen(dev_part_str) ||
!strcmp(dev_part_str, "-")) !strcmp(dev_part_str, "-"))
dev_part_str = env_get("bootdevice"); dev_part_str = env_get("bootdevice");
}
/* If still no dev_part_str, it's an error */ /* If still no dev_part_str, it's an error */
if (!dev_part_str) { if (!dev_part_str) {

3
drivers/pci/Kconfig
View File

@ -41,7 +41,8 @@ config PCI_PNP
Enable PCI memory and I/O space resource allocation and assignment. Enable PCI memory and I/O space resource allocation and assignment.
config SPL_PCI_PNP 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 help
Enable PCI memory and I/O space resource allocation and assignment. Enable PCI memory and I/O space resource allocation and assignment.