From a42ec5a3e4d77e1381c815006c579c04aa3b77ed Mon Sep 17 00:00:00 2001 From: Ing Date: Mon, 25 Dec 2023 00:17:10 +0800 Subject: [PATCH] add SA3600 and modify cmdline & synoinfo --- files/initrd/opt/rr/model-configs/DS1520+.yml | 1 - files/initrd/opt/rr/model-configs/DS1522+.yml | 1 - files/initrd/opt/rr/model-configs/DS1621+.yml | 1 - files/initrd/opt/rr/model-configs/DS1821+.yml | 1 - files/initrd/opt/rr/model-configs/DS1823xs+.yml | 1 - files/initrd/opt/rr/model-configs/DS220+.yml | 1 - files/initrd/opt/rr/model-configs/DS224+.yml | 1 - files/initrd/opt/rr/model-configs/DS2422+.yml | 1 - files/initrd/opt/rr/model-configs/DS423+.yml | 1 - files/initrd/opt/rr/model-configs/DS720+.yml | 1 - files/initrd/opt/rr/model-configs/DS723+.yml | 1 - files/initrd/opt/rr/model-configs/DS920+.yml | 1 - files/initrd/opt/rr/model-configs/DS923+.yml | 1 - files/initrd/opt/rr/model-configs/DVA1622.yml | 1 - files/initrd/opt/rr/model-configs/FS2500.yml | 1 - files/initrd/opt/rr/model-configs/FS3017.yml.disabled | 1 - files/initrd/opt/rr/model-configs/FS6400.yml | 6 +++--- files/initrd/opt/rr/model-configs/HD6500.yml | 6 +++--- files/initrd/opt/rr/model-configs/RS1221+.yml | 1 - files/initrd/opt/rr/model-configs/RS2423+.yml | 1 - files/initrd/opt/rr/model-configs/RS2423RP+.yml.disabled | 1 - files/initrd/opt/rr/model-configs/SA3200D.yml.disabled | 8 ++++++-- files/initrd/opt/rr/model-configs/SA3400.yml | 2 +- files/initrd/opt/rr/model-configs/SA3400D.yml.disabled | 8 ++++++-- files/initrd/opt/rr/model-configs/SA3410.yml | 6 ++++-- .../rr/model-configs/{SA3600.yml.disabled => SA3600.yml} | 3 ++- files/initrd/opt/rr/model-configs/SA3610.yml | 5 ++++- files/initrd/opt/rr/model-configs/SA6400.yml | 1 - 28 files changed, 29 insertions(+), 35 deletions(-) rename files/initrd/opt/rr/model-configs/{SA3600.yml.disabled => SA3600.yml} (96%) diff --git a/files/initrd/opt/rr/model-configs/DS1520+.yml b/files/initrd/opt/rr/model-configs/DS1520+.yml index fa991cf5..9b712449 100644 --- a/files/initrd/opt/rr/model-configs/DS1520+.yml +++ b/files/initrd/opt/rr/model-configs/DS1520+.yml @@ -10,7 +10,6 @@ synoinfo: &synoinfo buzzeroffen: "0xffff" cmdline: &cmdline intel_iommu: "igfx_off" - synoboot2: HddEnableDynamicPower: 1 vender_format_version: 2 syno_ttyS0: "serial,0x3f8" diff --git a/files/initrd/opt/rr/model-configs/DS1522+.yml b/files/initrd/opt/rr/model-configs/DS1522+.yml index ffb8ed28..288b633c 100644 --- a/files/initrd/opt/rr/model-configs/DS1522+.yml +++ b/files/initrd/opt/rr/model-configs/DS1522+.yml @@ -9,7 +9,6 @@ synoinfo: &synoinfo netif_seq: "0 1 2 3 4 5 6 7" buzzeroffen: "0xffff" cmdline: &cmdline - synoboot2: SMBusHddDynamicPower: 1 vender_format_version: 2 syno_ttyS0: "serial,0x3f8" diff --git a/files/initrd/opt/rr/model-configs/DS1621+.yml b/files/initrd/opt/rr/model-configs/DS1621+.yml index 180fded6..b039cdf4 100644 --- a/files/initrd/opt/rr/model-configs/DS1621+.yml +++ b/files/initrd/opt/rr/model-configs/DS1621+.yml @@ -9,7 +9,6 @@ synoinfo: &synoinfo netif_seq: "0 1 2 3 4 5 6 7" cmdline: &cmdline HddHotplug: 0 - synoboot2: syno_hdd_detect: 0 syno_hdd_powerup_seq: 0 SMBusHddDynamicPower: 1 diff --git a/files/initrd/opt/rr/model-configs/DS1821+.yml b/files/initrd/opt/rr/model-configs/DS1821+.yml index 96d8dcca..f305215c 100644 --- a/files/initrd/opt/rr/model-configs/DS1821+.yml +++ b/files/initrd/opt/rr/model-configs/DS1821+.yml @@ -9,7 +9,6 @@ synoinfo: &synoinfo netif_seq: "0 1 2 3 4 5 6 7" cmdline: &cmdline HddHotplug: 0 - synoboot2: syno_hdd_detect: 0 syno_hdd_powerup_seq: 0 SMBusHddDynamicPower: 1 diff --git a/files/initrd/opt/rr/model-configs/DS1823xs+.yml b/files/initrd/opt/rr/model-configs/DS1823xs+.yml index 368a7685..00c8ddb4 100644 --- a/files/initrd/opt/rr/model-configs/DS1823xs+.yml +++ b/files/initrd/opt/rr/model-configs/DS1823xs+.yml @@ -8,7 +8,6 @@ synoinfo: &synoinfo maxlanport: "8" netif_seq: "0 1 2 3 4 5 6 7" cmdline: &cmdline - synoboot2: syno_hdd_detect: 0 SMBusHddDynamicPower: 1 vender_format_version: 2 diff --git a/files/initrd/opt/rr/model-configs/DS220+.yml b/files/initrd/opt/rr/model-configs/DS220+.yml index feca3f44..d3a92eb1 100644 --- a/files/initrd/opt/rr/model-configs/DS220+.yml +++ b/files/initrd/opt/rr/model-configs/DS220+.yml @@ -10,7 +10,6 @@ synoinfo: &synoinfo buzzeroffen: "0xffff" cmdline: &cmdline intel_iommu: "igfx_off" - synoboot2: HddEnableDynamicPower: 1 vender_format_version: 2 syno_ttyS0: "serial,0x3f8" diff --git a/files/initrd/opt/rr/model-configs/DS224+.yml b/files/initrd/opt/rr/model-configs/DS224+.yml index 24cf1086..8f3b1235 100644 --- a/files/initrd/opt/rr/model-configs/DS224+.yml +++ b/files/initrd/opt/rr/model-configs/DS224+.yml @@ -10,7 +10,6 @@ synoinfo: &synoinfo buzzeroffen: "0xffff" cmdline: &cmdline intel_iommu: "igfx_off" - synoboot2: HddEnableDynamicPower: 1 vender_format_version: 2 syno_ttyS0: "serial,0x3f8" diff --git a/files/initrd/opt/rr/model-configs/DS2422+.yml b/files/initrd/opt/rr/model-configs/DS2422+.yml index 3a2c8097..edb18f57 100644 --- a/files/initrd/opt/rr/model-configs/DS2422+.yml +++ b/files/initrd/opt/rr/model-configs/DS2422+.yml @@ -8,7 +8,6 @@ synoinfo: &synoinfo maxlanport: "8" netif_seq: "0 1 2 3 4 5 6 7" cmdline: &cmdline - synoboot2: syno_hdd_detect: 0 SMBusHddDynamicPower: 1 vender_format_version: 2 diff --git a/files/initrd/opt/rr/model-configs/DS423+.yml b/files/initrd/opt/rr/model-configs/DS423+.yml index 32459d07..76355dff 100644 --- a/files/initrd/opt/rr/model-configs/DS423+.yml +++ b/files/initrd/opt/rr/model-configs/DS423+.yml @@ -10,7 +10,6 @@ synoinfo: &synoinfo buzzeroffen: "0xffff" cmdline: &cmdline intel_iommu: "igfx_off" - synoboot2: HddEnableDynamicPower: 1 vender_format_version: 2 syno_ttyS0: "serial,0x3f8" diff --git a/files/initrd/opt/rr/model-configs/DS720+.yml b/files/initrd/opt/rr/model-configs/DS720+.yml index 379d2178..4a1b58e6 100644 --- a/files/initrd/opt/rr/model-configs/DS720+.yml +++ b/files/initrd/opt/rr/model-configs/DS720+.yml @@ -10,7 +10,6 @@ synoinfo: &synoinfo buzzeroffen: "0xffff" cmdline: &cmdline intel_iommu: "igfx_off" - synoboot2: HddEnableDynamicPower: 1 vender_format_version: 2 syno_ttyS0: "serial,0x3f8" diff --git a/files/initrd/opt/rr/model-configs/DS723+.yml b/files/initrd/opt/rr/model-configs/DS723+.yml index e57b0d28..fdadbeb8 100644 --- a/files/initrd/opt/rr/model-configs/DS723+.yml +++ b/files/initrd/opt/rr/model-configs/DS723+.yml @@ -9,7 +9,6 @@ synoinfo: &synoinfo netif_seq: "0 1 2 3 4 5 6 7" buzzeroffen: "0xffff" cmdline: &cmdline - synoboot2: SMBusHddDynamicPower: 1 vender_format_version: 2 syno_ttyS0: "serial,0x3f8" diff --git a/files/initrd/opt/rr/model-configs/DS920+.yml b/files/initrd/opt/rr/model-configs/DS920+.yml index e8ba28e3..fc2777c6 100644 --- a/files/initrd/opt/rr/model-configs/DS920+.yml +++ b/files/initrd/opt/rr/model-configs/DS920+.yml @@ -10,7 +10,6 @@ synoinfo: &synoinfo buzzeroffen: "0xffff" cmdline: &cmdline intel_iommu: "igfx_off" - synoboot2: HddEnableDynamicPower: 1 vender_format_version: 2 syno_ttyS0: "serial,0x3f8" diff --git a/files/initrd/opt/rr/model-configs/DS923+.yml b/files/initrd/opt/rr/model-configs/DS923+.yml index e429838a..c089f537 100644 --- a/files/initrd/opt/rr/model-configs/DS923+.yml +++ b/files/initrd/opt/rr/model-configs/DS923+.yml @@ -9,7 +9,6 @@ synoinfo: &synoinfo netif_seq: "0 1 2 3 4 5 6 7" buzzeroffen: "0xffff" cmdline: &cmdline - synoboot2: SMBusHddDynamicPower: 1 vender_format_version: 2 syno_ttyS0: "serial,0x3f8" diff --git a/files/initrd/opt/rr/model-configs/DVA1622.yml b/files/initrd/opt/rr/model-configs/DVA1622.yml index 8ca40917..101251b9 100644 --- a/files/initrd/opt/rr/model-configs/DVA1622.yml +++ b/files/initrd/opt/rr/model-configs/DVA1622.yml @@ -10,7 +10,6 @@ synoinfo: &synoinfo buzzeroffen: "0xffff" cmdline: &cmdline intel_iommu: "igfx_off" - synoboot2: HddEnableDynamicPower: 1 vender_format_version: 2 syno_ttyS0: "serial,0x3f8" diff --git a/files/initrd/opt/rr/model-configs/FS2500.yml b/files/initrd/opt/rr/model-configs/FS2500.yml index 93a8f2d1..77f6a526 100644 --- a/files/initrd/opt/rr/model-configs/FS2500.yml +++ b/files/initrd/opt/rr/model-configs/FS2500.yml @@ -10,7 +10,6 @@ synoinfo: &synoinfo netif_seq: "0 1 2 3 4 5 6 7" cmdline: &cmdline intel_iommu: "igfx_off" - synoboot2: SMBusHddDynamicPower: 1 vender_format_version: 2 syno_ttyS0: "serial,0x3f8" diff --git a/files/initrd/opt/rr/model-configs/FS3017.yml.disabled b/files/initrd/opt/rr/model-configs/FS3017.yml.disabled index 40764fe4..0cf2aa2b 100644 --- a/files/initrd/opt/rr/model-configs/FS3017.yml.disabled +++ b/files/initrd/opt/rr/model-configs/FS3017.yml.disabled @@ -10,7 +10,6 @@ synoinfo: &synoinfo netif_seq: "0 1 2 3 4 5 6 7" buzzeroffen: "0xffff" cmdline: &cmdline - synoboot2: SMBusHddDynamicPower: 1 vender_format_version: 2 elevator: elevator diff --git a/files/initrd/opt/rr/model-configs/FS6400.yml b/files/initrd/opt/rr/model-configs/FS6400.yml index 4d343636..94f1661b 100644 --- a/files/initrd/opt/rr/model-configs/FS6400.yml +++ b/files/initrd/opt/rr/model-configs/FS6400.yml @@ -7,18 +7,18 @@ synoinfo: &synoinfo support_syno_hybrid_raid: supportraidgroup: supportsas: "no" - supportsas_v2: "yes" + supportsas_v2_r1: "no" + support_multipath: "yes" maxlanport: "8" netif_seq: "0 1 2 3 4 5 6 7" buzzeroffen: "0xffff" cmdline: &cmdline - synoboot2: + SASmodel: 1 SMBusHddDynamicPower: 1 vender_format_version: 2 syno_ttyS0: "serial,0x3f8" syno_ttyS1: "serial,0x2f8" elevator: elevator - modprobe.blacklist: mpt3sas patch: &patch - "ramdisk-etc-rc-*.patch" - "ramdisk-init-script-v4-*.patch" diff --git a/files/initrd/opt/rr/model-configs/HD6500.yml b/files/initrd/opt/rr/model-configs/HD6500.yml index fe60725f..1947c545 100644 --- a/files/initrd/opt/rr/model-configs/HD6500.yml +++ b/files/initrd/opt/rr/model-configs/HD6500.yml @@ -2,19 +2,19 @@ id: "HD6500" synoinfo: &synoinfo supportext4: "yes" internal_disk_without_led_mask: "no" - support_install_only_dev: "no" support_disk_compatibility: "no" support_memory_compatibility: "no" support_led_brightness_adjustment: "no" support_syno_hybrid_raid: supportraidgroup: supportsas: "no" - supportsas_v2: "yes" + support_multipath: "yes" + support_install_only_dev: "no" maxlanport: "8" netif_seq: "0 1 2 3 4 5 6 7" buzzeroffen: "0xffff" cmdline: &cmdline - synoboot2: + SASmodel: 1 SMBusHddDynamicPower: 1 vender_format_version: 2 syno_ttyS0: "serial,0x3f8" diff --git a/files/initrd/opt/rr/model-configs/RS1221+.yml b/files/initrd/opt/rr/model-configs/RS1221+.yml index 118bcdd4..0e979eb8 100644 --- a/files/initrd/opt/rr/model-configs/RS1221+.yml +++ b/files/initrd/opt/rr/model-configs/RS1221+.yml @@ -11,7 +11,6 @@ synoinfo: &synoinfo netif_seq: "0 1 2 3 4 5 6 7" cmdline: &cmdline HddHotplug: 0 - synoboot2: syno_hdd_detect: 0 syno_hdd_powerup_seq: 0 SMBusHddDynamicPower: 1 diff --git a/files/initrd/opt/rr/model-configs/RS2423+.yml b/files/initrd/opt/rr/model-configs/RS2423+.yml index 93fed3ee..662d70fd 100644 --- a/files/initrd/opt/rr/model-configs/RS2423+.yml +++ b/files/initrd/opt/rr/model-configs/RS2423+.yml @@ -9,7 +9,6 @@ synoinfo: &synoinfo maxlanport: "8" netif_seq: "0 1 2 3 4 5 6 7" cmdline: &cmdline - synoboot2: syno_hdd_detect: 0 SMBusHddDynamicPower: 1 vender_format_version: 2 diff --git a/files/initrd/opt/rr/model-configs/RS2423RP+.yml.disabled b/files/initrd/opt/rr/model-configs/RS2423RP+.yml.disabled index 7a36c687..3978126d 100644 --- a/files/initrd/opt/rr/model-configs/RS2423RP+.yml.disabled +++ b/files/initrd/opt/rr/model-configs/RS2423RP+.yml.disabled @@ -12,7 +12,6 @@ synoinfo: &synoinfo maxlanport: "8" netif_seq: "0 1 2 3 4 5 6 7" cmdline: &cmdline - synoboot2: syno_hdd_detect: 0 SMBusHddDynamicPower: 1 vender_format_version: 2 diff --git a/files/initrd/opt/rr/model-configs/SA3200D.yml.disabled b/files/initrd/opt/rr/model-configs/SA3200D.yml.disabled index 14a29ddf..c0d4781b 100644 --- a/files/initrd/opt/rr/model-configs/SA3200D.yml.disabled +++ b/files/initrd/opt/rr/model-configs/SA3200D.yml.disabled @@ -1,19 +1,23 @@ id: "SA3200D" synoinfo: &synoinfo supportext4: "yes" - support_install_only_dev: "no" support_disk_hibernation: "yes" support_disk_compatibility: "no" support_memory_compatibility: "no" support_led_brightness_adjustment: "no" + support_disk_hibernation: "yes" support_bde_internal_10g: "no" support_syno_hybrid_raid: supportraidgroup: + supportsas: "no" + supportbootinst: + no_disk_system: "no" + support_auto_install: "no" + support_install_only_dev: "no" maxlanport: "8" netif_seq: "0 1 2 3 4 5 6 7" cmdline: &cmdline HddHotplug: 0 - synoboot2: syno_hdd_detect: 0 syno_hdd_powerup_seq: 0 SMBusHddDynamicPower: 1 diff --git a/files/initrd/opt/rr/model-configs/SA3400.yml b/files/initrd/opt/rr/model-configs/SA3400.yml index 967582a9..c3974c23 100644 --- a/files/initrd/opt/rr/model-configs/SA3400.yml +++ b/files/initrd/opt/rr/model-configs/SA3400.yml @@ -7,11 +7,11 @@ synoinfo: &synoinfo support_bde_internal_10g: "no" support_syno_hybrid_raid: supportraidgroup: + supportsas: "no" maxlanport: "8" netif_seq: "0 1 2 3 4 5 6 7" cmdline: &cmdline HddHotplug: 0 - synoboot2: syno_hdd_detect: 0 syno_hdd_powerup_seq: 0 SMBusHddDynamicPower: 1 diff --git a/files/initrd/opt/rr/model-configs/SA3400D.yml.disabled b/files/initrd/opt/rr/model-configs/SA3400D.yml.disabled index 3e5fcdc3..3ce87342 100644 --- a/files/initrd/opt/rr/model-configs/SA3400D.yml.disabled +++ b/files/initrd/opt/rr/model-configs/SA3400D.yml.disabled @@ -1,19 +1,23 @@ id: "SA3400D" synoinfo: &synoinfo supportext4: "yes" - support_install_only_dev: "no" support_disk_hibernation: "yes" support_disk_compatibility: "no" support_memory_compatibility: "no" support_led_brightness_adjustment: "no" + support_disk_hibernation: "yes" support_bde_internal_10g: "no" support_syno_hybrid_raid: supportraidgroup: + supportsas: "no" + supportbootinst: + no_disk_system: "no" + support_auto_install: "no" + support_install_only_dev: "no" maxlanport: "8" netif_seq: "0 1 2 3 4 5 6 7" cmdline: &cmdline HddHotplug: 0 - synoboot2: syno_hdd_detect: 0 syno_hdd_powerup_seq: 0 SMBusHddDynamicPower: 1 diff --git a/files/initrd/opt/rr/model-configs/SA3410.yml b/files/initrd/opt/rr/model-configs/SA3410.yml index 3e1d552f..6701bca1 100644 --- a/files/initrd/opt/rr/model-configs/SA3410.yml +++ b/files/initrd/opt/rr/model-configs/SA3410.yml @@ -5,15 +5,17 @@ synoinfo: &synoinfo support_memory_compatibility: "no" support_led_brightness_adjustment: "no" support_bde_internal_10g: "no" + support_oob_ctl: "no" support_syno_hybrid_raid: supportraidgroup: supportsas: "no" - supportsas_v2: "yes" + supportsas_v2_r1: "no" + support_multipath: "yes" maxlanport: "8" netif_seq: "0 1 2 3 4 5 6 7" cmdline: &cmdline + SASmodel: 1 HddHotplug: 0 - synoboot2: syno_hdd_detect: 0 syno_hdd_powerup_seq: 0 SMBusHddDynamicPower: 1 diff --git a/files/initrd/opt/rr/model-configs/SA3600.yml.disabled b/files/initrd/opt/rr/model-configs/SA3600.yml similarity index 96% rename from files/initrd/opt/rr/model-configs/SA3600.yml.disabled rename to files/initrd/opt/rr/model-configs/SA3600.yml index 71e48101..04111224 100644 --- a/files/initrd/opt/rr/model-configs/SA3600.yml.disabled +++ b/files/initrd/opt/rr/model-configs/SA3600.yml @@ -5,15 +5,16 @@ synoinfo: &synoinfo support_memory_compatibility: "no" support_led_brightness_adjustment: "no" support_bde_internal_10g: "no" - support_oob_ctl: "no" support_syno_hybrid_raid: supportraidgroup: + supportsas: "no" maxlanport: "8" netif_seq: "0 1 2 3 4 5 6 7" cmdline: &cmdline HddHotplug: 0 syno_hdd_detect: 0 syno_hdd_powerup_seq: 0 + SMBusHddDynamicPower: 1 vender_format_version: 2 elevator: elevator patch: &patch diff --git a/files/initrd/opt/rr/model-configs/SA3610.yml b/files/initrd/opt/rr/model-configs/SA3610.yml index 733afeb7..63bc95a7 100644 --- a/files/initrd/opt/rr/model-configs/SA3610.yml +++ b/files/initrd/opt/rr/model-configs/SA3610.yml @@ -9,13 +9,16 @@ synoinfo: &synoinfo support_syno_hybrid_raid: supportraidgroup: supportsas: "no" - supportsas_v2: "yes" + supportsas_v2_r1: "no" + support_multipath: "yes" maxlanport: "8" netif_seq: "0 1 2 3 4 5 6 7" cmdline: &cmdline + SASmodel: 1 HddHotplug: 0 syno_hdd_detect: 0 syno_hdd_powerup_seq: 0 + SMBusHddDynamicPower: 1 vender_format_version: 2 elevator: elevator modprobe.blacklist: mpt3sas diff --git a/files/initrd/opt/rr/model-configs/SA6400.yml b/files/initrd/opt/rr/model-configs/SA6400.yml index 30b09e31..754790b1 100644 --- a/files/initrd/opt/rr/model-configs/SA6400.yml +++ b/files/initrd/opt/rr/model-configs/SA6400.yml @@ -11,7 +11,6 @@ synoinfo: &synoinfo netif_seq: "0 1 2 3 4 5 6 7" netif_seq_by_dts: "no" cmdline: &cmdline - synoboot2: SMBusHddDynamicPower: 1 vender_format_version: 2 syno_ttyS0: "serial,0x3f8"