diff options
author | Tom Rini <trini@konsulko.com> | 2024-04-20 15:16:17 -0600 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2024-04-20 15:16:17 -0600 |
commit | c08685289171e68afd4bae2eb2e279cdc49a407d (patch) | |
tree | 0bbed6c0795866a1b52d01dfe77c6dd15e7ba037 /board | |
parent | b064bb66a10c850e231c7a124b90c8a26f99bd88 (diff) | |
parent | 8b8c699d88171b0d40f072e114f32cce93cb2987 (diff) | |
download | u-boot-WIP/20Apr2024.zip u-boot-WIP/20Apr2024.tar.gz u-boot-WIP/20Apr2024.tar.bz2 |
Merge tag 'u-boot-imx-master-20240420' of https://gitlab.denx.de/u-boot/custodians/u-boot-imxWIP/20Apr2024
CI:
https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/20444
- Make i.MX93 boot less verbose.
- Remove unneedd environment variables from Toradex i.MX boards.
- Use gpio-hog on verdin-imx8mm/imx8mp.
- Add PCIe support for i.MX8MM.
- Add TPM support for imx8m*-venice.
Diffstat (limited to 'board')
-rw-r--r-- | board/freescale/imx93_evk/spl.c | 4 | ||||
-rw-r--r-- | board/gateworks/venice/venice.c | 7 | ||||
-rw-r--r-- | board/phytec/phycore_imx93/spl.c | 4 | ||||
-rw-r--r-- | board/variscite/imx93_var_som/spl.c | 4 |
4 files changed, 10 insertions, 9 deletions
diff --git a/board/freescale/imx93_evk/spl.c b/board/freescale/imx93_evk/spl.c index 7331a20..6d5e110 100644 --- a/board/freescale/imx93_evk/spl.c +++ b/board/freescale/imx93_evk/spl.c @@ -120,8 +120,8 @@ void board_init_f(ulong dummy) if (ret) { printf("Fail to init Sentinel API\n"); } else { - printf("SOC: 0x%x\n", gd->arch.soc_rev); - printf("LC: 0x%x\n", gd->arch.lifecycle); + debug("SOC: 0x%x\n", gd->arch.soc_rev); + debug("LC: 0x%x\n", gd->arch.lifecycle); } power_init_board(); diff --git a/board/gateworks/venice/venice.c b/board/gateworks/venice/venice.c index f54f118..5b105d7 100644 --- a/board/gateworks/venice/venice.c +++ b/board/gateworks/venice/venice.c @@ -230,6 +230,7 @@ uint mmc_get_env_part(struct mmc *mmc) int ft_board_setup(void *fdt, struct bd_info *bd) { const char *base_model = eeprom_get_baseboard_model(); + const char *path; char pcbrev; int off; @@ -238,10 +239,10 @@ int ft_board_setup(void *fdt, struct bd_info *bd) if (!strncmp(base_model, "GW73", 4)) { pcbrev = get_pcb_rev(base_model); + path = fdt_get_alias(fdt, "ethernet1"); - if (pcbrev > 'B' && pcbrev < 'E') { - printf("adjusting dt for %s\n", base_model); - + if (pcbrev > 'B' && pcbrev < 'E' && path && !strncmp(path, "/soc@0/pcie@", 12)) { + printf("adjusting %s pcie\n", base_model); /* * revC/D/E has PCIe 4-port switch which changes * ethernet1 PCIe GbE: diff --git a/board/phytec/phycore_imx93/spl.c b/board/phytec/phycore_imx93/spl.c index f03bfee..5efa38a 100644 --- a/board/phytec/phycore_imx93/spl.c +++ b/board/phytec/phycore_imx93/spl.c @@ -126,8 +126,8 @@ void board_init_f(ulong dummy) if (ret) { printf("Fail to init ELE API\n"); } else { - printf("SOC: 0x%x\n", gd->arch.soc_rev); - printf("LC: 0x%x\n", gd->arch.lifecycle); + debug("SOC: 0x%x\n", gd->arch.soc_rev); + debug("LC: 0x%x\n", gd->arch.lifecycle); } clock_init(); diff --git a/board/variscite/imx93_var_som/spl.c b/board/variscite/imx93_var_som/spl.c index 71f346c..8852aea 100644 --- a/board/variscite/imx93_var_som/spl.c +++ b/board/variscite/imx93_var_som/spl.c @@ -125,8 +125,8 @@ void board_init_f(ulong dummy) if (ret) { printf("Fail to init ELE API\n"); } else { - printf("SOC: 0x%x\n", gd->arch.soc_rev); - printf("LC: 0x%x\n", gd->arch.lifecycle); + debug("SOC: 0x%x\n", gd->arch.soc_rev); + debug("LC: 0x%x\n", gd->arch.lifecycle); } power_init_board(); |