From fb75a2bb53a16069e2837ea1a4fa1bd99d636dd4 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Tue, 17 May 2016 14:01:18 +0800 Subject: nios2: Fix libgcc location detection The extra CFLAGS required for correct operation of the toolchain are not propagated into the libgcc detection code. In case of the compiler from poky sdk, these extra CFLAGS contain the location of compiler sysroot (the --sysroot= option) and without this option, the location of libgcc is not properly reported. Add the missing CFLAGS to address this issue. Signed-off-by: Marek Vasut Cc: Ley Foon Tan Cc: Romain Perier Acked-by: Romain Perier Acked-by: Ley Foon Tan --- arch/nios2/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/nios2') diff --git a/arch/nios2/Makefile b/arch/nios2/Makefile index 2328f82ba2a8..08130febf0a3 100644 --- a/arch/nios2/Makefile +++ b/arch/nios2/Makefile @@ -20,7 +20,7 @@ UTS_SYSNAME = Linux export MMU -LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name) +LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) $(KCFLAGS) -print-libgcc-file-name) KBUILD_CFLAGS += -pipe -D__linux__ -D__ELF__ KBUILD_CFLAGS += $(if $(CONFIG_NIOS2_HW_MUL_SUPPORT),-mhw-mul,-mno-hw-mul) -- cgit v1.2.3 From 9fa78f63a8921ce37252be34ef8eea2f4bfbb13f Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Thu, 19 May 2016 09:05:38 +0800 Subject: nios2: Add order-only DTC dependency to %.dtb target The dtc dependency is missing, thus dtc is not built before it's invoked, resulting in the following problem: linux-2.6$ make 10m50_defconfig && make 10m50_devboard.dtb [...] scripts/kconfig/conf --silentoldconfig Kconfig DTC arch/nios2/boot/10m50_devboard.dtb /bin/sh: 1: ./scripts/dtc/dtc: not found arch/nios2/boot/Makefile:52: recipe for target 'arch/nios2/boot/10m50_devboard.dtb' failed make[1]: *** [arch/nios2/boot/10m50_devboard.dtb] Error 127 arch/nios2/Makefile:57: recipe for target '10m50_devboard.dtb' failed make: *** [10m50_devboard.dtb] Error 2 Signed-off-by: Marek Vasut Cc: Ley Foon Tan Cc: Romain Perier Acked-by: Ley Foon Tan --- arch/nios2/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/nios2') diff --git a/arch/nios2/Makefile b/arch/nios2/Makefile index 08130febf0a3..e74afc12d516 100644 --- a/arch/nios2/Makefile +++ b/arch/nios2/Makefile @@ -53,7 +53,7 @@ all: vmImage archclean: $(Q)$(MAKE) $(clean)=$(nios2-boot) -%.dtb: +%.dtb: | scripts $(Q)$(MAKE) $(build)=$(nios2-boot) $(nios2-boot)/$@ dtbs: -- cgit v1.2.3