diff --git a/cmdline-iot-lts2018 b/cmdline-iot-lts2018 index 9280c537..8f925cae 100644 --- a/cmdline-iot-lts2018 +++ b/cmdline-iot-lts2018 @@ -1 +1 @@ -quiet console=tty0 console=ttyS0,115200n8 init=/usr/lib/systemd/systemd-bootchart initcall_debug tsc=reliable no_timer_check noreplace-smp kvm-intel.nested=1 rootfstype=ext4,btrfs,xfs intel_iommu=igfx_off cryptomgr.notests rcupdate.rcu_expedited=1 rcu_nocbs=0-64 i915.nuclear_pageflip=1 rw i915.enable_guc=0x02 +quiet console=tty0 console=ttyS0,115200n8 init=/usr/lib/systemd/systemd-bootchart initcall_debug tsc=reliable no_timer_check noreplace-smp kvm-intel.nested=1 rootfstype=ext4,btrfs,xfs intel_iommu=igfx_off cryptomgr.notests rcupdate.rcu_expedited=1 rcu_nocbs=0-64 i915.nuclear_pageflip=1 diff --git a/cmdline-iot-lts2018-sos b/cmdline-iot-lts2018-sos index 1a5486cb..1823bc99 100644 --- a/cmdline-iot-lts2018-sos +++ b/cmdline-iot-lts2018-sos @@ -1 +1 @@ -quiet console=tty0 console=ttyS0,115200n8 init=/usr/lib/systemd/systemd-bootchart initcall_debug tsc=reliable no_timer_check noreplace-smp kvm-intel.nested=1 rootfstype=ext4,btrfs,xfs intel_iommu=igfx_off cryptomgr.notests rcupdate.rcu_expedited=1 rcu_nocbs=0-64 i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_gvt=1 i915.enable_guc=0 rw +quiet console=tty0 console=ttyS0,115200n8 init=/usr/lib/systemd/systemd-bootchart initcall_debug tsc=reliable no_timer_check noreplace-smp kvm-intel.nested=1 rootfstype=ext4,btrfs,xfs intel_iommu=igfx_off cryptomgr.notests rcupdate.rcu_expedited=1 rcu_nocbs=0-64 i915.nuclear_pageflip=1 i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_gvt=1 diff --git a/config-iot-lts2018 b/config-iot-lts2018 index b06e7948..056db63d 100644 --- a/config-iot-lts2018 +++ b/config-iot-lts2018 @@ -1662,8 +1662,8 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y # Firmware loader # CONFIG_FW_LOADER=y -CONFIG_EXTRA_FIRMWARE="i915/skl_dmc_ver1_26.bin i915/kbl_dmc_ver1_01.bin i915/kbl_huc_ver02_00_1810.bin i915/bxt_dmc_ver1_07.bin i915/bxt_guc_ver9_29.bin i915/bxt_huc_ver01_07_1398.bin intel/reef-apl.ri intel/reef-apl.tplg" -CONFIG_EXTRA_FIRMWARE_DIR="firmware" +CONFIG_EXTRA_FIRMWARE="i915/bxt_dmc_ver1_07.bin i915/bxt_dmc_ver1.bin i915/bxt_guc_32.0.3.bin i915/bxt_guc_ver8_7.bin i915/bxt_guc_ver9_29.bin i915/bxt_huc_ver01_07_1398.bin i915/cnl_dmc_ver1_06.bin i915/cnl_dmc_ver1_07.bin i915/glk_dmc_ver1_04.bin i915/glk_guc_32.0.3.bin i915/glk_huc_ver03_01_2893.bin i915/icl_guc_32.0.3.bin i915/icl_huc_ver8_4_3238.bin i915/kbl_dmc_ver1_01.bin i915/kbl_dmc_ver1_04.bin i915/kbl_dmc_ver1.bin i915/kbl_guc_32.0.3.bin i915/kbl_guc_ver9_39.bin i915/kbl_huc_ver02_00_1810.bin i915/skl_dmc_ver1_23.bin i915/skl_dmc_ver1_26.bin i915/skl_dmc_ver1_27.bin i915/skl_dmc_ver1.bin i915/skl_guc_ver1.bin i915/skl_guc_ver4.bin i915/skl_guc_ver6_1.bin i915/skl_guc_ver6.bin i915/skl_guc_ver9_33.bin i915/skl_huc_ver01_07_1398.bin" +CONFIG_EXTRA_FIRMWARE_DIR="/lib/firmware" # CONFIG_FW_LOADER_USER_HELPER is not set CONFIG_WANT_DEV_COREDUMP=y CONFIG_ALLOW_DEV_COREDUMP=y diff --git a/config-iot-lts2018-sos b/config-iot-lts2018-sos index 742bf6cf..6118e226 100644 --- a/config-iot-lts2018-sos +++ b/config-iot-lts2018-sos @@ -1551,8 +1551,8 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y # Firmware loader # CONFIG_FW_LOADER=y -CONFIG_EXTRA_FIRMWARE="i915/skl_dmc_ver1_26.bin i915/kbl_dmc_ver1_01.bin i915/kbl_huc_ver02_00_1810.bin i915/bxt_dmc_ver1_07.bin i915/bxt_guc_ver9_29.bin i915/bxt_huc_ver01_07_1398.bin intel/reef-apl.ri intel/reef-apl.tplg" -CONFIG_EXTRA_FIRMWARE_DIR="firmware" +CONFIG_EXTRA_FIRMWARE="i915/bxt_dmc_ver1_07.bin i915/bxt_dmc_ver1.bin i915/bxt_guc_32.0.3.bin i915/bxt_guc_ver8_7.bin i915/bxt_guc_ver9_29.bin i915/bxt_huc_ver01_07_1398.bin i915/cnl_dmc_ver1_06.bin i915/cnl_dmc_ver1_07.bin i915/glk_dmc_ver1_04.bin i915/glk_guc_32.0.3.bin i915/glk_huc_ver03_01_2893.bin i915/icl_guc_32.0.3.bin i915/icl_huc_ver8_4_3238.bin i915/kbl_dmc_ver1_01.bin i915/kbl_dmc_ver1_04.bin i915/kbl_dmc_ver1.bin i915/kbl_guc_32.0.3.bin i915/kbl_guc_ver9_39.bin i915/kbl_huc_ver02_00_1810.bin i915/skl_dmc_ver1_23.bin i915/skl_dmc_ver1_26.bin i915/skl_dmc_ver1_27.bin i915/skl_dmc_ver1.bin i915/skl_guc_ver1.bin i915/skl_guc_ver4.bin i915/skl_guc_ver6_1.bin i915/skl_guc_ver6.bin i915/skl_guc_ver9_33.bin i915/skl_huc_ver01_07_1398.bin" +CONFIG_EXTRA_FIRMWARE_DIR="/lib/firmware" CONFIG_FW_LOADER_USER_HELPER=y CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y CONFIG_WANT_DEV_COREDUMP=y diff --git a/fragment-sos b/fragment-sos index 05d47759..2dc2d124 100644 --- a/fragment-sos +++ b/fragment-sos @@ -1,6 +1,6 @@ CONFIG_LOCALVERSION="" CONFIG_DEFAULT_HOSTNAME="clr" -CONFIG_EXTRA_FIRMWARE="i915/skl_dmc_ver1_26.bin i915/kbl_dmc_ver1_01.bin i915/kbl_huc_ver02_00_1810.bin i915/bxt_dmc_ver1_07.bin i915/bxt_guc_ver9_29.bin i915/bxt_huc_ver01_07_1398.bin intel/reef-apl.ri intel/reef-apl.tplg" +CONFIG_EXTRA_FIRMWARE="i915/bxt_dmc_ver1_07.bin i915/bxt_dmc_ver1.bin i915/bxt_guc_32.0.3.bin i915/bxt_guc_ver8_7.bin i915/bxt_guc_ver9_29.bin i915/bxt_huc_ver01_07_1398.bin 15/bxt_huc_ver01_8_2893.bin i915/cnl_dmc_ver1_06.bin i915/cnl_dmc_ver1_07.bin i915/glk_dmc_ver1_04.bin i915/glk_guc_32.0.3.bin i915/glk_huc_ver03_01_2893.bin i915/icl_dmc_ver07.bin i915/icl_guc_32.0.3.bin i915/icl_huc_ver8_4_3238.bin i915/kbl_dmc_ver1_01.bin i915/kbl_dmc_ver1_04.bin i915/kbl_dmc_ver1.bin i915/kbl_guc_32.0.3.bin i915/kbl_guc_ver9_.bin i915/kbl_guc_ver9_39.bin i915/kbl_huc_ver02_00_1810.bin i915/skl_dmc_ver1_23.bin i915/skl_dmc_ver1_26.bin i915/skl_dmc_ver1_27.bin i915/skl_dmc_ver1.bin i915/skl_guc_32.3.bin i915/skl_guc_ver1.bin i915/skl_guc_ver4.bin i915/skl_guc_ver6_1.bin i915/skl_guc_ver6.bin i915/skl_guc_ver9_33.bin i915/skl_huc_ver01_07_1398.bin" CONFIG_EXTRA_FIRMWARE_DIR="firmware" CONFIG_E100=m CONFIG_E1000=m