diff options
| author | Tom Rini <[email protected]> | 2026-02-23 13:45:55 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2026-02-23 13:45:55 -0600 |
| commit | 15bd3258174b8c8791d7779f66d26ece9545b1c0 (patch) | |
| tree | 634188f66b83e1554ffea95c4702df25b61ce20e /include | |
| parent | ef65b15383c99f4562539a635fe166fb4d75c0e3 (diff) | |
| parent | 4f70106beafe30df8b0528a3d8b2543cd48fe241 (diff) | |
Merge tag 'v2026.04-rc3' into next
Prepare v2026.04-rc3
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/amd_versal2.h | 4 | ||||
| -rw-r--r-- | include/env/ti/ti_common.env | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/include/configs/amd_versal2.h b/include/configs/amd_versal2.h index 05ddd4eabe1..404af2cd4c6 100644 --- a/include/configs/amd_versal2.h +++ b/include/configs/amd_versal2.h @@ -16,8 +16,8 @@ /* #define CONFIG_ARMV8_SWITCH_TO_EL1 */ /* Generic Interrupt Controller Definitions */ -#define GICD_BASE 0xF9000000 -#define GICR_BASE 0xF9060000 +#define GICD_BASE 0xe2000000 +#define GICR_BASE 0xe2060000 /* Serial setup */ #define CFG_SYS_BAUDRATE_TABLE \ diff --git a/include/env/ti/ti_common.env b/include/env/ti/ti_common.env index 03e3267ef8a..a0ed83f52ac 100644 --- a/include/env/ti/ti_common.env +++ b/include/env/ti/ti_common.env @@ -22,11 +22,10 @@ get_fit_overlaystring= done; get_fit_config=setexpr name_fit_config gsub / _ conf-${fdtfile} run_fit=run get_fit_config; bootm ${addr_fit}#${name_fit_config}${overlaystring} -do_main_cpsw0_qsgmii_phyinit=0 bootcmd_ti_mmc= run init_${boot}; #if CONFIG_CMD_REMOTEPROC - if test ${do_main_cpsw0_qsgmii_phyinit} -eq 1; + if env exists do_main_cpsw0_qsgmii_phyinit; then run main_cpsw0_qsgmii_phyinit; fi; run boot_rprocs; |