Merged in from cc_gw

diff --cc boards/board_common.mk
Simple merge

diff --cc scripts/rules.mk
index 996a0067d8c78815072e46d4f19d75d1a24a87d1,bd590e4eea5338af2755953efe8c81f85d04881c..aa0b0c5981abbffa0784b35b109faa02b6ccfcdb
--- 1/scripts/rules.mk
--- 2/scripts/rules.mk
+++ b/scripts/rules.mk
@@@ -60,12 -59,12 +59,14 @@@ ARCH_PATH-y = arch/$(ARCH_FAM)/$(ARCH
  \r
  # Include compiler generic and arch specific\r
  COMPILER?=gcc\r
- ifneq ($(ARCH),)\r
- include $(ROOTDIR)/$(ARCH_PATH-y)/scripts/gcc.mk\r
+ ifeq ($(COMPILER),gcc)\r
+  ifneq ($(ARCH),)\r
+  include $(ROOTDIR)/$(ARCH_PATH-y)/scripts/gcc.mk\r
+  endif\r
  endif\r
  include $(ROOTDIR)/scripts/cc_$(COMPILER).mk\r
 +\r
 +# Include pclint or splint settings\r
  ifneq ($(PCLINT),)\r
  include $(ROOTDIR)/scripts/cc_pclint.mk\r
  endif\r