]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
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

index 37e1907419ada1fea099964525cb514f70b09881,c3b97ea927aae98d92ff1fcd2c08d0cfdeaea46b..fd70734905b012ca943a3ecd01b655a9d0d868e9
@@@ -1,6 -1,6 +1,6 @@@
  #
  # Automatically generated file; DO NOT EDIT.
 -# Linux/arm64 4.14.50-ipfire-multi Kernel Configuration
 +# Linux/arm64 4.14.50-ipfire Kernel Configuration
  #
  CONFIG_ARM64=y
  CONFIG_64BIT=y
@@@ -349,6 -349,7 +349,7 @@@ CONFIG_EFI_PARTITION=
  # CONFIG_CMDLINE_PARTITION is not set
  CONFIG_BLOCK_COMPAT=y
  CONFIG_BLK_MQ_PCI=y
+ CONFIG_BLK_MQ_VIRTIO=y
  
  #
  # IO Schedulers
@@@ -441,7 -442,6 +442,7 @@@ CONFIG_PCI_ECAM=
  # CONFIG_PCI_IOV is not set
  # CONFIG_PCI_PRI is not set
  # CONFIG_PCI_PASID is not set
 +CONFIG_PCI_LABEL=y
  # CONFIG_HOTPLUG_PCI is not set
  
  #
@@@ -539,6 -539,8 +540,8 @@@ CONFIG_NO_BOOTMEM=
  CONFIG_MEMORY_ISOLATION=y
  # CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
  CONFIG_SPLIT_PTLOCK_CPUS=4
+ CONFIG_MEMORY_BALLOON=y
+ CONFIG_BALLOON_COMPACTION=y
  CONFIG_COMPACTION=y
  CONFIG_MIGRATION=y
  CONFIG_PHYS_ADDR_T_64BIT=y
@@@ -598,9 -600,7 +601,9 @@@ CONFIG_ARM64_MODULE_CMODEL_LARGE=
  #
  CONFIG_CMDLINE="console=ttyAM0,115200 root=/dev/sda1 rootdelay=20"
  # CONFIG_CMDLINE_FORCE is not set
 -# CONFIG_EFI is not set
 +CONFIG_EFI_STUB=y
 +CONFIG_EFI=y
 +CONFIG_DMI=y
  
  #
  # Userspace binary formats
@@@ -1292,6 -1292,8 +1295,8 @@@ CONFIG_OPENVSWITCH_GRE=
  CONFIG_OPENVSWITCH_VXLAN=m
  CONFIG_OPENVSWITCH_GENEVE=m
  CONFIG_VSOCKETS=m
+ CONFIG_VIRTIO_VSOCKETS=m
+ CONFIG_VIRTIO_VSOCKETS_COMMON=m
  CONFIG_NETLINK_DIAG=m
  CONFIG_MPLS=y
  CONFIG_NET_MPLS_GSO=m
@@@ -1615,6 -1617,8 +1620,8 @@@ CONFIG_BLK_DEV_RAM_COUNT=1
  CONFIG_BLK_DEV_RAM_SIZE=16384
  # CONFIG_CDROM_PKTCDVD is not set
  # CONFIG_ATA_OVER_ETH is not set
+ CONFIG_VIRTIO_BLK=m
+ CONFIG_VIRTIO_BLK_SCSI=y
  # CONFIG_BLK_DEV_RBD is not set
  # CONFIG_BLK_DEV_RSXX is not set
  CONFIG_NVME_CORE=m
@@@ -1795,6 -1799,7 +1802,7 @@@ CONFIG_ISCSI_BOOT_SYSFS=
  # CONFIG_SCSI_PMCRAID is not set
  # CONFIG_SCSI_PM8001 is not set
  # CONFIG_SCSI_BFA_FC is not set
+ CONFIG_SCSI_VIRTIO=y
  # CONFIG_SCSI_CHELSIO_FCOE is not set
  # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
  CONFIG_SCSI_DH=y
