Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> --- arch/arm/Kconfig | 12 ------------ arch/arm/Makefile | 3 +-- arch/arm/lib/Makefile | 3 +-- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index af4cb59..d988455 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1,15 +1,3 @@ -# -# -# -config BOARD_LINKER_SCRIPT - bool - default n - -config GENERIC_LINKER_SCRIPT - bool - default y - depends on !BOARD_LINKER_SCRIPT - config ARM bool select HAS_KALLSYMS diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 1225df7..cbbc0a0 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -207,7 +207,6 @@ endif common-y += $(BOARD) $(MACH) common-y += arch/arm/lib/ arch/arm/cpu/ -lds-$(CONFIG_GENERIC_LINKER_SCRIPT) := arch/arm/lib/barebox.lds -lds-$(CONFIG_BOARD_LINKER_SCRIPT) := $(BOARD)/barebox.lds +lds-y := arch/arm/lib/barebox.lds CLEAN_FILES += include/generated/mach-types.h arch/arm/lib/barebox.lds diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile index 27a4b88..1eaf474 100644 --- a/arch/arm/lib/Makefile +++ b/arch/arm/lib/Makefile @@ -20,5 +20,4 @@ obj-$(CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS) += memcpy.o obj-$(CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS) += memset.o obj-$(CONFIG_ARM_UNWIND) += unwind.o obj-$(CONFIG_MODULES) += module.o -extra-$(CONFIG_GENERIC_LINKER_SCRIPT) += barebox.lds - +extra-y += barebox.lds -- 1.7.10.4 _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox
