From ccdf16dec07781aab4c2c2e8ff78b974840760f8 Mon Sep 17 00:00:00 2001
From: Mauro Ribeiro <mauro.ribeiro@hardkernel.com>
Date: Wed, 17 Dec 2014 22:57:56 -0200
Subject: [PATCH] Makefile: restore ARCH/CrossCompile to its defaults

Change-Id: Ia4151e0c71aa8987d91bb53a72cd223c66e5d7dd
(cherry picked from commit e1b4cc90da5974b65b07ff5c008116200c8ab5f6)
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index ea769784437b..1ad4b8cf8851 100755
--- a/Makefile
+++ b/Makefile
@@ -192,8 +192,8 @@ SUBARCH := $(shell uname -m | sed -e s/i.86/x86/ -e s/x86_64/x86/ \
 # "make" in the configured kernel build directory always uses that.
 # Default value for CROSS_COMPILE is not to prefix executables
 # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile
-ARCH		?= arm
-CROSS_COMPILE   ?= arm-linux-gnueabihf-
+ARCH		?= $(SUBARCH)
+CROSS_COMPILE   ?= $(CONFIG_CROSS_COMPILE:"%"=%)
 
 # Architecture as present in compile.h
 UTS_MACHINE 	:= $(ARCH)