[PATCH 4/5] microblaze: drop CONFIG_NEEDS_MANUAL_RELOC

Michal Simek michal.simek at amd.com
Wed Mar 8 13:07:06 CET 2023



On 3/5/23 18:49, Ovidiu Panait wrote:
> Microblaze and m68k are the only remaining architectures that still enable
> CONFIG_NEEDS_MANUAL_RELOC by default.
> 
> Microblaze has had runtime relocation support using CONFIG_STATIC_RELA for
> quite some time, since commit d58c007498 ("microblaze: Add support for run
> time relocation"). Drop support for CONFIG_NEEDS_MANUAL_RELOC and make
> runtime relocation the default, as the rest of the architectures do.
> 
> Signed-off-by: Ovidiu Panait <ovpanait at gmail.com>
> ---
> 
>   arch/microblaze/Kconfig | 13 +------------
>   1 file changed, 1 insertion(+), 12 deletions(-)
> 
> diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
> index ce157a79cc..e38c9f6d71 100644
> --- a/arch/microblaze/Kconfig
> +++ b/arch/microblaze/Kconfig
> @@ -4,19 +4,8 @@ menu "MicroBlaze architecture"
>   config SYS_ARCH
>   	default "microblaze"
>   
> -config NEEDS_MANUAL_RELOC
> -	bool "Disable position-independent pre-relocation code"
> -	default y
> -	help
> -	  U-Boot expects to be linked to a specific hard-coded address, and to
> -	  be loaded to and run from that address. This option lifts that
> -	  restriction, thus allowing the code to be loaded to and executed from
> -	  almost any 4K aligned address. This logic relies on the relocation
> -	  information that is embedded in the binary to support U-Boot
> -	  relocating itself to the top-of-RAM later during execution.
> -
>   config STATIC_RELA
> -	def_bool y if !NEEDS_MANUAL_RELOC
> +	def_bool y
>   
>   choice
>   	prompt "Target select"

Reviewed-by: Michal Simek <michal.simek at amd.com>

Thanks,
Michal


More information about the U-Boot mailing list