@@@ -1989,6 -1994,7 +1997,7 @@@ CONFIG_TUN=
  CONFIG_TAP=m
  # CONFIG_TUN_VNET_CROSS_LE is not set
  CONFIG_VETH=m
+ CONFIG_VIRTIO_NET=m
  CONFIG_NLMON=m
  CONFIG_NET_VRF=m
  CONFIG_SUNGEM_PHY=m
@@@ -2406,6 -2412,7 +2415,6 @@@ CONFIG_WLAN=
  # CONFIG_WIRELESS_WDS is not set
  CONFIG_WLAN_VENDOR_ADMTEK=y
  CONFIG_ADM8211=m
 -# CONFIG_RTL8189ES is not set
  CONFIG_ATH_COMMON=m
  CONFIG_WLAN_VENDOR_ATH=y
  # CONFIG_ATH_DEBUG is not set
@@@ -2616,6 -2623,7 +2625,6 @@@ CONFIG_WL18XX=
  CONFIG_WLCORE=m
  CONFIG_WLCORE_SDIO=m
  CONFIG_WILINK_PLATFORM_DATA=y
 -# CONFIG_WLAN_VENDOR_XRADIO is not set
  CONFIG_WLAN_VENDOR_ZYDAS=y
  CONFIG_USB_ZD1201=m
  CONFIG_ZD1211RW=m
@@@ -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
@@@ -2873,6 -2882,7 +2884,7 @@@ CONFIG_HW_RANDOM=
  CONFIG_HW_RANDOM_TIMERIOMEM=m
  CONFIG_HW_RANDOM_BCM2835=y
  CONFIG_HW_RANDOM_OMAP=y
+ CONFIG_HW_RANDOM_VIRTIO=y
  CONFIG_HW_RANDOM_MESON=y
  CONFIG_HW_RANDOM_CAVIUM=y
  CONFIG_R3964=m
@@@ -3582,6 -3592,7 +3594,6 @@@ CONFIG_REGULATOR_PFUZE100=
  # CONFIG_REGULATOR_PV88080 is not set
  # CONFIG_REGULATOR_PV88090 is not set
  # CONFIG_REGULATOR_PWM is not set
 -CONFIG_REGULATOR_SY8106A=y
  # CONFIG_REGULATOR_TPS51632 is not set
  # CONFIG_REGULATOR_TPS62360 is not set
  # CONFIG_REGULATOR_TPS65023 is not set
@@@ -3592,6 -3603,7 +3604,6 @@@ CONFIG_REGULATOR_TWL4030=
  CONFIG_REGULATOR_VEXPRESS=y
  CONFIG_CEC_CORE=m
  CONFIG_CEC_NOTIFIER=y
 -CONFIG_CEC_PIN=y
  CONFIG_RC_CORE=m
  CONFIG_RC_MAP=m
  CONFIG_RC_DECODERS=y
@@@ -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
  
  #
@@@ -4323,7 -4342,6 +4336,7 @@@ CONFIG_FB_ARMCLCD=
  # CONFIG_FB_ASILIANT is not set
  # CONFIG_FB_IMSTT is not set
  # CONFIG_FB_UVESA is not set
 +CONFIG_FB_EFI=y
  CONFIG_FB_OPENCORES=m
  # CONFIG_FB_S1D13XXX is not set
  # CONFIG_FB_NVIDIA is not set
  CONFIG_FB_SMSCUFX=m
  # CONFIG_FB_UDL is not set
  # CONFIG_FB_IBM_GXT4500 is not set
- # CONFIG_FB_VIRTUAL is not set
+ CONFIG_FB_VIRTUAL=m
  # CONFIG_FB_METRONOME is not set
  # CONFIG_FB_MB862XX is not set
  # CONFIG_FB_BROADSHEET is not set
