On Tue, 17 Jun 2014, Russell King - ARM Linux wrote: > Given that we're now passing the linker script through GCC for C > preprocessing, it seems to me that we don't need to do the sed trick > anymore - we can pass TEXTADDR and ZBSSADDR into GCC via definitions > instead, so I've committed this patch after this one. No changes to > the vmlinux.lds.* file, it's just a pure rename. Ack? > > From: Russell King <[email protected]> > Subject: [PATCH] ARM: Simplify generation of compressed vmlinux.lds file > > As we are now using the C preprocessor, we do not need to use sed to > edit constants in this file, and then pass the resulting file through > the C preprocessor. Instead, rely solely on the C preprocessor to > rewrite TEXT_START and BSS_ADDR. > > Signed-off-by: Russell King <[email protected]> > --- > arch/arm/boot/compressed/.gitignore | 1 - > arch/arm/boot/compressed/Makefile | 5 +- > arch/arm/boot/compressed/vmlinux.lds.S | 90 > +++++++++++++++++++++++++++++++++ > arch/arm/boot/compressed/vmlinux.lds.in | 90 > ---------------------------------
Would be easier to review with git diff -M. > diff --git a/arch/arm/boot/compressed/vmlinux.lds.S > b/arch/arm/boot/compressed/vmlinux.lds.S > new file mode 100644 > index 000000000000..60162231c7ea [...] > diff --git a/arch/arm/boot/compressed/vmlinux.lds.in > b/arch/arm/boot/compressed/vmlinux.lds.in > deleted file mode 100644 > index 60162231c7ea..000000000000 OK, the SHA1 is the same so both files are identical. > --- a/arch/arm/boot/compressed/vmlinux.lds.in > +++ /dev/null > @@ -1,90 +0,0 @@ > -/* > - * linux/arch/arm/boot/compressed/vmlinux.lds.in You might want to update this comment though. Other than that... Acked-by: Nicolas Pitre <[email protected]> Nicolas -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
