Patch set updated for coreboot: buildgcc: clean up Makefile

[Stefan Reinauer]

Stefan Reinauer ([e-mail]) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13517

-gerrit

commit ffebc77c9b3b1955066168b7929ec1056395ef0b
Author: Stefan Reinauer 
Date:   Fri Jan 29 17:39:07 2016 -0800

buildgcc: clean up Makefile

* Drop SKIP_IASL variable which is a leftover from when IASL
      was built automatically
    * Rename ARM target armv7a -> arm
    * all builds a nds32le compiler needed for some EC work

Change-Id: Ia4f67abcffdfe9c56c5d1848c75dfea83755e755
    Signed-off-by: Stefan Reinauer 
---
 Makefile.inc           |  4 ++--
 util/crossgcc/Makefile | 31 +++++++++++++++----------------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/Makefile.inc b/Makefile.inc
index 583e59a..fba271d 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -503,7 +503,7 @@ crossgcc-x64: clean-for-update
    $(MAKE) -C util/crossgcc build-x64 SKIP_GDB=1

crossgcc-arm: clean-for-update
-	$(MAKE) -C util/crossgcc build-armv7a SKIP_GDB=1
+	$(MAKE) -C util/crossgcc build-arm SKIP_GDB=1

crossgcc-aarch64: clean-for-update
    $(MAKE) -C util/crossgcc build-aarch64 SKIP_GDB=1
@@ -533,7 +533,7 @@ crosstools-x64: clean-for-update
    $(MAKE) -C util/crossgcc build-x64

crosstools-arm: clean-for-update
-	$(MAKE) -C util/crossgcc build-armv7a
+	$(MAKE) -C util/crossgcc build-arm

crosstools-aarch64: clean-for-update
    $(MAKE) -C util/crossgcc build-aarch64
diff --git a/util/crossgcc/Makefile b/util/crossgcc/Makefile
index 79e0c3c..11cc5fc 100644
--- a/util/crossgcc/Makefile
+++ b/util/crossgcc/Makefile
@@ -7,18 +7,16 @@ BUILD_PLATFORM ?= i386-elf
 # Example: BUILDGCC_OPTIONS=-c to remove temporary files before build

all all_with_gdb:
-	$(MAKE) build-i386
-	$(MAKE) SKIP_IASL=1 \
-		 build-x64 build-armv7a build-mips build-riscv build-aarch64 \
-		 build_clang
+	$(MAKE) build-i386 build-x64 build-arm build-mips \
+		build-riscv build-aarch64 build-power8 build-nds32le \
+		build_clang build_iasl

all_without_gdb:
-	$(MAKE) SKIP_GDB=1 build-i386
-	$(MAKE) SKIP_IASL=1 SKIP_GDB=1 \
-		 build-x64 build-armv7a build-mips build-riscv build-aarch64 \
-		 build_clang
+	$(MAKE) SKIP_GDB=1 build-i386 build-x64 build-arm build-mips \
+		build-riscv build-aarch64 build-power8 build-nds32le \
+		build_clang build_iasl

-build_tools: build_gcc build_iasl build_gdb
+build_tools: build_gcc build_gdb

###########################################################
 ### targets to do buildgcc builds
@@ -33,9 +31,7 @@ ifeq ($(SKIP_GDB),)
 endif

build_iasl:
-ifeq ($(SKIP_IASL),)
    bash ./buildgcc -P iasl $(if $(CPUS),-j $(CPUS))  $(if $(KEEP_SOURCES),-t) $(BUILDGCC_OPTIONS)
-endif

build_clang:
 ifeq ($(SKIP_CLANG),)
@@ -49,8 +45,8 @@ build-i386:
 build-x64:
    @$(MAKE) build_tools BUILD_PLATFORM=x86_64-elf

-build-armv7a:
-	@$(MAKE) build_tools BUILD_PLATFORM=armv7a-eabi
+build-arm:
+	@$(MAKE) build_tools BUILD_PLATFORM=arm-eabi

build-aarch64:
    @$(MAKE) build_tools BUILD_PLATFORM=aarch64-elf
@@ -64,6 +60,9 @@ build-riscv:
 build-power8:
    @$(MAKE) build_tools BUILD_PLATFORM=powerpc64le-linux-gnu

+build-nds32le:
+	@$(MAKE) build_tools BUILD_PLATFORM=nds32le-elf
+
 clean_tempfiles:
    rm -rf build-*
    rm -rf binutils-* gcc-* gmp-* libelf-* mpc-* mpfr-*
@@ -78,7 +77,7 @@ clean: clean_tempfiles
 distclean: clean
    rm -rf tarballs

-.PHONY: build_gcc build_iasl build_gdb build_clang \
-	all all_with_gdb all_without_gdb build_tools \
-	build-i386 build-x64 build-armv7a build-aarch64 build-mips build-riscv build-power8 \
+.PHONY: build_gcc build_iasl build_gdb build_clang all all_with_gdb \
+	all_without_gdb build_tools build-i386 build-x64 build-arm  \
+	build-aarch64 build-mips build-riscv build-power8 build-nds32le \
    clean distclean clean_tempfiles