Merge branch 'next' into efi
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 19 Jul 2018 17:15:50 +0000 (18:15 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 20 Jul 2018 11:24:31 +0000 (12:24 +0100)
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
Conflicts:
config/kernel/kernel.config.aarch64-ipfire

1  2 
config/kernel/kernel.config.aarch64-ipfire
config/rootfiles/common/aarch64/linux

@@@ -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
  
  #
@@@ -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
  #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
  #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