On Sat, 2013-10-05 at 09:55 +0200, Albert ARIBAUD wrote: > Hi FengHua, > > On Fri, 4 Oct 2013 23:55:01 +0800 (GMT+08:00), FengHua > <feng...@phytium.com.cn> wrote: > > > > > > > > arm64: rela relocation > > > > > > This lets us remove the manual relocation stuff from the arm64 patchset > > > (the symbol itself is removed by this patchset, but not all the new > > > manual relocations added by the arm64 patchset). > > > > > > I'm not terribly happy with the way relocate-rela is now, versus something > > > cleaner that operates on the ELF file, but it's good enough for now and > > > waiting longer to get rid of the manual relocations would be worse. > > > > > > This patchset is based on David's arm64 patchset v13. David, the first > > > two patches should be applied before your arm64 patches. Maybe the > > > fourth as well (except for the removal of the arm64 ifdef you added, > > > which would then need to be squashed with your patch). The third patch > > > should be squashed with your patches (plus you should remove the manual > > > relocs). > > > > > > Scott Wood (4): > > > arm64: Add tool to statically apply RELA relocations > > > arm64: Turn u-boot.bin back into an ELF file after relocate-rela > > > arm64: Non-manual relocation > > > arm64: Make checkarmreloc accept arm64 relocations > > > > > > Makefile | 39 ++++++-- > > > arch/arm/config.mk | 4 - > > > arch/arm/cpu/armv8/config.mk | 1 - > > > arch/arm/cpu/armv8/u-boot.lds | 32 +++++-- > > > arch/arm/include/asm/config.h | 5 -- > > > arch/arm/lib/crt0_64.S | 7 +- > > > arch/arm/lib/relocate_64.S | 41 ++++----- > > > include/configs/vexpress_aemv8a.h | 3 + > > > tools/Makefile | 6 ++ > > > tools/relocate-rela.c | 185 > > > ++++++++++++++++++++++++++++++++++++++ > > > 10 files changed, 276 insertions(+), 47 deletions(-) > > > create mode 100644 tools/relocate-rela.c > > > > > Great, some fixups related with relocation could be removed. > > I will modify arm64 patchset according this. > > Stop me if I'm missing something, but doesn't Scott's patch series need > yours? And if you remove the manual relocas in yours, doesn't that make > your series unable to function properly until Scott's series is applied > too? > > If I am not mistaken, then maybe Scott's and your patches should be > merged in a single series, with adequate attribution of course.
What you're missing is the note above where I suggest merging the two patchsets. :-) -Scott _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
