Skip to content

Factorize ARM relocate_code instances

Benoît Thébaudeau u-boot 3 versions – New

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v4 Latest posting 2/20 of 4 patches 0 repliesNew
  2. v4 posting 1/24 patches 0 repliesSuperseded
  3. v31 of 4 patches 0 repliesSuperseded

Patches in v4 posting 2/2 No applies recorded yet

None of the 4 patches the cover letter announces are in this archive.

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v4 yet.

Read the v4 thread

Cover letter [U-Boot] [PATCH v4 0/4] Factorize ARM relocate_code instances

Hi Fabio, Stefano,

Quoted 61 lines · Albert ARIBAUD

Hi Beno?t,

Quoted 56 lines · Beno?t Th?baudeau

Hi Albert,

Quoted 44 lines · Albert ARIBAUD

This series replaces all instances of relocate_code in various start.S files from the ARM architecture with a single instance in arch/arm/lib/relocate.S.

This is done in steps, each step keeping the whole of ARM U-Boot buildable and runnable and touching as little code as necessary.

1. Drop mx31pdk SPL call to relocate_code

In SPL of mx31pdk, board_init_f calls relocate_code to move SPL from the NAND read buffer to SRAM. This move is not a relocation and is thus better implemented as a simple ad hoc copy loop.

2. Drop tx25 SPL call to relocate_code

Same as mx31pdk.

3. Prevent all SPLs from assembling relocate_code

Now that no SPL uses relocate_code any more, remove it completely from SPL builds by putting it entirely between #ifndef CONFIG_SPL_BUILD and #endif preprocessor conditional.

4. Actual factorization of relocate_code

Remove all instances of relocate_code from start.S and create a new file, arch/arm/lib/relocate.S, to provide the new single instance of relocate_code.

The only non-trivial change is that for PXA25X, a call to unlock (actually disable) dcache is moved from before relocating to after relocating. As this cache is either locked-as-RAM or disabled, but never used as actual DDR cache, this move has no performance effect on relocation and no functional impact either.

The relocation routine was step-tested on versatileqemu under gdb. Especially, both relocation offset (from _start to addr_moni and local offsets (from relocate_code to several linker script symbols) have been verified.

Quoted 4 lines

Changes in v4:
- added blank line after PXA25X conditional code
- fixed typos in relocate_code comments
- brought back 'mov pc,lr' instead of 'bx lr' for ARMv4

[...]

Perfect!

Quoted 7 lines
Quoted 2 lines

For this v4 series:

Thanks Beno?t!

Now I need some people to regression-test it on their HW, both ARM and non-ARM just in case.

Can you test this series on mx31pdk (directly changed by this series), and some other i.MX EVK (e.g. ARMv7, so mx51evk or mx53*) board please? That should be enough for ARM.

Best regards,
Beno?t