From a5fd439a4844e39a0e0d4b7d3d13dbcf7aa433f5 Mon Sep 17 00:00:00 2001
From: Tom Urlings <tom.urlings@gmail.com>
Date: Mon, 12 May 2025 21:58:12 -0700
Subject: [PATCH] Avoid oboe overlap trip during loading of images

https://github.com/armbian/build/issues/8178
- Add switch to turn avoidance on/off
- Increment base address before alignment to resolve the oboe
- oboe observed in U-Boot v2021.04 and in particular with DT loading
---
 config/bootscripts/boot-mvebu.cmd | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/config/bootscripts/boot-mvebu.cmd b/config/bootscripts/boot-mvebu.cmd
index 4dab1bc1a..178be2fe3 100644
--- a/config/bootscripts/boot-mvebu.cmd
+++ b/config/bootscripts/boot-mvebu.cmd
@@ -3,9 +3,9 @@
 # Please edit /boot/armbianEnv.txt to set supported parameters
 #
 
-setenv load_addr      "0x00300000"
-setenv fdt_addr_r     "0x02040000" # max size 256 KiB (=dtb+dto+fdt_extrasize)
-setenv kernel_addr_r  "0x02080000" # max size 16 MiB
+setenv load_addr "0x00300000"
+setenv fdt_addr_r "0x02040000" # max size 256 KiB (=dtb+dto+fdt_extrasize)
+setenv kernel_addr_r "0x02080000" # max size 16 MiB
 setenv ramdisk_addr_r "0x03080000"
 
 # default values
@@ -21,7 +21,8 @@ setenv eth2addr "00:50:43:84:25:2f"
 setenv eth3addr "00:50:43:0d:19:18"
 setenv fdt_extrasize "0x00010000"
 setenv align_to "0x00001000"
-setenv align_addr_next 'setexpr modulo ${addr_next} % ${align_to} ; if itest $modulo -gt 0 ; then setexpr addr_next ${addr_next} / ${align_to} ; setexpr addr_next ${addr_next} + 1 ; setexpr addr_next ${addr_next} * ${align_to} ; fi'
+setenv align_overlap_oboe_avoidance "on"
+setenv align_addr_next 'if test "${align_overlap_oboe_avoidance}" = "on" ; then setexpr addr_next ${addr_next} + 1 ; fi ; setexpr modulo ${addr_next} % ${align_to} ; if itest ${modulo} -gt 0 ; then setexpr addr_next ${addr_next} / ${align_to} ; setexpr addr_next ${addr_next} + 1 ; setexpr addr_next ${addr_next} * ${align_to} ; fi'
 
 echo "Boot script loaded from ${devtype}"