Skip to content

Commit 82dad69

Browse files
committed
Merge tag 'for-linus' of https://github.com/openrisc/linux
Pull OpenRISC updates from Stafford Horne: "Just a few documentation updates from the community: - Device tree documentation conversion from txt to yaml - Documentation addition to help users getting started with initramfs on OpenRISC * tag 'for-linus' of https://github.com/openrisc/linux: dt-bindings: interrupt-controller: Convert openrisc,ompic to DT schema dt-bindings: interrupt-controller: Convert opencores,or1k-pic to DT schema Documentation:openrisc: Add build instructions with initramfs
2 parents f563ba4 + f698ee1 commit 82dad69

File tree

5 files changed

+89
-45
lines changed

5 files changed

+89
-45
lines changed

Documentation/arch/openrisc/openrisc_port.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,12 @@ Build the Linux kernel as usual::
4040
make ARCH=openrisc CROSS_COMPILE="or1k-linux-" defconfig
4141
make ARCH=openrisc CROSS_COMPILE="or1k-linux-"
4242

43+
If you want to embed initramfs in the kernel, also pass ``CONFIG_INITRAMFS_SOURCE``. For example::
44+
45+
make ARCH=openrisc CROSS_COMPILE="or1k-linux-" CONFIG_INITRAMFS_SOURCE="path/to/rootfs path/to/devnodes"
46+
47+
For more information on this, please check Documentation/filesystems/ramfs-rootfs-initramfs.rst.
48+
4349
3) Running on FPGA (optional)
4450

4551
The OpenRISC community typically uses FuseSoC to manage building and programming

Documentation/devicetree/bindings/interrupt-controller/opencores,or1k-pic.txt

Lines changed: 0 additions & 23 deletions
This file was deleted.
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/interrupt-controller/opencores,or1k-pic.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: OpenRISC 1000 Programmable Interrupt Controller
8+
9+
maintainers:
10+
- Stefan Kristiansson <[email protected]>
11+
12+
properties:
13+
compatible:
14+
enum:
15+
- opencores,or1k-pic-level
16+
- opencores,or1k-pic-edge
17+
- opencores,or1200-pic
18+
- opencores,or1k-pic
19+
20+
interrupt-controller: true
21+
22+
'#interrupt-cells':
23+
const: 1
24+
25+
required:
26+
- compatible
27+
- interrupt-controller
28+
- '#interrupt-cells'
29+
30+
additionalProperties: false
31+
32+
examples:
33+
- |
34+
interrupt-controller {
35+
compatible = "opencores,or1k-pic-level";
36+
interrupt-controller;
37+
#interrupt-cells = <1>;
38+
};

Documentation/devicetree/bindings/interrupt-controller/openrisc,ompic.txt

Lines changed: 0 additions & 22 deletions
This file was deleted.
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/interrupt-controller/openrisc,ompic.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Open Multi-Processor Interrupt Controller
8+
9+
maintainers:
10+
- Stafford Horne <[email protected]>
11+
12+
properties:
13+
compatible:
14+
items:
15+
- const: openrisc,ompic
16+
17+
reg:
18+
maxItems: 1
19+
20+
interrupt-controller: true
21+
22+
'#interrupt-cells':
23+
const: 0
24+
25+
interrupts:
26+
maxItems: 1
27+
28+
required:
29+
- compatible
30+
- reg
31+
- interrupt-controller
32+
- '#interrupt-cells'
33+
- interrupts
34+
35+
additionalProperties: false
36+
37+
examples:
38+
- |
39+
interrupt-controller@98000000 {
40+
compatible = "openrisc,ompic";
41+
reg = <0x98000000 16>;
42+
interrupt-controller;
43+
#interrupt-cells = <0>;
44+
interrupts = <1>;
45+
};

0 commit comments

Comments
 (0)