Skip to content

Commit 2303ff3

Browse files
committed
arc: VDK: Update Linux kernel
* Disable "halt on reset" support which really means enable "run on reset" support. * Add support for UIO used in EVSS Signed-off-by: Alexey Brodkin <[email protected]>
1 parent 0ca9470 commit 2303ff3

File tree

2 files changed

+75
-0
lines changed

2 files changed

+75
-0
lines changed
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
From 906ee7165a2e6d1e4dc2ad1fce5f9351b5c85660 Mon Sep 17 00:00:00 2001
2+
From: Alexey Brodkin <[email protected]>
3+
Date: Fri, 17 Jun 2016 17:01:37 +0200
4+
Subject: [PATCH 18/19] arc: VDK: Disable ARC_SMP_HALT_ON_RESET
5+
6+
Current VDK for ARC HS38 SMP is configured as "run on reset" so
7+
Linux kernel should match this.
8+
9+
Signed-off-by: Alexey Brodkin <[email protected]>
10+
---
11+
arch/arc/configs/vdk_hs38_smp_defconfig | 1 +
12+
1 file changed, 1 insertion(+)
13+
14+
diff --git a/arch/arc/configs/vdk_hs38_smp_defconfig b/arch/arc/configs/vdk_hs38_smp_defconfig
15+
index 3422f1c..5b876e9 100644
16+
--- a/arch/arc/configs/vdk_hs38_smp_defconfig
17+
+++ b/arch/arc/configs/vdk_hs38_smp_defconfig
18+
@@ -16,6 +16,7 @@ CONFIG_ARC_PLAT_AXS10X=y
19+
CONFIG_AXS103=y
20+
CONFIG_ISA_ARCV2=y
21+
CONFIG_SMP=y
22+
+# CONFIG_ARC_SMP_HALT_ON_RESET is not set
23+
# CONFIG_ARC_HAS_GRTC is not set
24+
CONFIG_ARC_UBOOT_SUPPORT=y
25+
CONFIG_ARC_BUILTIN_DTB_NAME="vdk_hs38_smp"
26+
--
27+
2.5.5
28+
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
From 16764d69bcbe02a39ec7f0e448abbb6086604f58 Mon Sep 17 00:00:00 2001
2+
From: Alexey Brodkin <[email protected]>
3+
Date: Fri, 17 Jun 2016 17:04:05 +0200
4+
Subject: [PATCH 19/19] arc: VDK: Add support for UIO
5+
6+
To make the same image usable in both VDK and EVSS.
7+
8+
Signed-off-by: Alexey Brodkin <[email protected]>
9+
---
10+
arch/arc/boot/dts/vdk_axc003_idu.dtsi | 9 +++++++++
11+
arch/arc/configs/vdk_hs38_smp_defconfig | 2 ++
12+
2 files changed, 11 insertions(+)
13+
14+
diff --git a/arch/arc/boot/dts/vdk_axc003_idu.dtsi b/arch/arc/boot/dts/vdk_axc003_idu.dtsi
15+
index 31f0fb5..87408d2 100755
16+
--- a/arch/arc/boot/dts/vdk_axc003_idu.dtsi
17+
+++ b/arch/arc/boot/dts/vdk_axc003_idu.dtsi
18+
@@ -73,4 +73,13 @@
19+
device_type = "memory";
20+
reg = <0x80000000 0x20000000>; /* 512MiB */
21+
};
22+
+
23+
+ /* Embedded Vision subsystem UIO mappings; only relevant for EV VDK */
24+
+ uioEV: uio@0xD0000000 {
25+
+ compatible = "generic-uio";
26+
+ reg = <0xD0000000 0x2000 0xD1000000 0x2000 0x90000000 0x10000000 0xC0000000 0x10000000>;
27+
+ reg-names = "ev_gsa", "ev_ctrl", "ev_shared_mem", "ev_code_mem";
28+
+ interrupt-parent = <&mb_intc>;
29+
+ interrupts = < 23 >;
30+
+ };
31+
};
32+
diff --git a/arch/arc/configs/vdk_hs38_smp_defconfig b/arch/arc/configs/vdk_hs38_smp_defconfig
33+
index 5b876e9..c0e8441 100644
34+
--- a/arch/arc/configs/vdk_hs38_smp_defconfig
35+
+++ b/arch/arc/configs/vdk_hs38_smp_defconfig
36+
@@ -80,6 +80,8 @@ CONFIG_USB_OHCI_HCD=y
37+
CONFIG_USB_OHCI_HCD_PLATFORM=y
38+
CONFIG_USB_STORAGE=y
39+
CONFIG_USB_SERIAL=y
40+
+CONFIG_UIO=y
41+
+CONFIG_UIO_PDRV_GENIRQ=y
42+
# CONFIG_IOMMU_SUPPORT is not set
43+
CONFIG_EXT3_FS=y
44+
CONFIG_EXT4_FS=y
45+
--
46+
2.5.5
47+

0 commit comments

Comments
 (0)