Merge branch 'next' into efi

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
Conflicts:
	config/kernel/kernel.config.aarch64-ipfire

diff --cc config/kernel/kernel.config.aarch64-ipfire
index 37e1907419ada1fea099964525cb514f70b09881,c3b97ea927aae98d92ff1fcd2c08d0cfdeaea46b..fd70734905b012ca943a3ecd01b655a9d0d868e9
--- 1/config/kernel/kernel.config.aarch64-ipfire
--- 2/config/kernel/kernel.config.aarch64-ipfire
+++ b/config/kernel/kernel.config.aarch64-ipfire
@@@ -2860,9 -2868,10 +2869,11 @@@ CONFIG_SERIAL_MVEBU_CONSOLE=
  CONFIG_PRINTER=m
  CONFIG_LP_CONSOLE=y
  CONFIG_PPDEV=m
+ CONFIG_HVC_DRIVER=y
  # CONFIG_HVC_DCC is not set
+ CONFIG_VIRTIO_CONSOLE=m
  CONFIG_IPMI_HANDLER=m
 +CONFIG_IPMI_DMI_DECODE=y
  # CONFIG_IPMI_PANIC_EVENT is not set
  CONFIG_IPMI_DEVICE_INTERFACE=m
  CONFIG_IPMI_SI=m
@@@ -4234,8 -4246,15 +4246,9 @@@ CONFIG_DRM_UDL=
  # CONFIG_DRM_MGAG200 is not set
  # CONFIG_DRM_CIRRUS_QEMU is not set
  CONFIG_DRM_RCAR_DW_HDMI=m
 -CONFIG_DRM_SUN4I=m
 -CONFIG_DRM_SUN4I_HDMI=m
 -CONFIG_DRM_SUN4I_HDMI_CEC=y
 -CONFIG_DRM_SUN4I_BACKEND=m
 -CONFIG_DRM_SUN8I_DW_HDMI=m
 -CONFIG_DRM_SUN8I_MIXER=m
  # CONFIG_DRM_QXL is not set
  # CONFIG_DRM_BOCHS is not set
+ CONFIG_DRM_VIRTIO_GPU=m
  CONFIG_DRM_PANEL=y
  
  #

diff --cc config/rootfiles/common/aarch64/linux
index 28a02a322a69d45918ad3d191f35aee13616d19f,34ef44080e82855139c290f5b9674ebd50b43b61..c5351db9461ebc6a166183ac79693123128101ff
--- 1/config/rootfiles/common/aarch64/linux
--- 2/config/rootfiles/common/aarch64/linux
+++ b/config/rootfiles/common/aarch64/linux
@@@ -203,6 -209,6 +209,9 @@@ lib/modules/KVER-ipfir
  #lib/modules/KVER-ipfire/kernel/drivers/firewire/firewire-core.ko
  #lib/modules/KVER-ipfire/kernel/drivers/firewire/firewire-ohci.ko
  #lib/modules/KVER-ipfire/kernel/drivers/firewire/firewire-sbp2.ko
++#lib/modules/KVER-ipfire/kernel/drivers/firmware
++#lib/modules/KVER-ipfire/kernel/drivers/firmware/efi
++#lib/modules/KVER-ipfire/kernel/drivers/firmware/efi/efibc.ko
  #lib/modules/KVER-ipfire/kernel/drivers/gpio
  #lib/modules/KVER-ipfire/kernel/drivers/gpio/gpio-adnp.ko
  #lib/modules/KVER-ipfire/kernel/drivers/gpio/gpio-viperboard.ko
@@@ -254,15 -260,15 +263,6 @@@
  #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/panel/panel-simple.ko
  #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/pl111
  #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/pl111/pl111_drm.ko
--#lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/sun4i
--#lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/sun4i/sun4i-backend.ko
--#lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/sun4i/sun4i-drm-hdmi.ko
--#lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/sun4i/sun4i-drm.ko
--#lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/sun4i/sun4i-tcon.ko
--#lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/sun4i/sun4i_tv.ko
--#lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/sun4i/sun6i_drc.ko
--#lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/sun4i/sun8i-mixer.ko
--#lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.ko
  #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/tinydrm
  #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/tinydrm/core
  #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/tinydrm/core/tinydrm.ko
@@@ -1941,6 -1951,6 +1945,8 @@@
  #lib/modules/KVER-ipfire/kernel/fs/configfs/configfs.ko
  #lib/modules/KVER-ipfire/kernel/fs/dlm
  #lib/modules/KVER-ipfire/kernel/fs/dlm/dlm.ko
++#lib/modules/KVER-ipfire/kernel/fs/efivarfs
++#lib/modules/KVER-ipfire/kernel/fs/efivarfs/efivarfs.ko
  #lib/modules/KVER-ipfire/kernel/fs/fat
  #lib/modules/KVER-ipfire/kernel/fs/fat/fat.ko
  #lib/modules/KVER-ipfire/kernel/fs/fat/msdos.ko