Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0

[firefly-linux-kernel-4.4.55.git] / Makefile

diff --git a/Makefile b/Makefile
index 6b4a9044efc75c11b400d06cea3e18942ceaeedb..b22d80e944c85300fff1c1a7a3704e7b76fe129e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 VERSION = 3
 PATCHLEVEL = 0
-SUBLEVEL = 8
+SUBLEVEL = 36
 EXTRAVERSION =
 NAME = Sneaky Weasel
 
@@ -193,10 +193,17 @@ SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
 # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile
 export KBUILD_BUILDHOST := $(SUBARCH)
 #ARCH          ?= $(SUBARCH)
-#CROSS_COMPILE ?= $(CONFIG_CROSS_COMPILE:"%"=%)
 ARCH           ?= arm
-#CROSS_COMPILE :=/opt/android0320/mydroid/prebuilt/linux-x86/toolchain/arm-eabi-4.2.1/bin/arm-eabi-
-CROSS_COMPILE  ?=../toolchain/arm-eabi-4.4.0/bin/arm-eabi-
+ifneq ($(wildcard ../toolchain/arm-eabi-4.4.3),)
+CROSS_COMPILE  ?= ../toolchain/arm-eabi-4.4.3/bin/arm-eabi-
+endif
+ifneq ($(wildcard ../prebuilt/linux-x86/toolchain/arm-eabi-4.4.3),)
+CROSS_COMPILE  ?= ../prebuilt/linux-x86/toolchain/arm-eabi-4.4.3/bin/arm-eabi-
+endif
+ifneq ($(wildcard ../prebuilts/gcc/linux-x86/arm/arm-eabi-4.6),)
+CROSS_COMPILE   ?= ../prebuilts/gcc/linux-x86/arm/arm-eabi-4.6/bin/arm-eabi-
+endif
+CROSS_COMPILE  ?= $(CONFIG_CROSS_COMPILE:"%"=%)
 
 # Architecture as present in compile.h
 UTS_MACHINE    := $(ARCH)
@@ -332,7 +339,11 @@ include $(srctree)/scripts/Kbuild.include
 # Make variables (CC, etc...)
 
 AS             = $(CROSS_COMPILE)as
+ifneq ($(wildcard $(CROSS_COMPILE)ld.bfd),)
+LD             = $(CROSS_COMPILE)ld.bfd
+else
 LD             = $(CROSS_COMPILE)ld
+endif
 CC             = $(CROSS_COMPILE)gcc
 CPP            = $(CC) -E
 AR             = $(CROSS_COMPILE)ar
@@ -1222,7 +1233,7 @@ rpm: include/config/kernel.release FORCE
 # Brief documentation of the typical targets used
 # ---------------------------------------------------------------------------
 
-boards := $(wildcard $(srctree)/arch/$(SRCARCH)/configs/*_defconfig)
+boards := $(wildcard $(srctree)/arch/$(SRCARCH)/configs/rk*_defconfig)
 boards := $(notdir $(boards))
 board-dirs := $(dir $(wildcard $(srctree)/arch/$(SRCARCH)/configs/*/*_defconfig))
 board-dirs := $(sort $(notdir $(board-dirs:/=)))