From 1e235d1ee8b0b859d827d8d43e4bce0749103415 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Fri, 13 Feb 2015 15:25:18 +0000 Subject: [PATCH] Kernel: revised rules.mk/target.mk --- Kernel/Makefile | 7 +++++-- Kernel/platform-8086test/rules.mk | 1 - Kernel/platform-atarist/rules.mk | 1 - Kernel/platform-dragon/rules.mk | 1 - Kernel/platform-n8vem-mark4/rules.mk | 1 - Kernel/platform-p112/rules.mk | 1 - Kernel/platform-socz80/rules.mk | 1 - Kernel/platform-tgl6502/rules.mk | 1 - Kernel/platform-z80pack-lite/rules.mk | 1 - Kernel/platform-z80pack/rules.mk | 1 - Kernel/platform-zx128/rules.mk | 1 - 11 files changed, 5 insertions(+), 12 deletions(-) delete mode 100644 Kernel/platform-8086test/rules.mk delete mode 100644 Kernel/platform-atarist/rules.mk delete mode 100644 Kernel/platform-dragon/rules.mk delete mode 100644 Kernel/platform-n8vem-mark4/rules.mk delete mode 100644 Kernel/platform-p112/rules.mk delete mode 100644 Kernel/platform-socz80/rules.mk delete mode 100644 Kernel/platform-tgl6502/rules.mk delete mode 100644 Kernel/platform-z80pack-lite/rules.mk delete mode 100644 Kernel/platform-z80pack/rules.mk diff --git a/Kernel/Makefile b/Kernel/Makefile index 82728191..2692d1ad 100644 --- a/Kernel/Makefile +++ b/Kernel/Makefile @@ -17,9 +17,12 @@ ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))) all: fuzix.bin - --include platform-$(TARGET)/rules.mk +# Platform propertyies +include platform-$(TARGET)/target.mk +# CPU properties include cpu-$(CPU)/rules.mk +# Overrides (optional) +-include platform-$(TARGET)/rules.mk diff --git a/Kernel/platform-8086test/rules.mk b/Kernel/platform-8086test/rules.mk deleted file mode 100644 index 6361df69..00000000 --- a/Kernel/platform-8086test/rules.mk +++ /dev/null @@ -1 +0,0 @@ -export CPU = 8086 diff --git a/Kernel/platform-atarist/rules.mk b/Kernel/platform-atarist/rules.mk deleted file mode 100644 index df1c235f..00000000 --- a/Kernel/platform-atarist/rules.mk +++ /dev/null @@ -1 +0,0 @@ -export CPU = 68000 diff --git a/Kernel/platform-dragon/rules.mk b/Kernel/platform-dragon/rules.mk deleted file mode 100644 index e9abbba1..00000000 --- a/Kernel/platform-dragon/rules.mk +++ /dev/null @@ -1 +0,0 @@ -export CPU = 6809 diff --git a/Kernel/platform-n8vem-mark4/rules.mk b/Kernel/platform-n8vem-mark4/rules.mk deleted file mode 100644 index 55976672..00000000 --- a/Kernel/platform-n8vem-mark4/rules.mk +++ /dev/null @@ -1 +0,0 @@ -export CPU = z180 diff --git a/Kernel/platform-p112/rules.mk b/Kernel/platform-p112/rules.mk deleted file mode 100644 index 55976672..00000000 --- a/Kernel/platform-p112/rules.mk +++ /dev/null @@ -1 +0,0 @@ -export CPU = z180 diff --git a/Kernel/platform-socz80/rules.mk b/Kernel/platform-socz80/rules.mk deleted file mode 100644 index 3bffcde0..00000000 --- a/Kernel/platform-socz80/rules.mk +++ /dev/null @@ -1 +0,0 @@ -export CPU = z80 diff --git a/Kernel/platform-tgl6502/rules.mk b/Kernel/platform-tgl6502/rules.mk deleted file mode 100644 index eb53ebcf..00000000 --- a/Kernel/platform-tgl6502/rules.mk +++ /dev/null @@ -1 +0,0 @@ -export CPU = 6502 diff --git a/Kernel/platform-z80pack-lite/rules.mk b/Kernel/platform-z80pack-lite/rules.mk deleted file mode 100644 index 3bffcde0..00000000 --- a/Kernel/platform-z80pack-lite/rules.mk +++ /dev/null @@ -1 +0,0 @@ -export CPU = z80 diff --git a/Kernel/platform-z80pack/rules.mk b/Kernel/platform-z80pack/rules.mk deleted file mode 100644 index 3bffcde0..00000000 --- a/Kernel/platform-z80pack/rules.mk +++ /dev/null @@ -1 +0,0 @@ -export CPU = z80 diff --git a/Kernel/platform-zx128/rules.mk b/Kernel/platform-zx128/rules.mk index 60f6d3a4..7da5afe7 100644 --- a/Kernel/platform-zx128/rules.mk +++ b/Kernel/platform-zx128/rules.mk @@ -1,7 +1,6 @@ # # ZX128 uses banked kernel images # -export CPU = z80 CROSS_CCOPTS += --external-banker # # Tell the core code we are using the banked helpers -- 2.34.1