Update to internal 6-6-19

Signed-off-by: Ed Tanous <ed.tanous@intel.com>

6 files changed, 8 insertions, 57 deletions

diff --git a/meta-openbmc-mods/meta-wolfpass/conf/bblayers.conf.sample b/meta-openbmc-mods/meta-wolfpass/conf/bblayers.conf.sample
index 12d9af86b..f3a4bc513 100644
--- a/meta-openbmc-mods/meta-wolfpass/conf/bblayers.conf.sample
+++ b/meta-openbmc-mods/meta-wolfpass/conf/bblayers.conf.sample
@@ -19,6 +19,7 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-intel \
   ##OEROOT##/meta-openbmc-mods/meta-common \
   ##OEROOT##/meta-openbmc-mods/meta-common-small \
+  ##OEROOT##/meta-openbmc-mods/meta-ast2500 \
   ##OEROOT##/meta-openbmc-mods/meta-wolfpass \
   ##OEROOT##/meta-security \
   "
diff --git a/meta-openbmc-mods/meta-wolfpass/conf/layer.conf b/meta-openbmc-mods/meta-wolfpass/conf/layer.conf
index 2d85bfdce..711850f6d 100644
--- a/meta-openbmc-mods/meta-wolfpass/conf/layer.conf
+++ b/meta-openbmc-mods/meta-wolfpass/conf/layer.conf
@@ -8,5 +8,7 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "wolfpass"
 BBFILE_PATTERN_wolfpass = ""
-BBFILE_PRIORITY_wolfpass = "6"
+BBFILE_PRIORITY_wolfpass = "7"
 LAYERSERIES_COMPAT_wolfpass = "warrior"
+
+PRODUCT_GENERATION_pn-os-release = "prl"
diff --git a/meta-openbmc-mods/meta-wolfpass/conf/local.conf.sample b/meta-openbmc-mods/meta-wolfpass/conf/local.conf.sample
index d39fb371c..49ffc117f 100644
--- a/meta-openbmc-mods/meta-wolfpass/conf/local.conf.sample
+++ b/meta-openbmc-mods/meta-wolfpass/conf/local.conf.sample
@@ -1,4 +1,4 @@
-MACHINE ??= "wolfpass"
+MACHINE ??= "intel-ast2500"
 #DL_DIR ?= "/~YoctoDownloads"
 #SSTATE_DIR ?= "/~YoctoSstate-cache"
 DISTRO ?= "openbmc-phosphor"
@@ -17,9 +17,6 @@ BB_DISKMON_DIRS = "\
     ABORT,${SSTATE_DIR},100M,1K \
     ABORT,/tmp,10M,1K"
 CONF_VERSION = "3"
-INHERIT += "extrausers"
-
-EXTRA_USERS_PARAMS_append_pn-intel-platforms = " \
-  usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \
-  "
 #BB_NUMBER_THREADS = "70"
+
+#INHERIT += "cve-check"
diff --git a/meta-openbmc-mods/meta-wolfpass/conf/machine/include/obmc-bsp-si-common.inc b/meta-openbmc-mods/meta-wolfpass/conf/machine/include/obmc-bsp-si-common.inc
deleted file mode 100644
index 24ec3113b..000000000
--- a/meta-openbmc-mods/meta-wolfpass/conf/machine/include/obmc-bsp-si-common.inc
+++ /dev/null
@@ -1,31 +0,0 @@
-#@TYPE: Machine
-#@NAME: OpenBMC
-#@DESCRIPTION: Common machine configuration for OpenBMC chips
-
-MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
-EXTRA_IMAGEDEPENDS += "u-boot"
-
-IMAGE_FSTYPES += "squashfs-xz"
-IMAGE_FSTYPES += "mtd-auto"
-INITRAMFS_FSTYPES = "squashfs-xz"
-EXTRA_IMAGECMD_squashfs-xz_append = "-processors ${BB_NUMBER_THREADS} -b 262144 -Xdict-size 100% -Xbcj arm"
-
-KERNEL_CLASSES ?= "kernel-fitimage"
-KERNEL_IMAGETYPES ?= "fitImage"
-KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
-
-UBOOT_SUFFIX ?= "bin"
-
-MACHINEOVERRIDES =. "openbmc:"
-
-OBMC_PHOSPHOR_IMAGE_OVERLAY= "1"
-OBMC_IMAGE_EXTRA_INSTALL_append = " u-boot-fw-utils-aspeed"
-
-IMAGE_CLASSES += "image_types image_types_phosphor_auto"
-
-INITRAMFS_CTYPE ?= "lzma"
-INITRAMFS_IMAGE = "obmc-phosphor-initramfs"
-
-MACHINE_FEATURES_BACKFILL_CONSIDERED = "qemu-usermode"
-
-KERNEL_IMAGETYPES += "zImage"
diff --git a/meta-openbmc-mods/meta-wolfpass/conf/machine/intel-ast2500.conf b/meta-openbmc-mods/meta-wolfpass/conf/machine/intel-ast2500.conf
new file mode 100644
index 000000000..907b9f1e1
--- /dev/null
+++ b/meta-openbmc-mods/meta-wolfpass/conf/machine/intel-ast2500.conf
@@ -0,0 +1 @@
+require conf/machine/include/intel-ast2500.inc
diff --git a/meta-openbmc-mods/meta-wolfpass/conf/machine/wolfpass.conf b/meta-openbmc-mods/meta-wolfpass/conf/machine/wolfpass.conf
deleted file mode 100644
index cc9e30495..000000000
--- a/meta-openbmc-mods/meta-wolfpass/conf/machine/wolfpass.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-KMACHINE = "aspeed"
-KERNEL_DEVICETREE = "${KMACHINE}-bmc-intel-purley.dtb"
-
-require conf/machine/include/ast2500.inc
-require conf/machine/include/obmc-bsp-si-common.inc
-require conf/machine/include/intel.inc
-require conf/distro/include/phosphor-tiny.inc
-
-UBOOT_MACHINE = "ast_g5_phy_config"
-
-#Developer to specify the appropriate IMAGE_TYPE and FLASH_SIZE
-#On Intel Whitley platforms PFR feature requires 128MB flash, default is 64MB
-#IMAGE_TYPE = "default" or "pfr" or "non-pfr"
-# "non-pfr" setting for future which is for BMC secure boot
-#for PFR its 128MB in KBs - 128*1024=131072, for non-pfr its 64MB= 64*1024 = 65536
-#pfr IMAGE_TYPE enforces the image signature verification during the image update
-IMAGE_TYPE = "default"
-
-VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config"