From 48f304585406affab02cd2855ed0e809543a94ee Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Sun, 19 Apr 2020 01:33:45 +0200 Subject: [PATCH] Support NVMe & update barebox (#626) * Support NVMe & Update barebox * same for ova --- buildroot-external/board/intel/nuc/kernel.config | 1 + buildroot-external/board/intel/ova/kernel.config | 2 ++ buildroot-external/configs/intel_nuc_defconfig | 2 +- buildroot-external/configs/ova_defconfig | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/buildroot-external/board/intel/nuc/kernel.config b/buildroot-external/board/intel/nuc/kernel.config index 6180ff09e..4dca89bf7 100644 --- a/buildroot-external/board/intel/nuc/kernel.config +++ b/buildroot-external/board/intel/nuc/kernel.config @@ -2,6 +2,7 @@ CONFIG_EFI_STUB=y CONFIG_SCSI_LOWLEVEL=y CONFIG_USB_XHCI_HCD=y +CONFIG_BLK_DEV_NVME=y CONFIG_IGB=y diff --git a/buildroot-external/board/intel/ova/kernel.config b/buildroot-external/board/intel/ova/kernel.config index 063f8e7e2..86e283158 100644 --- a/buildroot-external/board/intel/ova/kernel.config +++ b/buildroot-external/board/intel/ova/kernel.config @@ -13,6 +13,7 @@ CONFIG_VIRTIO_NET=y CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_INPUT=m CONFIG_VIRTIO_BLK=y +CONFIG_VIRTIO_BLK_SCSI=y CONFIG_VIRTIO_CONSOLE=m CONFIG_VIRTIO_VSOCKETS=m CONFIG_VIRTIO_MMIO=y @@ -21,6 +22,7 @@ CONFIG_HW_RANDOM_VIRTIO=y CONFIG_SCSI_LOWLEVEL=y CONFIG_USB_XHCI_HCD=y +CONFIG_BLK_DEV_NVME=y CONFIG_PARAVIRT=y CONFIG_PARAVIRT_SPINLOCKS=y diff --git a/buildroot-external/configs/intel_nuc_defconfig b/buildroot-external/configs/intel_nuc_defconfig index e39d495cb..9581ec628 100644 --- a/buildroot-external/configs/intel_nuc_defconfig +++ b/buildroot-external/configs/intel_nuc_defconfig @@ -89,7 +89,7 @@ BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_BAREBOX=y BR2_TARGET_BAREBOX_CUSTOM_VERSION=y -BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE="2018.05.0" +BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE="2020.04.0" BR2_TARGET_BAREBOX_USE_CUSTOM_CONFIG=y BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/intel/barebox.config" BR2_TARGET_BAREBOX_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/barebox.config" diff --git a/buildroot-external/configs/ova_defconfig b/buildroot-external/configs/ova_defconfig index baeb1eb33..50fa11983 100644 --- a/buildroot-external/configs/ova_defconfig +++ b/buildroot-external/configs/ova_defconfig @@ -80,7 +80,7 @@ BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_BAREBOX=y BR2_TARGET_BAREBOX_CUSTOM_VERSION=y -BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE="2018.05.0" +BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE="2020.04.0" BR2_TARGET_BAREBOX_USE_CUSTOM_CONFIG=y BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/intel/barebox.config" BR2_TARGET_BAREBOX_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/barebox.config"