add basic support for edosk2674

7 files changed, 32 insertions, 8 deletions

diff --git a/mk/vars.mk b/mk/vars.mk
index 905252362..e4b631e7a 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -166,11 +166,6 @@ TARGET_CXXFLAGS+=	-m$(ADK_TARGET_FLOAT)-float
 endif
 endif
 
-ifeq ($(ADK_TARGET_ARCH_H8300),y)
-TARGET_CFLAGS+=		-mh
-TARGET_LDFLAGS+=	-mh
-endif
-
 ifeq ($(ADK_TARGET_BINFMT_FLAT),y)
 TARGET_LDFLAGS+=	-Wl,-elf2flt
 TARGET_CFLAGS+=		-Wl,-elf2flt
diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu
index 39dc0ad62..dc0b6275f 100644
--- a/target/config/Config.in.cpu
+++ b/target/config/Config.in.cpu
@@ -465,8 +465,13 @@ config ADK_TARGET_CPU_FRV
 	depends on ADK_TARGET_ARCH_FRV
 
 # h8/300
-config ADK_TARGET_CPU_H8300
-	bool "h8/300"
+config ADK_TARGET_CPU_H8300H
+	bool "h8300h"
+	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_H8300
+
+config ADK_TARGET_CPU_H8S
+	bool "h8s"
 	select ADK_TARGET_WITHOUT_MMU
 	depends on ADK_TARGET_ARCH_H8300
 
@@ -1877,6 +1882,8 @@ config ADK_TARGET_CPU_FLAGS
 	default "-mcpu=bf592" if ADK_TARGET_CPU_BFIN_BF592
 	default "-mcpu=v10" if ADK_TARGET_CPU_CRIS_CRISV10
 	default "-mcpu=v32" if ADK_TARGET_CPU_CRIS_CRISV32
+	default "-mh" if ADK_TARGET_CPU_H8300H
+	default "-ms" if ADK_TARGET_CPU_H8S
 	default "-mmetac=2.1" if ADK_TARGET_CPU_METAG
 	default "-mcpu=v7.10.d" if ADK_TARGET_CPU_MICROBLAZE
 	default "-mj2" if ADK_TARGET_CPU_SH_J2
diff --git a/target/config/Config.in.rootfs b/target/config/Config.in.rootfs
index 41e9b27a6..f4d1f1a43 100644
--- a/target/config/Config.in.rootfs
+++ b/target/config/Config.in.rootfs
@@ -17,6 +17,7 @@ config ADK_TARGET_ROOTFS_INITRAMFSPIGGYBACK
 		ADK_TARGET_ARCH_AARCH64 || \
 		ADK_TARGET_ARCH_ARC || \
 		ADK_TARGET_ARCH_ARM || \
+		ADK_TARGET_ARCH_H8300 || \
 		ADK_TARGET_ARCH_M68K || \
 		ADK_TARGET_ARCH_MICROBLAZE || \
 		ADK_TARGET_ARCH_MIPS || \
diff --git a/target/h8300/kernel/hitachi-edosk2674 b/target/h8300/kernel/hitachi-edosk2674
new file mode 100644
index 000000000..40394a53a
--- /dev/null
+++ b/target/h8300/kernel/hitachi-edosk2674
@@ -0,0 +1,2 @@
+CONFIG_H8300=y
+CONFIG_H8S_EDOSK2674=y
diff --git a/target/h8300/systems/hitachi-edosk2674 b/target/h8300/systems/hitachi-edosk2674
new file mode 100644
index 000000000..5f674f25b
--- /dev/null
+++ b/target/h8300/systems/hitachi-edosk2674
@@ -0,0 +1,7 @@
+config ADK_TARGET_SYSTEM_HITACHI_EDOSK2674
+	bool "Hitachi EDOSK2674"
+	select ADK_TARGET_CPU_H8S
+	select ADK_TARGET_PACKAGE_TXZ
+	help
+	  Hitachi EDOSK2674 H8S development board.
+
diff --git a/target/h8300/systems/sim-h8300h b/target/h8300/systems/sim-h8300h
index 1c82e1012..bf733f9bd 100644
--- a/target/h8300/systems/sim-h8300h
+++ b/target/h8300/systems/sim-h8300h
@@ -1,6 +1,6 @@
 config ADK_TARGET_SYSTEM_SIM_H8300H
 	bool "GDB simulator"
-	select ADK_TARGET_CPU_H8300
+	select ADK_TARGET_CPU_H8300H
 	select ADK_TARGET_SIM
 	select ADK_TARGET_PACKAGE_TXZ
 	help
diff --git a/toolchain/uclibc-ng/Makefile b/toolchain/uclibc-ng/Makefile
index caf5e4e32..865467152 100644
--- a/toolchain/uclibc-ng/Makefile
+++ b/toolchain/uclibc-ng/Makefile
@@ -199,6 +199,18 @@ ifeq ($(ADK_TARGET_CPU_CRIS_CRISV10),y)
 endif
 endif
 
+# h8300
+ifeq ($(ADK_TARGET_ARCH_H8300),y)
+ifeq ($(ADK_TARGET_CPU_H8300H),y)
+	$(SED) 's/.*\(CONFIG_H8S\).*/# \1 is not set/' ${WRKBUILD}/.config
+	$(SED) 's/.*\(CONFIG_H8300H\).*/\1=y/' ${WRKBUILD}/.config
+endif
+ifeq ($(ADK_TARGET_CPU_H8S),y)
+	$(SED) 's/.*\(CONFIG_H8S\).*/\1=y/' ${WRKBUILD}/.config
+	$(SED) 's/.*\(CONFIG_H8300H\).*/# \1 is not set/' ${WRKBUILD}/.config
+endif
+endif
+
 # sh
 ifeq ($(ADK_TARGET_ARCH_SH),y)
 ifeq ($(ADK_TARGET_CPU_SH_SH4A),y)