build: Trivial cleanup ahead supporting new architectures

Signed-off-by: Michal Orzel <michal.orzel@arm.com>
[Broken out of series]
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>

diff --git a/.gitignore b/.gitignore
index 5e458a3a805cad4617eab8cfa8a448be27361cf2..dcacdf3b2d6c805d35a1485b458e3d2afab2c5df 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,7 @@
 *.pyc
 *.pyo
 *.swp
-/arch/x86/*.lds
+/arch/*/*.lds
 /cscope.*
 /dist/
 /docs/autogenerated/

diff --git a/Makefile b/Makefile
index 8d8277ee1014a3401b465e1255a09b0106780b59..b6e0dd8b4e7b1ff997f8a86c7f87fceef3173b4b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -56,9 +56,12 @@ PYTHON             ?= $(PYTHON_INTERPRETER)
 
 export CC LD CPP INSTALL INSTALL_DATA INSTALL_DIR INSTALL_PROGRAM OBJCOPY PYTHON
 
+# By default enable all the tests
+TESTS ?= $(wildcard $(ROOT)/tests/*)
+
 .PHONY: all
 all:
-       @set -e; for D in $(wildcard tests/*); do \
+       @set -e; for D in $(TESTS); do \
                [ ! -e $$D/Makefile ] && continue; \
                $(MAKE) -C $$D build; \
        done
@@ -67,7 +70,7 @@ all:
 install:
        @$(INSTALL_DIR) $(DESTDIR)$(xtfdir)
        $(INSTALL_PROGRAM) xtf-runner $(DESTDIR)$(xtfdir)
-       @set -e; for D in $(wildcard tests/*); do \
+       @set -e; for D in $(TESTS); do \
                [ ! -e $$D/Makefile ] && continue; \
                $(MAKE) -C $$D install; \
        done

diff --git a/build/common.mk b/build/common.mk
index 886f190a0b109ec17aee69437cac463d24eac77e..594952df9406023231b9a93c58a734fa8d03b453 100644 (file)
--- a/build/common.mk
+++ b/build/common.mk
@@ -63,7 +63,7 @@ DEPS-$(1) = $$(head-$(1)) \
        $$(obj-perarch:%.o=%-$($(1)_arch).o) \
        $$(obj-$(1):%.o=%-$(1).o) $$(obj-perenv:%.o=%-$(1).o)
 
-# Generate .lds with approprate flags
+# Generate .lds with appropriate flags
 %/link-$(1).lds: %/link.lds.S
        $$(CPP) $$(AFLAGS_$(1)) -P -C $$< -o $$@