diff options
Diffstat (limited to 'arch/arm/include/asm/barebox-arm.h')
| -rw-r--r-- | arch/arm/include/asm/barebox-arm.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/include/asm/barebox-arm.h b/arch/arm/include/asm/barebox-arm.h index 8e7b45c33d..0acdfa3dbc 100644 --- a/arch/arm/include/asm/barebox-arm.h +++ b/arch/arm/include/asm/barebox-arm.h @@ -143,9 +143,13 @@ static inline unsigned long arm_mem_barebox_image(unsigned long membase, if (IS_ENABLED(CONFIG_RELOCATABLE)) { endmem -= size; endmem &= ~(SZ_1M - 1); + return endmem; + } else { + if (TEXT_BASE >= membase && TEXT_BASE < endmem) + return TEXT_BASE; + else + return endmem; } - - return endmem; } #define ENTRY_FUNCTION(name, arg0, arg1, arg2) \ |