Kernel: revised rules.mk/target.mk

diff --git a/Kernel/Makefile b/Kernel/Makefile
index 8272819..2692d1a 100644 (file)
--- 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 (file)
index 6361df6..0000000
--- 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 (file)
index df1c235..0000000
--- 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 (file)
index e9abbba..0000000
--- 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 (file)
index 5597667..0000000
--- 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 (file)
index 5597667..0000000
--- 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 (file)
index 3bffcde..0000000
--- 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 (file)
index eb53ebc..0000000
--- 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 (file)
index 3bffcde..0000000
--- 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 (file)
index 3bffcde..0000000
--- 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 60f6d3a..7da5afe 100644 (file)
--- 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