diff options
| -rwxr-xr-x | package/adktest/src/quit | 2 | ||||
| -rw-r--r-- | target/config/Config.in.rootfs | 2 | ||||
| -rw-r--r-- | target/linux/config/Config.in.serial | 6 | ||||
| -rw-r--r-- | target/linux/patches/or1k-fixes-4.9/more-ram.patch | 12 | ||||
| -rw-r--r-- | target/or1k/Makefile | 2 | ||||
| -rw-r--r-- | target/or1k/kernel/sim-or1k (renamed from target/or1k/kernel/or1k-sim) | 0 | ||||
| -rw-r--r-- | target/or1k/or1ksim.cfg | 2 | ||||
| -rw-r--r-- | target/or1k/patches/4.1.35/ld-or1k.patch | 12 | ||||
| -rw-r--r-- | target/or1k/systems/sim-or1k (renamed from target/or1k/systems/or1k-sim) | 3 |
9 files changed, 21 insertions, 20 deletions
diff --git a/package/adktest/src/quit b/package/adktest/src/quit index c128dbcbd..5a6576231 100755 --- a/package/adktest/src/quit +++ b/package/adktest/src/quit @@ -1,7 +1,7 @@ #!/bin/sh arch=$(uname -m) case $arch in - arc|blackfin|m68k|metag|nios2|s390x|sh4eb) + arc|blackfin|m68k|metag|nios2|openrisc|s390x|sh4eb) poweroff ;; *) diff --git a/target/config/Config.in.rootfs b/target/config/Config.in.rootfs index 1ebbc24e6..f4a974bcb 100644 --- a/target/config/Config.in.rootfs +++ b/target/config/Config.in.rootfs @@ -13,7 +13,7 @@ config ADK_TARGET_ROOTFS_INITRAMFSPIGGYBACK depends on \ ADK_TARGET_QEMU || \ ADK_TARGET_SIM || \ - ADK_TARGET_SYSTEM_OR1K_SIM || \ + ADK_TARGET_SYSTEM_SIM_OR1K || \ ADK_TARGET_ARCH_AARCH64 || \ ADK_TARGET_ARCH_ARC || \ ADK_TARGET_ARCH_ARM || \ diff --git a/target/linux/config/Config.in.serial b/target/linux/config/Config.in.serial index 4e7dae56d..9252b8fa7 100644 --- a/target/linux/config/Config.in.serial +++ b/target/linux/config/Config.in.serial @@ -83,7 +83,7 @@ config ADK_KERNEL_SERIAL_8250 || ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605 \ || ADK_TARGET_SYSTEM_QEMU_NIOS2 \ || ADK_TARGET_SYSTEM_QEMU_OR1K \ - || ADK_TARGET_SYSTEM_OR1K_SIM + || ADK_TARGET_SYSTEM_SIM_OR1K select ADK_KERNEL_SERIAL_8250_PNP if ADK_TARGET_SYSTEM_PCENGINES_APU select ADK_KERNEL_SERIAL_8250_CONSOLE select ADK_KERNEL_SERIAL_8250_INGENIC if ADK_TARGET_SYSTEM_IMGTEC_CI20 @@ -102,7 +102,7 @@ config ADK_KERNEL_SERIAL_8250 || ADK_TARGET_SYSTEM_QEMU_X86 \ || ADK_TARGET_SYSTEM_QEMU_X86_64 \ || ADK_TARGET_SYSTEM_QEMU_XTENSA \ - || ADK_TARGET_SYSTEM_OR1K_SIM \ + || ADK_TARGET_SYSTEM_SIM_OR1K \ || ADK_TARGET_SYSTEM_IBM_X40 \ || ADK_TARGET_SYSTEM_GENERIC_NDS32 \ || ADK_TARGET_SYSTEM_GENERIC_X86 \ @@ -125,7 +125,7 @@ config ADK_KERNEL_SERIAL_8250 default y if ADK_TARGET_SYSTEM_QEMU_X86 default y if ADK_TARGET_SYSTEM_QEMU_X86_64 default y if ADK_TARGET_SYSTEM_QEMU_XTENSA - default y if ADK_TARGET_SYSTEM_OR1K_SIM + default y if ADK_TARGET_SYSTEM_SIM_OR1K default y if ADK_TARGET_SYSTEM_IBM_X40 default y if ADK_TARGET_SYSTEM_GENERIC_NDS32 default y if ADK_TARGET_SYSTEM_GENERIC_X86 diff --git a/target/linux/patches/or1k-fixes-4.9/more-ram.patch b/target/linux/patches/or1k-fixes-4.9/more-ram.patch new file mode 100644 index 000000000..943c881e4 --- /dev/null +++ b/target/linux/patches/or1k-fixes-4.9/more-ram.patch @@ -0,0 +1,12 @@ +diff -Nur linux-or1k-fixes-4.9.orig/arch/openrisc/boot/dts/or1ksim.dts linux-or1k-fixes-4.9/arch/openrisc/boot/dts/or1ksim.dts +--- linux-or1k-fixes-4.9.orig/arch/openrisc/boot/dts/or1ksim.dts 2016-11-17 21:49:29.000000000 +0100 ++++ linux-or1k-fixes-4.9/arch/openrisc/boot/dts/or1ksim.dts 2016-11-21 14:36:14.674136327 +0100 +@@ -11,7 +11,7 @@ + + memory@0 { + device_type = "memory"; +- reg = <0x00000000 0x02000000>; ++ reg = <0x00000000 0x04000000>; + }; + + cpus { 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. |