gitlab.arm.com will be in the maintainance mode on Wednesday June 29th 01:00 - 10:00 (UTC+1). Repositories is read only during the maintainance.

Commit e9352fde authored by Andrew Jones's avatar Andrew Jones
Browse files

config: no need to mix arch makefiles



Move the config/config-*.mak files to their own directories and
rename to Makefile.* README is also updated to reflect the change,
as well as to remove an optimistic reference to a non-existent
docs directory.
Signed-off-by: Andrew Jones's avatarAndrew Jones <drjones@redhat.com>
Reviewed-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent e7c68b43
...@@ -32,7 +32,7 @@ LIBFDT_include = $(addprefix $(LIBFDT_srcdir)/,$(LIBFDT_INCLUDES)) ...@@ -32,7 +32,7 @@ LIBFDT_include = $(addprefix $(LIBFDT_srcdir)/,$(LIBFDT_INCLUDES))
LIBFDT_version = $(addprefix $(LIBFDT_srcdir)/,$(LIBFDT_VERSION)) LIBFDT_version = $(addprefix $(LIBFDT_srcdir)/,$(LIBFDT_VERSION))
#include architecure specific make rules #include architecure specific make rules
include config/config-$(ARCH).mak include $(TEST_DIR)/Makefile
# cc-option # cc-option
# Usage: OP_CFLAGS+=$(call cc-option, -falign-functions=0, -malign-functions=0) # Usage: OP_CFLAGS+=$(call cc-option, -falign-functions=0, -malign-functions=0)
......
...@@ -34,8 +34,7 @@ each as a standalone test. ...@@ -34,8 +34,7 @@ each as a standalone test.
Directory structure: Directory structure:
.: configure script, top-level Makefile, and run_tests.sh .: configure script, top-level Makefile, and run_tests.sh
./config: collection of architecture dependent makefiles ./scripts: helper scripts for building and running tests
./docs: documentation files
./lib: general architecture neutral services for the tests ./lib: general architecture neutral services for the tests
./lib/<ARCH>: architecture dependent services for the tests ./lib/<ARCH>: architecture dependent services for the tests
./<ARCH>: the sources of the tests and the created objects/images ./<ARCH>: the sources of the tests and the created objects/images
......
include $(TEST_DIR)/Makefile.$(ARCH)
...@@ -18,6 +18,6 @@ cflatobjs += lib/arm/processor.o ...@@ -18,6 +18,6 @@ cflatobjs += lib/arm/processor.o
# arm specific tests # arm specific tests
tests = tests =
include config/config-arm-common.mak include $(TEST_DIR)/Makefile.common
arch_clean: arm_clean arch_clean: arm_clean
...@@ -14,7 +14,7 @@ cflatobjs += lib/arm64/spinlock.o ...@@ -14,7 +14,7 @@ cflatobjs += lib/arm64/spinlock.o
# arm64 specific tests # arm64 specific tests
tests = tests =
include config/config-arm-common.mak include $(TEST_DIR)/Makefile.common
arch_clean: arm_clean arch_clean: arm_clean
$(RM) lib/arm64/.*.d $(RM) lib/arm64/.*.d
...@@ -25,7 +25,7 @@ CFLAGS += -O2 ...@@ -25,7 +25,7 @@ CFLAGS += -O2
CFLAGS += -I lib -I lib/libfdt CFLAGS += -I lib -I lib/libfdt
asm-offsets = lib/$(ARCH)/asm-offsets.h asm-offsets = lib/$(ARCH)/asm-offsets.h
include config/asm-offsets.mak include scripts/asm-offsets.mak
cflatobjs += lib/util.o cflatobjs += lib/util.o
cflatobjs += lib/alloc.o cflatobjs += lib/alloc.o
......
include $(TEST_DIR)/Makefile.$(ARCH)
...@@ -8,7 +8,7 @@ cflatobjs += lib/x86/setjmp32.o ...@@ -8,7 +8,7 @@ cflatobjs += lib/x86/setjmp32.o
tests = $(TEST_DIR)/taskswitch.flat $(TEST_DIR)/taskswitch2.flat \ tests = $(TEST_DIR)/taskswitch.flat $(TEST_DIR)/taskswitch2.flat \
$(TEST_DIR)/cmpxchg8b.flat $(TEST_DIR)/cmpxchg8b.flat
include config/config-x86-common.mak include $(TEST_DIR)/Makefile.common
$(TEST_DIR)/cmpxchg8b.elf: $(cstart.o) $(TEST_DIR)/cmpxchg8b.o $(TEST_DIR)/cmpxchg8b.elf: $(cstart.o) $(TEST_DIR)/cmpxchg8b.o
$(TEST_DIR)/taskswitch.elf: $(cstart.o) $(TEST_DIR)/taskswitch.o $(TEST_DIR)/taskswitch.elf: $(cstart.o) $(TEST_DIR)/taskswitch.o
......
...@@ -15,4 +15,4 @@ tests += $(TEST_DIR)/svm.flat ...@@ -15,4 +15,4 @@ tests += $(TEST_DIR)/svm.flat
tests += $(TEST_DIR)/vmx.flat tests += $(TEST_DIR)/vmx.flat
tests += $(TEST_DIR)/tscdeadline_latency.flat tests += $(TEST_DIR)/tscdeadline_latency.flat
include config/config-x86-common.mak include $(TEST_DIR)/Makefile.common
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment