From 12fc8ef895f12e18287355e0b2e8dc7d1363cd28 Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi@debian.org>
Date: Thu, 18 Jan 2018 12:57:14 +0100
Subject: [PATCH] cloud-amd64: Support Amazon EC2

---
 debian/changelog                       |  2 ++
 debian/config/amd64/config.cloud-amd64 | 17 +++++++++++++++--
 debian/config/amd64/defines            |  2 +-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 46b0e590c..9627b887b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 linux (4.15~rc8-1~exp2) UNRELEASED; urgency=medium
 
   * Add cloud-amd64 kernel flavour.
+    - Support Microsoft Azure.
+    - Support Amazon EC2.
 
  -- Bastian Blank <waldi@debian.org>  Thu, 18 Jan 2018 09:14:57 +0100
 
diff --git a/debian/config/amd64/config.cloud-amd64 b/debian/config/amd64/config.cloud-amd64
index dad3e8890..6e011d72b 100644
--- a/debian/config/amd64/config.cloud-amd64
+++ b/debian/config/amd64/config.cloud-amd64
@@ -155,6 +155,7 @@ CONFIG_ATA_PIIX=m
 # CONFIG_BLK_DEV_SKD is not set
 # CONFIG_BLK_DEV_SX8 is not set
 # CONFIG_CDROM_PKTCDVD is not set
+CONFIG_XEN_BLKDEV_FRONTEND=m
 # CONFIG_BLK_DEV_RSXX is not set
 
 ##
@@ -370,7 +371,7 @@ CONFIG_HYPERV=y
 # CONFIG_SERIO_SERPORT is not set
 # CONFIG_SERIO_CT82C710 is not set
 # CONFIG_SERIO_PCIPS2 is not set
-# CONFIG_SERIO_RAW is not set
+CONFIG_SERIO_RAW=m
 # CONFIG_SERIO_ALTERA_PS2 is not set
 CONFIG_HYPERV_KEYBOARD=y
 
@@ -512,6 +513,7 @@ CONFIG_HYPERV_KEYBOARD=y
 ## file: drivers/net/Kconfig
 ##
 # CONFIG_NET_SB1000 is not set
+CONFIG_XEN_NETDEV_FRONTEND=m
 # CONFIG_FUJITSU_ES is not set
 
 ##
@@ -644,7 +646,18 @@ CONFIG_HYPERV_KEYBOARD=y
 ##
 ## file: drivers/net/ethernet/intel/Kconfig
 ##
-# CONFIG_NET_VENDOR_INTEL is not set
+CONFIG_NET_VENDOR_INTEL=y
+# CONFIG_E100 is not set
+# CONFIG_E1000 is not set
+# CONFIG_E1000E is not set
+# CONFIG_IGB is not set
+# CONFIG_IGBVF is not set
+# CONFIG_IXGB is not set
+# CONFIG_IXGBE is not set
+#. Amazon EC2 uses Intel Corporation 82599 Ethernet Controller Virtual Function
+CONFIG_IXGBEVF=m
+# CONFIG_I40E is not set
+# CONFIG_I40EVF is not set
 
 ##
 ## file: drivers/net/ethernet/marvell/Kconfig
diff --git a/debian/config/amd64/defines b/debian/config/amd64/defines
index 08cb70803..bbe749dec 100644
--- a/debian/config/amd64/defines
+++ b/debian/config/amd64/defines
@@ -23,4 +23,4 @@ hardware-long: PCs with AMD64, Intel 64 or VIA Nano processors
 
 [cloud-amd64_description]
 hardware: x86-64 cloud
-hardware-long: Microsoft Azure cloud platform
+hardware-long: Amazon EC2 and Microsoft Azure cloud platforms