From a5fa0a06b07fdb0763ed041680f8f7f250bd1ff3 Mon Sep 17 00:00:00 2001
From: Jackie Huang <jackie.huang@windriver.com>
Date: Sun, 26 Apr 2020 13:26:17 +0800
Subject: [PATCH] linux-yocto-stx: add hp server support for anaconda

- Add hp server support in kernel for anaconda installer image.

- In the build script, remove recipes-kernel from BBMASK
  so the added support will take effect.

Issue-ID: INF-35
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Change-Id: I04f424b874009b85022e3a5df6b95bd01d85a8e8
---
 meta-stx/recipes-kernel/linux/linux-yocto-stx.inc  |  3 +-
 .../linux/linux/stx-anaconda-kconfig.cfg           | 60 ++++++++++++++++++++++
 scripts/configs/local-anaconda.conf                |  1 -
 3 files changed, 62 insertions(+), 2 deletions(-)
 create mode 100644 meta-stx/recipes-kernel/linux/linux/stx-anaconda-kconfig.cfg

diff --git a/meta-stx/recipes-kernel/linux/linux-yocto-stx.inc b/meta-stx/recipes-kernel/linux/linux-yocto-stx.inc
index 4cdb355..3344dd9 100644
--- a/meta-stx/recipes-kernel/linux/linux-yocto-stx.inc
+++ b/meta-stx/recipes-kernel/linux/linux-yocto-stx.inc
@@ -15,7 +15,8 @@
 
 FILESEXTRAPATHS_append:= ":${THISDIR}/linux:"
 
-SRC_URI += "file://stx-kconfig.cfg"
+SRC_URI_append_poky-stx = " file://stx-kconfig.cfg"
+SRC_URI_append_anaconda = " file://stx-anaconda-kconfig.cfg"
 
 KERNEL_EXTRA_FEATURES_append = " \
     features/xfs/xfs.scc \
diff --git a/meta-stx/recipes-kernel/linux/linux/stx-anaconda-kconfig.cfg b/meta-stx/recipes-kernel/linux/linux/stx-anaconda-kconfig.cfg
new file mode 100644
index 0000000..d952a4c
--- /dev/null
+++ b/meta-stx/recipes-kernel/linux/linux/stx-anaconda-kconfig.cfg
@@ -0,0 +1,60 @@
+CONFIG_NF_TABLES=m
+CONFIG_NFT_COMPAT=m
+CONFIG_BLK_DEV_DRBD=m
+CONFIG_IXGBE=m
+CONFIG_IXGBE_HWMON=y
+CONFIG_IXGBE_DCA=y
+CONFIG_IXGBEVF=m
+CONFIG_FPGA=y
+
+# Support for iscsi
+CONFIG_BE2ISCSI=m
+CONFIG_ISCSI_BOOT_SYSFS=m
+CONFIG_ISCSI_IBFT=m
+CONFIG_ISCSI_IBFT_FIND=y
+CONFIG_ISCSI_TARGET=m
+CONFIG_ISCSI_TCP=y
+CONFIG_QED_ISCSI=y
+CONFIG_SCSI_BNX2_ISCSI=m
+CONFIG_SCSI_BNX2X_FCOE=m
+CONFIG_SCSI_ISCSI_ATTRS=y
+CONFIG_SCSI_QLA_ISCSI=m
+
+# for HP Smart Array
+CONFIG_SCSI_HPSA=y
+
+# for Broadcom Tigon3 and bcm 8517
+CONFIG_TIGON3=y
+CONFIG_TIGON3_HWMON=y
+
+# for Emulex Blade Engine
+CONFIG_BE2NET=m
+
+# config fragments for Broadcom NetExtremeII
+CONFIG_BNX2=m
+CONFIG_BNX2X=m
+
+# config fragment for HP misc
+CONFIG_HP_ILO=y
+CONFIG_HP_WATCHDOG=y
+
+# config fragment for Intel C600 SAS controller
+CONFIG_SCSI_ISCI=y
+
+# config fragment for Emulex LightPulse Family of Fibre Channel PCI host adapters
+CONFIG_SCSI_LPFC=m
+
+# config fragments for Mellanox ethernet support
+CONFIG_MLX4_EN=m
+CONFIG_MLX4_EN_DCB=y
+CONFIG_MLX4_CORE=m
+
+# config fragment for LSI SAS controllers
+CONFIG_SCSI_MPT2SAS=m
+CONFIG_SCSI_MPT2SAS_MAX_SGE=128
+CONFIG_SCSI_MPT3SAS=m
+CONFIG_SCSI_MPT3SAS_MAX_SGE=128
+
+# config fragment for QLogic storage and NIC adapters
+CONFIG_SCSI_QLA_FC=m
+CONFIG_QLA3XXX=m
diff --git a/scripts/configs/local-anaconda.conf b/scripts/configs/local-anaconda.conf
index f76695a..d9c183a 100644
--- a/scripts/configs/local-anaconda.conf
+++ b/scripts/configs/local-anaconda.conf
@@ -32,7 +32,6 @@ BBMASK += " \
     /meta-stx/recipes-extended \
     /meta-stx/recipes-graphics \
     /meta-stx/recipes-httpd \
-    /meta-stx/recipes-kernel \
     /meta-stx/recipes-networking \
     /meta-stx/recipes-security \
     /meta-stx/recipes-support \
-- 
2.16.6