From d0f63ef62c76c932a2003eaa42c0b250065ae06f Mon Sep 17 00:00:00 2001 From: Ed Tanous Date: Wed, 31 Jul 2019 10:43:37 -0700 Subject: Update to internal 7-31-19 Signed-off-by: Ed Tanous --- .../meta-ast2500/conf/machine/include/intel-ast2500.inc | 10 ++-------- .../meta-ast2500/conf/machine/include/obmc-bsp-si-common.inc | 11 ++++++++++- 2 files changed, 12 insertions(+), 9 deletions(-) (limited to 'meta-openbmc-mods/meta-ast2500/conf/machine/include') diff --git a/meta-openbmc-mods/meta-ast2500/conf/machine/include/intel-ast2500.inc b/meta-openbmc-mods/meta-ast2500/conf/machine/include/intel-ast2500.inc index cc9e30495..1bbd64381 100644 --- a/meta-openbmc-mods/meta-ast2500/conf/machine/include/intel-ast2500.inc +++ b/meta-openbmc-mods/meta-ast2500/conf/machine/include/intel-ast2500.inc @@ -8,12 +8,6 @@ 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" + +IMAGE_CLASSES += "${@bb.utils.contains('IMAGE_FSTYPES', 'intel-pfr', 'image_types_intel_pfr', '', d)}" diff --git a/meta-openbmc-mods/meta-ast2500/conf/machine/include/obmc-bsp-si-common.inc b/meta-openbmc-mods/meta-ast2500/conf/machine/include/obmc-bsp-si-common.inc index 24ec3113b..f4f8a7b9f 100644 --- a/meta-openbmc-mods/meta-ast2500/conf/machine/include/obmc-bsp-si-common.inc +++ b/meta-openbmc-mods/meta-ast2500/conf/machine/include/obmc-bsp-si-common.inc @@ -21,7 +21,7 @@ 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" +IMAGE_CLASSES += "image_types image_types_phosphor_auto qemuboot" INITRAMFS_CTYPE ?= "lzma" INITRAMFS_IMAGE = "obmc-phosphor-initramfs" @@ -29,3 +29,12 @@ INITRAMFS_IMAGE = "obmc-phosphor-initramfs" MACHINE_FEATURES_BACKFILL_CONSIDERED = "qemu-usermode" KERNEL_IMAGETYPES += "zImage" + +# runqemu +QB_SYSTEM_NAME = "qemu-system-arm" +QB_DEFAULT_FSTYPE = "mtd" +QB_ROOTFS_OPT = "-drive file=@ROOTFS@,format=raw,if=mtd" +QB_MACHINE = "-M intel-ast2500" +QB_OPT_APPEND += " -nographic" +QB_NETWORK_DEVICE = "-net nic,macaddr=C0:FF:EE:00:00:02,model=ftgmac100" +QB_DEFAULT_KERNEL = "none" -- cgit v1.2.3