@@@ -5310,7 -5328,6 +5323,7 @@@ CONFIG_RTC_DRV_DS1553=
  # CONFIG_RTC_DRV_DS1685_FAMILY is not set
  CONFIG_RTC_DRV_DS1742=m
  CONFIG_RTC_DRV_DS2404=m
 +# CONFIG_RTC_DRV_EFI is not set
  CONFIG_RTC_DRV_STK17TA8=m
  # CONFIG_RTC_DRV_M48T86 is not set
  CONFIG_RTC_DRV_M48T35=m
@@@ -5391,12 -5408,17 +5404,17 @@@ CONFIG_UIO=
  # CONFIG_UIO_MF624 is not set
  # CONFIG_VFIO is not set
  CONFIG_VIRT_DRIVERS=y
+ CONFIG_VIRTIO=y
  
  #
  # Virtio drivers
  #
- # CONFIG_VIRTIO_PCI is not set
- # CONFIG_VIRTIO_MMIO is not set
+ CONFIG_VIRTIO_PCI=y
+ CONFIG_VIRTIO_PCI_LEGACY=y
+ CONFIG_VIRTIO_BALLOON=y
+ CONFIG_VIRTIO_INPUT=y
+ CONFIG_VIRTIO_MMIO=y
+ CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
  
  #
  # Microsoft Hyper-V guest support
@@@ -6044,27 -6066,10 +6062,27 @@@ CONFIG_ARM_PSCI_FW=
  # CONFIG_ARM_PSCI_CHECKER is not set
  # CONFIG_ARM_SCPI_PROTOCOL is not set
  # CONFIG_FIRMWARE_MEMMAP is not set
 +CONFIG_DMIID=y
 +# CONFIG_DMI_SYSFS is not set
  CONFIG_RASPBERRYPI_FIRMWARE=y
  # CONFIG_FW_CFG_SYSFS is not set
  CONFIG_HAVE_ARM_SMCCC=y
  # CONFIG_GOOGLE_FIRMWARE is not set
 +
 +#
 +# EFI (Extensible Firmware Interface) Support
 +#
 +CONFIG_EFI_VARS=y
 +CONFIG_EFI_ESRT=y
 +CONFIG_EFI_VARS_PSTORE=y
 +# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
 +CONFIG_EFI_PARAMS_FROM_FDT=y
 +CONFIG_EFI_RUNTIME_WRAPPERS=y
 +CONFIG_EFI_ARMSTUB=y
 +CONFIG_EFI_BOOTLOADER_CONTROL=m
 +# CONFIG_EFI_CAPSULE_LOADER is not set
 +# CONFIG_EFI_TEST is not set
 +# CONFIG_RESET_ATTACK_MITIGATION is not set
  CONFIG_MESON_SM=y
  
  #
@@@ -6186,7 -6191,6 +6204,7 @@@ CONFIG_TMPFS_XATTR=
  # CONFIG_HUGETLB_PAGE is not set
  CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
  CONFIG_CONFIGFS_FS=m
 +CONFIG_EFIVAR_FS=m
  CONFIG_MISC_FILESYSTEMS=y
  # CONFIG_ORANGEFS_FS is not set
  # CONFIG_ADFS_FS is not set
@@@ -6611,6 -6615,7 +6629,7 @@@ CONFIG_CRYPTO_CRYPTD=
  # CONFIG_CRYPTO_MCRYPTD is not set
  CONFIG_CRYPTO_AUTHENC=m
  CONFIG_CRYPTO_TEST=m
+ CONFIG_CRYPTO_ENGINE=m
  
  #
  # Authenticated Encryption with Associated Data
@@@ -6719,6 -6724,7 +6738,7 @@@ CONFIG_CRYPTO_HW=
  # CONFIG_CRYPTO_DEV_CAVIUM_ZIP is not set
  CONFIG_CRYPTO_DEV_ROCKCHIP=y
  # CONFIG_CRYPTO_DEV_CHELSIO is not set
