From 6ddeae54d61d38ab19ba3dcc11216c8d3afc938e Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@uclibc-ng.org>
Date: Mon, 21 Nov 2016 16:48:41 +0100
Subject: or1k: rename or1k-sim to sim-or1k, by default 64mb ram

---
 target/or1k/Makefile                     |  2 +-
 target/or1k/kernel/or1k-sim              |  8 --------
 target/or1k/kernel/sim-or1k              |  8 ++++++++
 target/or1k/or1ksim.cfg                  |  2 +-
 target/or1k/patches/4.1.35/ld-or1k.patch | 12 ------------
 target/or1k/systems/or1k-sim             |  7 -------
 target/or1k/systems/sim-or1k             |  8 ++++++++
 7 files changed, 18 insertions(+), 29 deletions(-)
 delete mode 100644 target/or1k/kernel/or1k-sim
 create mode 100644 target/or1k/kernel/sim-or1k
 delete mode 100644 target/or1k/patches/4.1.35/ld-or1k.patch
 delete mode 100644 target/or1k/systems/or1k-sim
 create mode 100644 target/or1k/systems/sim-or1k

(limited to 'target/or1k')

diff --git a/target/or1k/Makefile b/target/or1k/Makefile
index 31f8e8aab..4241233e8 100644
--- a/target/or1k/Makefile
+++ b/target/or1k/Makefile
@@ -27,7 +27,7 @@ endif
 ifeq ($(ADK_TARGET_FS),initramfspiggyback)
 targethelp:
 	@echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}'
-ifeq ($(ADK_TARGET_SYSTEM_OR1K_SIM),y)
+ifeq ($(ADK_TARGET_SYSTEM_SIM_OR1K),y)
 	@echo "Start or1ksim via:"
 	@echo 'sim -f target/or1k/or1ksim.cfg $(FW_DIR)/${TARGET_KERNEL}'
 endif
diff --git a/target/or1k/kernel/or1k-sim b/target/or1k/kernel/or1k-sim
deleted file mode 100644
index ee4d9d55c..000000000
--- a/target/or1k/kernel/or1k-sim
+++ /dev/null
@@ -1,8 +0,0 @@
-CONFIG_OPENRISC=y
-CONFIG_OPENRISC_BUILTIN_DTB="or1ksim"
-CONFIG_OR1K_1200=y
-CONFIG_OPENRISC_HAVE_INST_FF1=y
-CONFIG_OPENRISC_HAVE_INST_FL1=y
-CONFIG_OPENRISC_HAVE_INST_MUL=y
-CONFIG_OPENRISC_HAVE_INST_DIV=y
-CONFIG_OPENRISC_NO_SPR_SR_DSX=y
diff --git a/target/or1k/kernel/sim-or1k b/target/or1k/kernel/sim-or1k
new file mode 100644
index 000000000..ee4d9d55c
--- /dev/null
+++ b/target/or1k/kernel/sim-or1k
@@ -0,0 +1,8 @@
+CONFIG_OPENRISC=y
+CONFIG_OPENRISC_BUILTIN_DTB="or1ksim"
+CONFIG_OR1K_1200=y
+CONFIG_OPENRISC_HAVE_INST_FF1=y
+CONFIG_OPENRISC_HAVE_INST_FL1=y
+CONFIG_OPENRISC_HAVE_INST_MUL=y
+CONFIG_OPENRISC_HAVE_INST_DIV=y
+CONFIG_OPENRISC_NO_SPR_SR_DSX=y
diff --git a/target/or1k/or1ksim.cfg b/target/or1k/or1ksim.cfg
index 7a26b1826..a4cd2fd6a 100644
--- a/target/or1k/or1ksim.cfg
+++ b/target/or1k/or1ksim.cfg
@@ -125,7 +125,7 @@ section memory
   ce = 1
   mc = 0
   baseaddr = 0x00000000
-  size = 0x02000000
+  size = 0x04000000
   delayr = 1
   delayw = 1
 end
diff --git a/target/or1k/patches/4.1.35/ld-or1k.patch b/target/or1k/patches/4.1.35/ld-or1k.patch
deleted file mode 100644
index 81c9db6c2..000000000
--- a/target/or1k/patches/4.1.35/ld-or1k.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur linux-4.1.6.orig/arch/openrisc/kernel/vmlinux.lds.S linux-4.1.6/arch/openrisc/kernel/vmlinux.lds.S
---- linux-4.1.6.orig/arch/openrisc/kernel/vmlinux.lds.S	2015-08-17 05:52:51.000000000 +0200
-+++ linux-4.1.6/arch/openrisc/kernel/vmlinux.lds.S	2015-09-01 22:02:13.224692884 +0200
-@@ -30,7 +30,7 @@
- #include <asm/cache.h>
- #include <asm-generic/vmlinux.lds.h>
- 
--OUTPUT_FORMAT("elf32-or32", "elf32-or32", "elf32-or32")
-+OUTPUT_FORMAT("elf32-or1k", "elf32-or1k", "elf32-or1k")
- jiffies = jiffies_64 + 4;
- 
- SECTIONS
diff --git a/target/or1k/systems/or1k-sim b/target/or1k/systems/or1k-sim
deleted file mode 100644
index 4a1a47902..000000000
--- a/target/or1k/systems/or1k-sim
+++ /dev/null
@@ -1,7 +0,0 @@
-config ADK_TARGET_SYSTEM_OR1K_SIM
-	bool "OR1K Simulator"
-	select ADK_TARGET_CPU_OR1K
-	select ADK_TARGET_WITH_SERIAL
-	help
-	  Simulator for OR1K architecture.
-
diff --git a/target/or1k/systems/sim-or1k b/target/or1k/systems/sim-or1k
new file mode 100644
index 000000000..67bbbc245
--- /dev/null
+++ b/target/or1k/systems/sim-or1k
@@ -0,0 +1,8 @@
+config ADK_TARGET_SYSTEM_SIM_OR1K
+	bool "OR1K Simulator"
+	select ADK_TARGET_CPU_OR1K
+	select ADK_TARGET_WITH_SERIAL
+	select ADK_TARGET_WITH_NET
+	help
+	  Simulator for OR1K architecture.
+
-- 
cgit v1.2.3