From bbc03632dd32281bae701ce9f1a6600654f0a44a Mon Sep 17 00:00:00 2001
From: David Given <dg@cowlark.com>
Date: Sat, 21 Apr 2018 15:57:47 +0200
Subject: [PATCH] Stage #1 of moving the NC200 stuff into the amstradnc
 directory.

---
 Kernel/platform-amstradnc/README              |  1 +
 .../nc200}/Makefile                           | 22 +++++++++----------
 .../nc200}/README.md                          |  0
 .../nc200}/autoprg.s                          |  0
 .../nc200}/floppyskeleton.s                   |  0
 .../nc200}/fuzix.lnk                          |  0
 .../nc200}/kernel.def                         |  0
 Kernel/platform-amstradnc/nc200/rules.mk      |  1 +
 .../nc200}/target.mk                          |  0
 Kernel/platform-nc200/rules.mk                |  1 -
 10 files changed, 13 insertions(+), 12 deletions(-)
 rename Kernel/{platform-nc200 => platform-amstradnc/nc200}/Makefile (84%)
 rename Kernel/{platform-nc200 => platform-amstradnc/nc200}/README.md (100%)
 rename Kernel/{platform-nc200 => platform-amstradnc/nc200}/autoprg.s (100%)
 rename Kernel/{platform-nc200 => platform-amstradnc/nc200}/floppyskeleton.s (100%)
 rename Kernel/{platform-nc200 => platform-amstradnc/nc200}/fuzix.lnk (100%)
 rename Kernel/{platform-nc200 => platform-amstradnc/nc200}/kernel.def (100%)
 create mode 100644 Kernel/platform-amstradnc/nc200/rules.mk
 rename Kernel/{platform-nc200 => platform-amstradnc/nc200}/target.mk (100%)
 delete mode 100644 Kernel/platform-nc200/rules.mk

diff --git a/Kernel/platform-amstradnc/README b/Kernel/platform-amstradnc/README
index 08709a89..0634b6ed 100644
--- a/Kernel/platform-amstradnc/README
+++ b/Kernel/platform-amstradnc/README
@@ -3,6 +3,7 @@ Support for the Amstrad NC series of Z80 portable computers.
 Use:
 
     TARGET=amstradnc/nc100 for the NC100
+    TARGET=amstradnc/nc200 for the NC200 (not working yet)
 
 
 Memory map. All off PCMCIA root, 16K arbitrary banks
diff --git a/Kernel/platform-nc200/Makefile b/Kernel/platform-amstradnc/nc200/Makefile
similarity index 84%
rename from Kernel/platform-nc200/Makefile
rename to Kernel/platform-amstradnc/nc200/Makefile
index c89015ea..4fecad12 100644
--- a/Kernel/platform-nc200/Makefile
+++ b/Kernel/platform-amstradnc/nc200/Makefile
@@ -1,17 +1,17 @@
 CSRCS = \
-	../platform-nc100/devlpr.c \
-	../platform-nc100/devtty.c \
-	../platform-nc100/devrd.c \
-	../platform-nc100/devaudio.c \
-	../platform-nc100/devgfx.c \
-	../platform-nc100/devices.c \
-	../platform-nc100/main.c \
+	../devlpr.c \
+	../devtty.c \
+	../devrd.c \
+	../devaudio.c \
+	../devgfx.c \
+	../devices.c \
+	../main.c \
 
 ASRCS = \
-	../platform-nc100/nc100.s \
-	../platform-nc100/crt0.s \
-	../platform-nc100/tricks.s \
-	../platform-nc100/commonmem.s \
+	../nc100.s \
+	../crt0.s \
+	../tricks.s \
+	../commonmem.s \
 
 COBJS = $(CSRCS:.c=.rel)
 AOBJS = $(ASRCS:.s=.rel)
diff --git a/Kernel/platform-nc200/README.md b/Kernel/platform-amstradnc/nc200/README.md
similarity index 100%
rename from Kernel/platform-nc200/README.md
rename to Kernel/platform-amstradnc/nc200/README.md
diff --git a/Kernel/platform-nc200/autoprg.s b/Kernel/platform-amstradnc/nc200/autoprg.s
similarity index 100%
rename from Kernel/platform-nc200/autoprg.s
rename to Kernel/platform-amstradnc/nc200/autoprg.s
diff --git a/Kernel/platform-nc200/floppyskeleton.s b/Kernel/platform-amstradnc/nc200/floppyskeleton.s
similarity index 100%
rename from Kernel/platform-nc200/floppyskeleton.s
rename to Kernel/platform-amstradnc/nc200/floppyskeleton.s
diff --git a/Kernel/platform-nc200/fuzix.lnk b/Kernel/platform-amstradnc/nc200/fuzix.lnk
similarity index 100%
rename from Kernel/platform-nc200/fuzix.lnk
rename to Kernel/platform-amstradnc/nc200/fuzix.lnk
diff --git a/Kernel/platform-nc200/kernel.def b/Kernel/platform-amstradnc/nc200/kernel.def
similarity index 100%
rename from Kernel/platform-nc200/kernel.def
rename to Kernel/platform-amstradnc/nc200/kernel.def
diff --git a/Kernel/platform-amstradnc/nc200/rules.mk b/Kernel/platform-amstradnc/nc200/rules.mk
new file mode 100644
index 00000000..33bce4e9
--- /dev/null
+++ b/Kernel/platform-amstradnc/nc200/rules.mk
@@ -0,0 +1 @@
+export CROSS_CCOPTS += -I$(ROOT_DIR)/platform-amstradnc -DCONFIG_NC200
diff --git a/Kernel/platform-nc200/target.mk b/Kernel/platform-amstradnc/nc200/target.mk
similarity index 100%
rename from Kernel/platform-nc200/target.mk
rename to Kernel/platform-amstradnc/nc200/target.mk
diff --git a/Kernel/platform-nc200/rules.mk b/Kernel/platform-nc200/rules.mk
deleted file mode 100644
index eaa4fc50..00000000
--- a/Kernel/platform-nc200/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-export CROSS_CCOPTS += -I$(ROOT_DIR)/platform-nc100 -DCONFIG_NC200
-- 
2.34.1