From 5550a152baf612ed8acecc11074f72c40b7c02c1 Mon Sep 17 00:00:00 2001 From: Padmarao Begari Date: Tue, 1 Oct 2024 13:55:37 +0530 Subject: xilinx: common: fix script address for Microblaze Fix the issue introduced by commit 067e0294806e ("board: xilinx: Remove conditional check for Microblaze"). The scriptaddr should be physical location not really offset from start of DDR. When U-Boot is not found boot.scr script address in device tree, then it is assigned based on script address and ram base address for Microblaze and i.e exceeding DDR memory. To fix this, the script address is assigned initially with offset instead of address. Later it is added with ram base address and gets the physical address. Signed-off-by: Padmarao Begari Link: https://lore.kernel.org/r/20241001082537.830286-1-padmarao.begari@amd.com Signed-off-by: Michal Simek --- board/xilinx/microblaze-generic/microblaze-generic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'board') 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); -- cgit v1.3.1 From 2f8a471231be2907b06a54ab7504a2ab412e3804 Mon Sep 17 00:00:00 2001 From: John Vicky Vykuntapu Date: Wed, 2 Oct 2024 13:15:17 +0200 Subject: xilinx: zynqmp: Remove conditional check for bootmenu_default variable As per bootmenu support added default boot options to CC on AMD CCs and default to SOM on others. However, if no secondary boot device is enabled in the design,it should be the default boot option for SOM when combined with AMD CCs because it only contains SOM peripherals. To address this issue, The conditional check for the bootmenu_default variable was removed, and it has always been set to SOM as the default boot option. In this way, users can choose preferred boot options from the bootmenu based on the boot devices configured in the design for AMD CCs. Fixes: 61bf0fa8663d ("xilinx: zynqmp: Add bootmenu support") Signed-off-by: John Vicky Vykuntapu Signed-off-by: Michal Simek Link: https://lore.kernel.org/r/0e30b44ce3b478fdec21edad8d896f4d438ce331.1727867715.git.michal.simek@amd.com --- board/xilinx/zynqmp/zynqmp_kria.env | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'board') 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 -- cgit v1.3.1