summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDevaev Maxim <[email protected]>2019-11-08 17:20:06 +0300
committerDevaev Maxim <[email protected]>2019-11-08 17:20:06 +0300
commit976130bcd9ba2822428f5358efe5e9395b89a55f (patch)
treeab0380b7ffbc18a98a9c08c39324ebf4d6a69941
parentfa40676136483dd287caf5df324ca429e5adbace (diff)
zerow configs
-rw-r--r--PKGBUILD2
-rw-r--r--configs/kvmd/main/v0-hdmi-rpi2.yaml (renamed from configs/kvmd/main/v0-hdmi.yaml)0
-rw-r--r--configs/kvmd/main/v0-hdmi-rpi3.yaml54
-rw-r--r--configs/kvmd/main/v0-vga-rpi2.yaml (renamed from configs/kvmd/main/v0-vga.yaml)0
-rw-r--r--configs/kvmd/main/v0-vga-rpi3.yaml55
-rw-r--r--configs/kvmd/main/v1-hdmi-rpi2.yaml (renamed from configs/kvmd/main/v1-hdmi.yaml)0
-rw-r--r--configs/kvmd/main/v1-hdmi-rpi3.yaml57
-rw-r--r--configs/kvmd/main/v1-vga-rpi2.yaml (renamed from configs/kvmd/main/v1-vga.yaml)0
-rw-r--r--configs/kvmd/main/v1-vga-rpi3.yaml61
-rw-r--r--configs/kvmd/main/v2-hdmi-rpi4.yaml (renamed from configs/kvmd/main/v2-hdmi.yaml)0
-rw-r--r--configs/kvmd/main/v2-hdmi-zerow.yaml56
-rw-r--r--configs/os/boot-config/v2-hdmi-zerow.txt10
-rw-r--r--configs/os/cmdline/v0-hdmi-rpi2.sed (renamed from configs/os/cmdline/v0-hdmi.sed)0
-rw-r--r--configs/os/cmdline/v0-hdmi-rpi3.sed (renamed from configs/os/cmdline/v1-hdmi.sed)0
-rw-r--r--configs/os/cmdline/v0-vga-rpi2.sed (renamed from configs/os/cmdline/v0-vga.sed)0
-rw-r--r--configs/os/cmdline/v0-vga-rpi3.sed (renamed from configs/os/cmdline/v1-vga.sed)0
-rw-r--r--configs/os/cmdline/v1-hdmi-rpi2.sed3
-rw-r--r--configs/os/cmdline/v1-hdmi-rpi3.sed3
-rw-r--r--configs/os/cmdline/v1-vga-rpi2.sed2
-rw-r--r--configs/os/cmdline/v1-vga-rpi3.sed2
-rw-r--r--configs/os/cmdline/v2-hdmi-rpi4.sed (renamed from configs/os/cmdline/v2-hdmi.sed)0
-rw-r--r--configs/os/cmdline/v2-hdmi-zerow.sed1
-rw-r--r--configs/os/udev/v2-hdmi-zerow.rules5
23 files changed, 310 insertions, 1 deletions
diff --git a/PKGBUILD b/PKGBUILD
index cf342432..f06cb9bf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -129,7 +129,7 @@ for _variant in "${_variants[@]}"; do
install -DTm644 configs/os/sysctl.conf \"\$pkgdir/etc/sysctl.d/99-kvmd.conf\"
install -DTm644 configs/os/udev/$_platform-$_board.rules \"\$pkgdir/etc/udev/rules.d/99-kvmd.rules\"
- install -DTm444 configs/kvmd/main/$_platform.yaml \"\$pkgdir/etc/kvmd/main.yaml\"
+ install -DTm444 configs/kvmd/main/$_platform-$_board.yaml \"\$pkgdir/etc/kvmd/main.yaml\"
if [ -f configs/os/modules-load/$_platform.conf ]; then
backup=(\"\${backup[@]}\" etc/modules-load.d/kvmd.conf)
diff --git a/configs/kvmd/main/v0-hdmi.yaml b/configs/kvmd/main/v0-hdmi-rpi2.yaml
index 3840d16e..3840d16e 100644
--- a/configs/kvmd/main/v0-hdmi.yaml
+++ b/configs/kvmd/main/v0-hdmi-rpi2.yaml
diff --git a/configs/kvmd/main/v0-hdmi-rpi3.yaml b/configs/kvmd/main/v0-hdmi-rpi3.yaml
new file mode 100644
index 00000000..3840d16e
--- /dev/null
+++ b/configs/kvmd/main/v0-hdmi-rpi3.yaml
@@ -0,0 +1,54 @@
+# Don't touch this file otherwise your device may stop working.
+# Use override.yaml to modify required settings.
+# You can find a working configuration in /usr/share/kvmd/configs.default/kvmd.
+
+override: !include override.yaml
+
+logging: !include logging.yaml
+
+kvmd:
+ server:
+ unix: /run/kvmd/kvmd.sock
+
+ auth: !include auth.yaml
+
+ hid:
+ type: serial
+ reset_pin: 4
+ device: /dev/kvmd-hid
+
+ atx:
+ type: gpio
+ power_led_pin: 24
+ hdd_led_pin: 22
+ power_switch_pin: 23
+ reset_switch_pin: 27
+
+ msd:
+ type: disabled
+
+ streamer:
+ unix: /run/kvmd/ustreamer.sock
+ cmd:
+ - "/usr/bin/ustreamer"
+ - "--device=/dev/kvmd-video"
+ - "--persistent"
+ - "--dv-timings"
+ - "--format=uyvy"
+ - "--encoder=omx"
+ - "--glitched-resolutions=720x480,720x576"
+ - "--workers=3"
+ - "--quality={quality}"
+ - "--desired-fps={desired_fps}"
+ - "--drop-same-frames=30"
+ - "--last-as-blank=0"
+ - "--unix={unix}"
+ - "--unix-rm"
+ - "--unix-mode=0660"
+ - "--exit-on-parent-death"
+ - "--process-name-prefix={process_name_prefix}"
+ - "--no-log-colors"
+
+ipmi:
+ kvmd:
+ unix: /run/kvmd/kvmd.sock
diff --git a/configs/kvmd/main/v0-vga.yaml b/configs/kvmd/main/v0-vga-rpi2.yaml
index cc3ff62a..cc3ff62a 100644
--- a/configs/kvmd/main/v0-vga.yaml
+++ b/configs/kvmd/main/v0-vga-rpi2.yaml
diff --git a/configs/kvmd/main/v0-vga-rpi3.yaml b/configs/kvmd/main/v0-vga-rpi3.yaml
new file mode 100644
index 00000000..cc3ff62a
--- /dev/null
+++ b/configs/kvmd/main/v0-vga-rpi3.yaml
@@ -0,0 +1,55 @@
+# Don't touch this file otherwise your device may stop working.
+# Use override.yaml to modify required settings.
+# You can find a working configuration in /usr/share/kvmd/configs.default/kvmd.
+
+override: !include override.yaml
+
+logging: !include logging.yaml
+
+kvmd:
+ server:
+ unix: /run/kvmd/kvmd.sock
+
+ auth: !include auth.yaml
+
+ hid:
+ type: serial
+ reset_pin: 4
+ device: /dev/kvmd-hid
+
+ atx:
+ type: gpio
+ power_led_pin: 24
+ hdd_led_pin: 22
+ power_switch_pin: 23
+ reset_switch_pin: 27
+
+ msd:
+ type: disabled
+
+ streamer:
+ sync_delay: 1.0
+ init_delay: 3.0
+ desired_fps: 0
+ unix: /run/kvmd/ustreamer.sock
+ cmd:
+ - "/usr/bin/ustreamer"
+ - "--device=/dev/kvmd-video"
+ - "--tv-standard=pal"
+ - "--format=yuyv"
+ - "--encoder=cpu"
+ - "--quality={quality}"
+ - "--desired-fps={desired_fps}"
+ - "--resolution=720x576"
+ - "--fake-resolution=800x600"
+ - "--last-as-blank=0"
+ - "--unix={unix}"
+ - "--unix-rm"
+ - "--unix-mode=0660"
+ - "--exit-on-parent-death"
+ - "--process-name-prefix={process_name_prefix}"
+ - "--no-log-colors"
+
+ipmi:
+ kvmd:
+ unix: /run/kvmd/kvmd.sock
diff --git a/configs/kvmd/main/v1-hdmi.yaml b/configs/kvmd/main/v1-hdmi-rpi2.yaml
index f24bfccf..f24bfccf 100644
--- a/configs/kvmd/main/v1-hdmi.yaml
+++ b/configs/kvmd/main/v1-hdmi-rpi2.yaml
diff --git a/configs/kvmd/main/v1-hdmi-rpi3.yaml b/configs/kvmd/main/v1-hdmi-rpi3.yaml
new file mode 100644
index 00000000..f24bfccf
--- /dev/null
+++ b/configs/kvmd/main/v1-hdmi-rpi3.yaml
@@ -0,0 +1,57 @@
+# Don't touch this file otherwise your device may stop working.
+# Use override.yaml to modify required settings.
+# You can find a working configuration in /usr/share/kvmd/configs.default/kvmd.
+
+override: !include override.yaml
+
+logging: !include logging.yaml
+
+kvmd:
+ server:
+ unix: /run/kvmd/kvmd.sock
+
+ auth: !include auth.yaml
+
+ hid:
+ type: serial
+ reset_pin: 4
+ device: /dev/kvmd-hid
+
+ atx:
+ type: gpio
+ power_led_pin: 24
+ hdd_led_pin: 22
+ power_switch_pin: 23
+ reset_switch_pin: 27
+
+ msd:
+ type: relay
+ target_pin: 12
+ reset_pin: 13
+ device: /dev/kvmd-msd
+
+ streamer:
+ unix: /run/kvmd/ustreamer.sock
+ cmd:
+ - "/usr/bin/ustreamer"
+ - "--device=/dev/kvmd-video"
+ - "--persistent"
+ - "--dv-timings"
+ - "--format=uyvy"
+ - "--encoder=omx"
+ - "--glitched-resolutions=720x480,720x576"
+ - "--workers=3"
+ - "--quality={quality}"
+ - "--desired-fps={desired_fps}"
+ - "--drop-same-frames=30"
+ - "--last-as-blank=0"
+ - "--unix={unix}"
+ - "--unix-rm"
+ - "--unix-mode=0660"
+ - "--exit-on-parent-death"
+ - "--process-name-prefix={process_name_prefix}"
+ - "--no-log-colors"
+
+ipmi:
+ kvmd:
+ unix: /run/kvmd/kvmd.sock
diff --git a/configs/kvmd/main/v1-vga.yaml b/configs/kvmd/main/v1-vga-rpi2.yaml
index 43b3349a..43b3349a 100644
--- a/configs/kvmd/main/v1-vga.yaml
+++ b/configs/kvmd/main/v1-vga-rpi2.yaml
diff --git a/configs/kvmd/main/v1-vga-rpi3.yaml b/configs/kvmd/main/v1-vga-rpi3.yaml
new file mode 100644
index 00000000..43b3349a
--- /dev/null
+++ b/configs/kvmd/main/v1-vga-rpi3.yaml
@@ -0,0 +1,61 @@
+# Don't touch this file otherwise your device may stop working.
+# Use override.yaml to modify required settings.
+# You can find a working configuration in /usr/share/kvmd/configs.default/kvmd.
+
+override: !include override.yaml
+
+logging: !include logging.yaml
+
+kvmd:
+ server:
+ unix: /run/kvmd/kvmd.sock
+
+ auth: !include auth.yaml
+
+ hid:
+ type: serial
+ reset_pin: 4
+ device: /dev/kvmd-hid
+
+ atx:
+ type: gpio
+ power_led_pin: 24
+ hdd_led_pin: 22
+ power_switch_pin: 23
+ reset_switch_pin: 27
+
+ msd:
+ type: relay
+ target_pin: 12
+ reset_pin: 13
+ device: /dev/kvmd-msd
+
+ streamer:
+ cap_pin: 17
+ conv_pin: 18
+ sync_delay: 1.0
+ init_delay: 3.0
+ init_restart_after: 1.0
+ desired_fps: 0
+ unix: /run/kvmd/ustreamer.sock
+ cmd:
+ - "/usr/bin/ustreamer"
+ - "--device=/dev/kvmd-video"
+ - "--tv-standard=pal"
+ - "--format=yuyv"
+ - "--encoder=cpu"
+ - "--quality={quality}"
+ - "--desired-fps={desired_fps}"
+ - "--resolution=720x576"
+ - "--fake-resolution=800x600"
+ - "--last-as-blank=0"
+ - "--unix={unix}"
+ - "--unix-rm"
+ - "--unix-mode=0660"
+ - "--exit-on-parent-death"
+ - "--process-name-prefix={process_name_prefix}"
+ - "--no-log-colors"
+
+ipmi:
+ kvmd:
+ unix: /run/kvmd/kvmd.sock
diff --git a/configs/kvmd/main/v2-hdmi.yaml b/configs/kvmd/main/v2-hdmi-rpi4.yaml
index 32904c20..32904c20 100644
--- a/configs/kvmd/main/v2-hdmi.yaml
+++ b/configs/kvmd/main/v2-hdmi-rpi4.yaml
diff --git a/configs/kvmd/main/v2-hdmi-zerow.yaml b/configs/kvmd/main/v2-hdmi-zerow.yaml
new file mode 100644
index 00000000..842d750e
--- /dev/null
+++ b/configs/kvmd/main/v2-hdmi-zerow.yaml
@@ -0,0 +1,56 @@
+# Don't touch this file otherwise your device may stop working.
+# Use override.yaml to modify required settings.
+# You can find a working configuration in /usr/share/kvmd/configs.default/kvmd.
+
+override: !include override.yaml
+
+logging: !include logging.yaml
+
+kvmd:
+ server:
+ unix: /run/kvmd/kvmd.sock
+
+ auth: !include auth.yaml
+
+ hid:
+ type: otg
+ keyboard:
+ device: /dev/kvmd-hid-keyboard
+ mouse:
+ device: /dev/kvmd-hid-mouse
+
+ atx:
+ type: gpio
+ power_led_pin: 24
+ hdd_led_pin: 22
+ power_switch_pin: 23
+ reset_switch_pin: 27
+
+ msd:
+ type: otg
+
+ streamer:
+ unix: /run/kvmd/ustreamer.sock
+ cmd:
+ - "/usr/bin/ustreamer"
+ - "--device=/dev/kvmd-video"
+ - "--persistent"
+ - "--dv-timings"
+ - "--format=uyvy"
+ - "--encoder=omx"
+ - "--glitched-resolutions=720x480,720x576"
+ - "--workers=1"
+ - "--quality={quality}"
+ - "--desired-fps={desired_fps}"
+ - "--drop-same-frames=30"
+ - "--last-as-blank=0"
+ - "--unix={unix}"
+ - "--unix-rm"
+ - "--unix-mode=0660"
+ - "--exit-on-parent-death"
+ - "--process-name-prefix={process_name_prefix}"
+ - "--no-log-colors"
+
+ipmi:
+ kvmd:
+ unix: /run/kvmd/kvmd.sock
diff --git a/configs/os/boot-config/v2-hdmi-zerow.txt b/configs/os/boot-config/v2-hdmi-zerow.txt
new file mode 100644
index 00000000..a7c9f3d1
--- /dev/null
+++ b/configs/os/boot-config/v2-hdmi-zerow.txt
@@ -0,0 +1,10 @@
+# See /boot/overlays/README for all available options
+initramfs initramfs-linux.img followkernel
+
+hdmi_force_hotplug=1
+gpu_mem=64
+start_x=1
+enable_uart=1
+dtoverlay=tc358743,i2c_pins_28_29=1
+dtoverlay=pi3-disable-bt
+dtoverlay=dwc2
diff --git a/configs/os/cmdline/v0-hdmi.sed b/configs/os/cmdline/v0-hdmi-rpi2.sed
index b3614eb0..b3614eb0 100644
--- a/configs/os/cmdline/v0-hdmi.sed
+++ b/configs/os/cmdline/v0-hdmi-rpi2.sed
diff --git a/configs/os/cmdline/v1-hdmi.sed b/configs/os/cmdline/v0-hdmi-rpi3.sed
index b3614eb0..b3614eb0 100644
--- a/configs/os/cmdline/v1-hdmi.sed
+++ b/configs/os/cmdline/v0-hdmi-rpi3.sed
diff --git a/configs/os/cmdline/v0-vga.sed b/configs/os/cmdline/v0-vga-rpi2.sed
index 57f42700..57f42700 100644
--- a/configs/os/cmdline/v0-vga.sed
+++ b/configs/os/cmdline/v0-vga-rpi2.sed
diff --git a/configs/os/cmdline/v1-vga.sed b/configs/os/cmdline/v0-vga-rpi3.sed
index 57f42700..57f42700 100644
--- a/configs/os/cmdline/v1-vga.sed
+++ b/configs/os/cmdline/v0-vga-rpi3.sed
diff --git a/configs/os/cmdline/v1-hdmi-rpi2.sed b/configs/os/cmdline/v1-hdmi-rpi2.sed
new file mode 100644
index 00000000..b3614eb0
--- /dev/null
+++ b/configs/os/cmdline/v1-hdmi-rpi2.sed
@@ -0,0 +1,3 @@
+s/console=ttyAMA0\,115200//g
+s/kgdboc=ttyAMA0\,115200//g
+s/rootwait/cma=128M rootwait/g
diff --git a/configs/os/cmdline/v1-hdmi-rpi3.sed b/configs/os/cmdline/v1-hdmi-rpi3.sed
new file mode 100644
index 00000000..b3614eb0
--- /dev/null
+++ b/configs/os/cmdline/v1-hdmi-rpi3.sed
@@ -0,0 +1,3 @@
+s/console=ttyAMA0\,115200//g
+s/kgdboc=ttyAMA0\,115200//g
+s/rootwait/cma=128M rootwait/g
diff --git a/configs/os/cmdline/v1-vga-rpi2.sed b/configs/os/cmdline/v1-vga-rpi2.sed
new file mode 100644
index 00000000..57f42700
--- /dev/null
+++ b/configs/os/cmdline/v1-vga-rpi2.sed
@@ -0,0 +1,2 @@
+s/console=ttyAMA0\,115200//g
+s/kgdboc=ttyAMA0\,115200//g
diff --git a/configs/os/cmdline/v1-vga-rpi3.sed b/configs/os/cmdline/v1-vga-rpi3.sed
new file mode 100644
index 00000000..57f42700
--- /dev/null
+++ b/configs/os/cmdline/v1-vga-rpi3.sed
@@ -0,0 +1,2 @@
+s/console=ttyAMA0\,115200//g
+s/kgdboc=ttyAMA0\,115200//g
diff --git a/configs/os/cmdline/v2-hdmi.sed b/configs/os/cmdline/v2-hdmi-rpi4.sed
index 803b9b03..803b9b03 100644
--- a/configs/os/cmdline/v2-hdmi.sed
+++ b/configs/os/cmdline/v2-hdmi-rpi4.sed
diff --git a/configs/os/cmdline/v2-hdmi-zerow.sed b/configs/os/cmdline/v2-hdmi-zerow.sed
new file mode 100644
index 00000000..69372c9f
--- /dev/null
+++ b/configs/os/cmdline/v2-hdmi-zerow.sed
@@ -0,0 +1 @@
+s/rootwait/cma=64M rootwait/g
diff --git a/configs/os/udev/v2-hdmi-zerow.rules b/configs/os/udev/v2-hdmi-zerow.rules
new file mode 100644
index 00000000..25ad13de
--- /dev/null
+++ b/configs/os/udev/v2-hdmi-zerow.rules
@@ -0,0 +1,5 @@
+# https://unix.stackexchange.com/questions/66901/how-to-bind-usb-device-under-a-static-name
+# https://wiki.archlinux.org/index.php/Udev#Setting_static_device_names
+KERNEL=="video[0-9]*", SUBSYSTEM=="video4linux", KERNELS=="20801000.csi|20801000.csi1", GROUP="kvmd", SYMLINK+="kvmd-video"
+KERNEL=="hidg0", GROUP="kvmd", SYMLINK+="kvmd-hid-keyboard"
+KERNEL=="hidg1", GROUP="kvmd", SYMLINK+="kvmd-hid-mouse"