+ CONFIG_CRYPTO_DEV_VIRTIO=m
  # CONFIG_CRYPTO_DEV_SAFEXCEL is not set
  # CONFIG_ASYMMETRIC_KEY_TYPE is not set
  
@@@ -6804,7 -6810,6 +6824,7 @@@ CONFIG_DDR=
  CONFIG_IRQ_POLL=y
  CONFIG_LIBFDT=y
  CONFIG_OID_REGISTRY=m
 +CONFIG_UCS2_STRING=y
  CONFIG_FONT_SUPPORT=y
  # CONFIG_FONTS is not set
  CONFIG_FONT_8x8=y
index 28a02a322a69d45918ad3d191f35aee13616d19f,34ef44080e82855139c290f5b9674ebd50b43b61..c5351db9461ebc6a166183ac79693123128101ff
@@@ -48,8 -48,8 +48,8 @@@ boot/dtb-KVER-ipfir
  #boot/dtb-KVER-ipfire/arm/rtsm_ve-aemv8a.dtb
  #boot/dtb-KVER-ipfire/arm/vexpress-v2f-1xv7-ca53x2.dtb
  #boot/dtb-KVER-ipfire/broadcom
- #boot/dtb-KVER-ipfire/broadcom/bcm2837-rpi-3-b.dtb
  #boot/dtb-KVER-ipfire/broadcom/bcm2837-rpi-3-b-plus.dtb
+ #boot/dtb-KVER-ipfire/broadcom/bcm2837-rpi-3-b.dtb
  #boot/dtb-KVER-ipfire/marvell
  #boot/dtb-KVER-ipfire/marvell/armada-3720-db.dtb
  #boot/dtb-KVER-ipfire/marvell/armada-3720-espressobin.dtb
@@@ -100,6 -100,7 +100,7 @@@ lib/modules/KVER-ipfir
  #lib/modules/KVER-ipfire/kernel/crypto/cast_common.ko
  #lib/modules/KVER-ipfire/kernel/crypto/ccm.ko
  #lib/modules/KVER-ipfire/kernel/crypto/cmac.ko
+ #lib/modules/KVER-ipfire/kernel/crypto/crypto_engine.ko
  #lib/modules/KVER-ipfire/kernel/crypto/cts.ko
  #lib/modules/KVER-ipfire/kernel/crypto/deflate.ko
  #lib/modules/KVER-ipfire/kernel/crypto/ecdh_generic.ko
  #lib/modules/KVER-ipfire/kernel/drivers/bcma/bcma.ko
  #lib/modules/KVER-ipfire/kernel/drivers/block
  #lib/modules/KVER-ipfire/kernel/drivers/block/cryptoloop.ko
+ #lib/modules/KVER-ipfire/kernel/drivers/block/virtio_blk.ko
  #lib/modules/KVER-ipfire/kernel/drivers/bluetooth
  #lib/modules/KVER-ipfire/kernel/drivers/bluetooth/ath3k.ko
  #lib/modules/KVER-ipfire/kernel/drivers/bluetooth/bcm203x.ko
  #lib/modules/KVER-ipfire/kernel/drivers/char/ipmi/ipmi_watchdog.ko
  #lib/modules/KVER-ipfire/kernel/drivers/char/lp.ko
  #lib/modules/KVER-ipfire/kernel/drivers/char/ppdev.ko
+ #lib/modules/KVER-ipfire/kernel/drivers/char/virtio_console.ko
  #lib/modules/KVER-ipfire/kernel/drivers/clk
  #lib/modules/KVER-ipfire/kernel/drivers/clk/clk-si5351.ko
  #lib/modules/KVER-ipfire/kernel/drivers/clk/clk-si570.ko
  #lib/modules/KVER-ipfire/kernel/drivers/cpufreq
  #lib/modules/KVER-ipfire/kernel/drivers/cpufreq/arm_big_little.ko
  #lib/modules/KVER-ipfire/kernel/drivers/cpufreq/arm_big_little_dt.ko
