diff options
| author | Ed Tanous <ed.tanous@intel.com> | 2019-06-06 19:43:20 +0300 |
|---|---|---|
| committer | Ed Tanous <ed.tanous@intel.com> | 2019-06-07 00:20:52 +0300 |
| commit | 10bc2ef852277cf8e9858f75cea9f55b482bf85b (patch) | |
| tree | 6d29c0a7edc3769c9fbba0a3c6f6ed9ba10ba8ed /meta-openbmc-mods/meta-wolfpass/conf/machine | |
| parent | 9087065ce8c9f13d6450293c15101a3db5fe6f49 (diff) | |
| download | openbmc-10bc2ef852277cf8e9858f75cea9f55b482bf85b.tar.xz | |
Update to internal 6-6-19
Signed-off-by: Ed Tanous <ed.tanous@intel.com>
Diffstat (limited to 'meta-openbmc-mods/meta-wolfpass/conf/machine')
3 files changed, 1 insertions, 50 deletions
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" |