Merge commit 'c9aa12187dba943595a728ed23cd2c5ec54470df' into master
Updating cros-sdk to version 13729.0.0
BUG=b/177232752
TEST=local build
RELEASE_NOTE=None
Signed-off-by: Robert Kolchmeyer <rkolchmeyer@google.com>
Change-Id: Ic0a53567d2fad25d7fa2f02fe76784c837103eee
diff --git a/PRESUBMIT.cfg b/PRESUBMIT.cfg
index bfd4996..4e43cea 100644
--- a/PRESUBMIT.cfg
+++ b/PRESUBMIT.cfg
@@ -12,6 +12,9 @@
# that live in this repository and are installed by packages.
long_line_check: false
+# Make sure RELEASE_NOTE field is present.
+release_note_field_check: true
+
[Hook Overrides Options]
# Ignore VERSION file and table file
cros_license_check:
diff --git a/eclass/cros-board.eclass b/eclass/cros-board.eclass
index c715fdf..a24e8cb 100644
--- a/eclass/cros-board.eclass
+++ b/eclass/cros-board.eclass
@@ -42,6 +42,7 @@
aplrvp
#app-shell-panther
aries
+ arion
arkham
arm-generic
#arm-generic_freon
@@ -109,6 +110,7 @@
cheza-freedreno
cheza64
cheza64-freedreno
+ chiron
#chronos
cid
clapper
diff --git a/eclass/cros-kernel2.eclass b/eclass/cros-kernel2.eclass
index e25f48f..2e3df8f 100644
--- a/eclass/cros-kernel2.eclass
+++ b/eclass/cros-kernel2.eclass
@@ -172,6 +172,7 @@
goldfish
highmem
hypervisor_guest
+ mellanox_eth
i2cdev
iioservice
irqsoff_tracer
@@ -229,6 +230,9 @@
wireless34
x32
xen_guest
+ hyperv_guest
+ ntfs_fs
+ cdrom
)
acpi_ac_desc="Enable ACPI AC"
@@ -430,6 +434,25 @@
CONFIG_VIRTIO_VSOCKETS=m
"
+mellanox_eth_desc="mellanox_eth"
+mellanox_eth_config="
+CONFIG_NET_VENDOR_MELLANOX=y
+CONFIG_MLX4_EN=m
+CONFIG_MLX4_CORE=m
+CONFIG_MLX4_DEBUG=y
+CONFIG_MLX4_CORE_GEN2=y
+CONFIG_MLX5_CORE=m
+# CONFIG_MLX5_FPGA is not set
+CONFIG_MLX5_CORE_EN=y
+CONFIG_MLX5_EN_ARFS=y
+CONFIG_MLX5_EN_RXNFC=y
+CONFIG_MLX5_MPFS=y
+# CONFIG_MLX5_CORE_IPOIB is not set
+# CONFIG_MLXSW_CORE is not set
+CONFIG_MLXFW=m
+"
+
+
i2cdev_desc="I2C device interface"
i2cdev_config="
CONFIG_I2C_CHARDEV=y
@@ -956,6 +979,31 @@
CONFIG_XEN_HAVE_VPMU=y
"
+hyperv_guest_desc="Microsoft Hyper-V guest support"
+hyperv_guest_config="
+CONFIG_HYPERV=y
+CONFIG_HYPERV_NET=y
+CONFIG_HYPERV_TSCPAGE=y
+CONFIG_HYPERV_KEYBOARD=y
+CONFIG_HYPERV_STORAGE=y
+CONFIG_HYPERV_BALLOON=y
+CONFIG_HYPERV_UTILS=y
+CONFIG_HYPERV_TIMER=y
+CONFIG_HYPERV_IOMMU=y
+CONFIG_FB_HYPERV=y
+CONFIG_PCI_HYPERV=y
+"
+
+ntfs_fs_desc="Microsoft NTFS support"
+ntfs_fs_config="
+CONFIG_NTFS_FS=m
+"
+
+cdrom_desc="CDROM support"
+cdrom_config="
+CONFIG_BLK_DEV_SR=y
+"
+
vtconsole_desc="VT console"
vtconsole_config="
CONFIG_VT=y
