diff options
| author | Robin Randhawa <robin.randhawa@arm.com> | 2019-03-12 00:34:20 +0000 |
|---|---|---|
| committer | Robin Randhawa <robin.randhawa@arm.com> | 2019-03-12 00:34:20 +0000 |
| commit | 36e8a3cf4c4442d0a91fbc1c30622628f9ba270c (patch) | |
| tree | 3e6a758ce69d932024de38052877dbf8aebeca7d | |
| parent | 3410bdd2aa91071e654c565e498e7818968dabc4 (diff) | |
Cleanup ARCH and PLATFORM
Roll this into previous related commits.
| -rw-r--r-- | mk/config.mk | 2 | ||||
| -rw-r--r-- | mk/platform/aarch64/qemu-system-aarch64-virt.mk (renamed from mk/platform/qemu-system-aarch64-virt.mk) | 0 | ||||
| -rw-r--r-- | mk/platform/config.mk | 4 | ||||
| -rw-r--r-- | mk/platform/x86_64/pc.mk (renamed from mk/platform/x86_64-pc.mk) | 0 |
4 files changed, 3 insertions, 3 deletions
diff --git a/mk/config.mk b/mk/config.mk index b19e8bb..e5d88fe 100644 --- a/mk/config.mk +++ b/mk/config.mk @@ -1,6 +1,6 @@ # Configuration ARCH?=x86_64 -PLATFORM?=x86_64-pc +PLATFORM?=pc INSTALLER_FLAGS?=--cookbook=cookbook PREFIX_RUSTC?=0 diff --git a/mk/platform/qemu-system-aarch64-virt.mk b/mk/platform/aarch64/qemu-system-aarch64-virt.mk index 9a1553b..9a1553b 100644 --- a/mk/platform/qemu-system-aarch64-virt.mk +++ b/mk/platform/aarch64/qemu-system-aarch64-virt.mk diff --git a/mk/platform/config.mk b/mk/platform/config.mk index 6a596e4..081681e 100644 --- a/mk/platform/config.mk +++ b/mk/platform/config.mk @@ -2,10 +2,10 @@ ifeq ($(PLATFORM),) $(error "FATAL: PLATFORM variable not set") endif -PLATFORM_CONFIG=mk/platform/$(PLATFORM).mk +PLATFORM_CONFIG=mk/platform/$(ARCH)/$(PLATFORM).mk ifeq ("$(wildcard $(PLATFORM_CONFIG))","") - $(error "FATAL: The $(PLATFORM) platform is not supported") + $(error "FATAL: No $(PLATFORM) platform with arch $(ARCH) is supported") endif include $(PLATFORM_CONFIG) diff --git a/mk/platform/x86_64-pc.mk b/mk/platform/x86_64/pc.mk index 72d51e9..72d51e9 100644 --- a/mk/platform/x86_64-pc.mk +++ b/mk/platform/x86_64/pc.mk |