summaryrefslogtreecommitdiff
path: root/target/or1k
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@uclibc-ng.org>2016-11-21 16:48:41 +0100
committerWaldemar Brodkorb <wbx@uclibc-ng.org>2016-11-21 16:48:41 +0100
commit6ddeae54d61d38ab19ba3dcc11216c8d3afc938e (patch)
treec42d07df7483f5b84ec928dbcbb604000033ea9d /target/or1k
parent66c6e9fc597ab73a82cb67a8f7998c6b1591c624 (diff)
or1k: rename or1k-sim to sim-or1k, by default 64mb ram
Diffstat (limited to 'target/or1k')
-rw-r--r--target/or1k/Makefile2
-rw-r--r--target/or1k/kernel/sim-or1k (renamed from target/or1k/kernel/or1k-sim)0
-rw-r--r--target/or1k/or1ksim.cfg2
-rw-r--r--target/or1k/patches/4.1.35/ld-or1k.patch12
-rw-r--r--target/or1k/systems/sim-or1k (renamed from target/or1k/systems/or1k-sim)3
5 files changed, 4 insertions, 15 deletions
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/sim-or1k
index ee4d9d55c..ee4d9d55c 100644
--- a/target/or1k/kernel/or1k-sim
+++ b/target/or1k/kernel/sim-or1k
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/sim-or1k
index 4a1a47902..67bbbc245 100644
--- a/target/or1k/systems/or1k-sim
+++ b/target/or1k/systems/sim-or1k
@@ -1,7 +1,8 @@
-config ADK_TARGET_SYSTEM_OR1K_SIM
+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.