[U-Boot] [PATCH v3 01/28] Add a way to skip relocation

[Simon Glass]

On 5 August 2015 at 01:41, Bin Meng <bmeng.cn at gmail.com> wrote:
> On Wed, Aug 5, 2015 at 2:33 AM, Simon Glass <sjg at chromium.org> wrote:
>> When running U-Boot as an EFI application we cannot relocate since we do not
>> have relocation information. U-Boot has already been relocated to a suitable
>> address.
>>
>> Add a global_data flag to control skipping relocation.
>>
>> Signed-off-by: Simon Glass <sjg at chromium.org>
>> ---
>>
>> Changes in v3: None
>> Changes in v2: None
>>
>>  common/board_f.c                  | 7 +++++++
>>  include/asm-generic/global_data.h | 1 +
>>  2 files changed, 8 insertions(+)
>>
>> diff --git a/common/board_f.c b/common/board_f.c
>> index 6d922b8..c596083 100644
>> --- a/common/board_f.c
>> +++ b/common/board_f.c
>> @@ -664,6 +664,11 @@ static int reloc_fdt(void)
>>
>>  static int setup_reloc(void)
>>  {
>> +       if (gd->flags & GD_FLG_SKIP_RELOC) {
>> +               debug("Skipping relocation due to flag\n");
>> +               return 0;
>> +       }
>> +
>>  #ifdef CONFIG_SYS_TEXT_BASE
>>         gd->reloc_off = gd->relocaddr - CONFIG_SYS_TEXT_BASE;
>>  #ifdef CONFIG_M68K
>> @@ -689,6 +694,8 @@ static int setup_reloc(void)
>>
>>  static int jump_to_copy(void)
>>  {
>> +       if (gd->flags & GD_FLG_SKIP_RELOC)
>> +               return 0;
>>         /*
>>          * x86 is special, but in a nice way. It uses a trampoline which
>>          * enables the dcache if possible.
>> diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h
>> index 9f5db0f..2155265 100644
>> --- a/include/asm-generic/global_data.h
>> +++ b/include/asm-generic/global_data.h
>> @@ -117,5 +117,6 @@ typedef struct global_data {
>>  #define GD_FLG_SERIAL_READY    0x00100 /* Pre-reloc serial console ready  */
>>  #define GD_FLG_FULL_MALLOC_INIT        0x00200 /* Full malloc() is ready          */
>>  #define GD_FLG_SPL_INIT                0x00400 /* spl_init() has been called      */
>> +#define GD_FLG_SKIP_RELOC      0x00800 /* Don't relocate */
>>
>>  #endif /* __ASM_GENERIC_GBL_DATA_H */
>> --
>
> Reviewed-by: Bin Meng <bmeng.cn at gmail.com>

Squashed in the later patch:

http://patchwork.ozlabs.org/patch/503779/

Applied to u-boot-x86.