From 3aa598104ca4c6f8de67b228ced3e680fbcab677 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 11 Dec 2016 07:27:49 +0100
Subject: sh2-nommu/j2: add better support and add required patches from
 musl-cross-make

---
 target/sh/Makefile               |  8 +++++++-
 target/sh/kernel/numato-mimasv2  | 21 ++++++++++++++-------
 target/sh/systems/numato-mimasv2 |  6 ++++--
 3 files changed, 25 insertions(+), 10 deletions(-)

(limited to 'target/sh')

diff --git a/target/sh/Makefile b/target/sh/Makefile
index 70df270be..58823b38d 100644
--- a/target/sh/Makefile
+++ b/target/sh/Makefile
@@ -67,6 +67,12 @@ endif
 kernel-install: kernel-strip
 	@cp $(BUILD_DIR)/$(TARGET_KERNEL) $(FW_DIR)/${TARGET_KERNEL}
 
+dtb-install:
+ifeq ($(ADK_TARGET_SYSTEM_NUMATO_MIMASV2),y)
+	PATH='$(HOST_PATH)' dtc -O dtb -o $(FW_DIR)/dt.dtb \
+		$(LINUX_DIR)/arch/sh/boot/dts/j2_mimas_v2.dts
+endif
+
 # filesystem specific targets
 ifeq ($(ADK_TARGET_FS),archive)
 imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) targethelp
@@ -78,5 +84,5 @@ ifeq ($(ADK_TARGET_FS),initramfsarchive)
 imageinstall: kernel-install $(FW_DIR)/$(ROOTFSUSERTARBALL) targethelp
 endif
 ifeq ($(ADK_TARGET_FS),initramfspiggyback)
-imageinstall: createinitramfs targethelp
+imageinstall: dtb-install createinitramfs targethelp
 endif
diff --git a/target/sh/kernel/numato-mimasv2 b/target/sh/kernel/numato-mimasv2
index f66b31fa1..ca290f15d 100644
--- a/target/sh/kernel/numato-mimasv2
+++ b/target/sh/kernel/numato-mimasv2
@@ -1,10 +1,17 @@
 CONFIG_SUPERH=y
 CONFIG_SUPERH32=y
 CONFIG_CPU_SH2=y
-CONFIG_0PF_FPGA=y
-CONFIG_CPU_SUBTYPE_0PF=y
-CONFIG_CACHE_OFF=y
-CONFIG_CMDLINE_EXTEND=y
-CONFIG_SERIAL_UARTLITE=y
-CONFIG_SERIAL_UARTLITE_0PF=y
-CONFIG_SERIAL_UARTLITE_CONSOLE=y
+CONFIG_CPU_SUBTYPE_J2=y
+CONFIG_SH_JCORE_SOC=y
+CONFIG_SMP=y
+CONFIG_MEMORY_START=0x10000000
+CONFIG_MEMORY_SIZE=0x04000000
+CONFIG_SH_DEVICE_TREE=y
+CONFIG_I2C=y
+CONFIG_SPI=y
+CONFIG_SPI_JCORE=y
+CONFIG_MMC=y
+CONFIG_MMC_SPI=y
+CONFIG_CLKSRC_JCORE_PIT=y
+CONFIG_JCORE_AIC=y
+CONFIG_SERIAL_EARLYCON=y
diff --git a/target/sh/systems/numato-mimasv2 b/target/sh/systems/numato-mimasv2
index 088fc5a73..e14d4ce71 100644
--- a/target/sh/systems/numato-mimasv2
+++ b/target/sh/systems/numato-mimasv2
@@ -1,7 +1,9 @@
 config ADK_TARGET_SYSTEM_NUMATO_MIMASV2
 	bool "Numato Mimas v2 FPGA"
-	select ADK_TARGET_CPU_SH_SH2
+	select ADK_TARGET_CPU_SH_J2
 	select ADK_TARGET_WITH_SERIAL
+	select ADK_TARGET_WITH_BLOCK
+	select ADK_HOST_BUILD_DTC
 	help
-	  Support for Numato Mimas v2 FPGA with J2 Core Bitstream, sh2 architecture.
+	  Support for Numato Mimas v2 FPGA with J2 Core Bitstream (sh2eb).
 
-- 
cgit v1.2.3