diff options
| author | Tom Rini <[email protected]> | 2024-10-25 11:55:23 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-10-25 11:55:23 -0600 |
| commit | 3fbc657669591ca893613f14d42e07069b7d56cd (patch) | |
| tree | b78085a9fda8d3fbf1caa8a5f337017f9acf55de /board | |
| parent | e8a45b50bbf9d6eb5903ce00285dcb6094715d91 (diff) | |
| parent | b3d9c6c71412fe63320e879d89873da672e69100 (diff) | |
Merge tag 'xilinx-for-v2025.01-rc1-v2' of https://source.denx.de/u-boot/custodians/u-boot-microblaze
AMD/Xilinx changes for v2025.01-rc1 v2
.mailmap:
- Switch Padmarao's email to AMD one
zynq_spi:
- Make update_stripe static
xilinx:
- Update DT description for EMMCs
zynqmp:
- Update logic around RPUs and tcm handling
- Update bootmenu selection for Kria
- Add description for SC vm-p-b1369
- Fix comment about file location in zynqmp-p-a2197-00-revA.dts
versal:
- Fix logic around USB boot
versal2:
- Disable useless features for Mini configurations
versal-net:
- Get rid of current-speed DT property from mini configuration
microblaze:
- Fix scriptaddr location
# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQQbPNTMvXmYlBPRwx7KSWXLKUoMIQUCZxuweAAKCRDKSWXLKUoM
# IY1iAKCH/GKJHEXFfLvr0OGuO6c1SX9+ZQCfTjRAHrL186X6LUgjOpmtmsrVK1c=
# =4gY0
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri 25 Oct 2024 08:51:36 AM CST
# gpg: using DSA key 1B3CD4CCBD79989413D1C31ECA4965CB294A0C21
# gpg: Good signature from "Michal Simek <[email protected]>" [full]
# gpg: aka "Michal Simek (Xilinx) <[email protected]>" [full]
# gpg: aka "Michal Simek (Xilinx) <[email protected]>" [full]
# gpg: aka "Michal Simek (AMD) <[email protected]>" [unknown]
Diffstat (limited to 'board')
| -rw-r--r-- | board/xilinx/microblaze-generic/microblaze-generic.c | 2 | ||||
| -rw-r--r-- | board/xilinx/zynqmp/zynqmp_kria.env | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/board/xilinx/microblaze-generic/microblaze-generic.c b/board/xilinx/microblaze-generic/microblaze-generic.c index dc4523824b4..6fc0512ce53 100644 --- a/board/xilinx/microblaze-generic/microblaze-generic.c +++ b/board/xilinx/microblaze-generic/microblaze-generic.c @@ -57,7 +57,7 @@ int board_late_init(void) max_size = gd->start_addr_sp - CONFIG_STACK_SIZE; max_size = round_down(max_size, SZ_16M); - status |= env_set_hex("scriptaddr", max_size + SZ_2M); + status |= env_set_hex("scriptaddr", (max_size - gd->ram_base) + SZ_2M); status |= env_set_hex("pxefile_addr_r", max_size + SZ_1M); diff --git a/board/xilinx/zynqmp/zynqmp_kria.env b/board/xilinx/zynqmp/zynqmp_kria.env index d0e431ebb46..927f398c3c3 100644 --- a/board/xilinx/zynqmp/zynqmp_kria.env +++ b/board/xilinx/zynqmp/zynqmp_kria.env @@ -51,8 +51,7 @@ som_mmc_boot=setenv boot_targets mmc0 && run distro_bootcmd # To disable bootmenu set enable_bootmenu=0 enable_bootmenu=1 -check_cc_for_default_boot=if test ${card1_name} = SCK-KV-G || test ${card1_name} = SCK-KR-G || test ${card1_name} = SCK-KD-G; then setenv bootmenu_default 1; else setenv bootmenu_default 0; fi -som_bootmenu=if test ${enable_bootmenu} = 1; then run check_cc_for_default_boot; bootmenu; else run som_mmc_boot; fi +som_bootmenu=if test ${enable_bootmenu} = 1; then bootmenu; else run som_mmc_boot; fi k26_starter=SMK-K26-XCL2G k24_starter=SMK-K24-XCL2G |