+ #lib/modules/KVER-ipfire/kernel/drivers/crypto
+ #lib/modules/KVER-ipfire/kernel/drivers/crypto/virtio
+ #lib/modules/KVER-ipfire/kernel/drivers/crypto/virtio/virtio_crypto.ko
  #lib/modules/KVER-ipfire/kernel/drivers/dma
  #lib/modules/KVER-ipfire/kernel/drivers/dma/dw
  #lib/modules/KVER-ipfire/kernel/drivers/dma/dw/dw_dmac_core.ko
  #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/drivers/gpu/drm/udl/udl.ko
  #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/vc4
  #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/vc4/vc4.ko
+ #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/virtio
+ #lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/virtio/virtio-gpu.ko
  #lib/modules/KVER-ipfire/kernel/drivers/hid
  #lib/modules/KVER-ipfire/kernel/drivers/hid/hid-aureal.ko
  #lib/modules/KVER-ipfire/kernel/drivers/hid/hid-gyration.ko
  #lib/modules/KVER-ipfire/kernel/drivers/md/dm-cache.ko
  #lib/modules/KVER-ipfire/kernel/drivers/md/dm-crypt.ko
  #lib/modules/KVER-ipfire/kernel/drivers/md/dm-log-userspace.ko
- #lib/modules/KVER-ipfire/kernel/drivers/md/dmpath.ko
+ #lib/modules/KVER-ipfire/kernel/drivers/md/dm-multipath.ko
  #lib/modules/KVER-ipfire/kernel/drivers/md/dm-queue-length.ko
  #lib/modules/KVER-ipfire/kernel/drivers/md/dm-raid.ko
  #lib/modules/KVER-ipfire/kernel/drivers/md/dm-round-robin.ko
  #lib/modules/KVER-ipfire/kernel/drivers/net/usb/usbnet.ko
  #lib/modules/KVER-ipfire/kernel/drivers/net/usb/zaurus.ko
  #lib/modules/KVER-ipfire/kernel/drivers/net/veth.ko
+ #lib/modules/KVER-ipfire/kernel/drivers/net/virtio_net.ko
  #lib/modules/KVER-ipfire/kernel/drivers/net/vmxnet3
  #lib/modules/KVER-ipfire/kernel/drivers/net/vmxnet3/vmxnet3.ko
  #lib/modules/KVER-ipfire/kernel/drivers/net/vrf.ko
  #lib/modules/KVER-ipfire/kernel/drivers/video/fbdev/ocfb.ko
  #lib/modules/KVER-ipfire/kernel/drivers/video/fbdev/smscufx.ko
  #lib/modules/KVER-ipfire/kernel/drivers/video/fbdev/ssd1307fb.ko
+ #lib/modules/KVER-ipfire/kernel/drivers/video/fbdev/vfb.ko
  #lib/modules/KVER-ipfire/kernel/drivers/w1
  #lib/modules/KVER-ipfire/kernel/drivers/w1/masters
  #lib/modules/KVER-ipfire/kernel/drivers/w1/masters/ds1wm.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
  #lib/modules/KVER-ipfire/kernel/net/unix
  #lib/modules/KVER-ipfire/kernel/net/unix/unix_diag.ko
  #lib/modules/KVER-ipfire/kernel/net/vmw_vsock
+ #lib/modules/KVER-ipfire/kernel/net/vmw_vsock/vmw_vsock_virtio_transport.ko
+ #lib/modules/KVER-ipfire/kernel/net/vmw_vsock/vmw_vsock_virtio_transport_common.ko
  #lib/modules/KVER-ipfire/kernel/net/vmw_vsock/vsock.ko
  #lib/modules/KVER-ipfire/kernel/net/wireless
  #lib/modules/KVER-ipfire/kernel/net/wireless/cfg80211.ko