Merge pull request #111 from wghoffa/sim_tool_update
Create Sim Debug Tarball for Hostboot Package
diff --git a/openpower/package/hostboot-p10/Config.in b/openpower/package/hostboot-p10/Config.in
index 028ad8e..0fee8a3 100644
--- a/openpower/package/hostboot-p10/Config.in
+++ b/openpower/package/hostboot-p10/Config.in
@@ -25,7 +25,7 @@
config BR2_HOSTBOOT_P10_VERSION
string
- default "8ceaa759ec04caf75dca08aab458b1a7f236f302" if BR2_HOSTBOOT_P10_LATEST_VERSION
+ default "6bcf4ba0396cc590c5c2b353e64d7372de499c41" if BR2_HOSTBOOT_P10_LATEST_VERSION
default BR2_HOSTBOOT_P10_CUSTOM_VERSION_VALUE \
if BR2_HOSTBOOT_P10_CUSTOM_VERSION
diff --git a/openpower/package/hostboot-p10/hostboot-p10.mk b/openpower/package/hostboot-p10/hostboot-p10.mk
index c8e49d8..9a766a2 100644
--- a/openpower/package/hostboot-p10/hostboot-p10.mk
+++ b/openpower/package/hostboot-p10/hostboot-p10.mk
@@ -13,7 +13,7 @@
HOSTBOOT_P10_LICENSE = Apache-2.0
HOSTBOOT_P10_LICENSE_FILES = LICENSE
-HOSTBOOT_P10_DEPENDENCIES = host-binutils
+HOSTBOOT_P10_DEPENDENCIES = host-binutils fsp-trace
HOSTBOOT_P10_INSTALL_IMAGES = YES
HOSTBOOT_P10_INSTALL_TARGET = NO
@@ -23,6 +23,8 @@
OPENPOWER_BUILD=1 CROSS_PREFIX="$(CCACHE) $(TARGET_CROSS)" HOST_PREFIX="" HOST_BINUTILS_DIR=$(HOST_BINUTILS_DIR) \
HOSTBOOT_VERSION=`cat $(HOSTBOOT_P10_VERSION_FILE)`
+FSP_TRACE_IMAGES_DIR = $(STAGING_DIR)/fsp-trace/
+
# TODO: WORKAROUND: Currently the git clone causes a bad symlink
# to be created for src/include/usr/tracinterface.H; so delete it and rebuild it
# manually
@@ -32,6 +34,10 @@
define HOSTBOOT_P10_INSTALL_IMAGES_CMDS
cd $(@D) && $(HOSTBOOT_P10_ENV_VARS) source ./env.bash && $(@D)/src/build/tools/hbDistribute --openpower $(STAGING_DIR)/hostboot_build_images/
+ cd $(@D) && $(HOSTBOOT_P10_ENV_VARS) source ./env.bash && $(@D)/src/build/tools/hbDistribute --openpower-sim $(STAGING_DIR)/hostboot_sim_data/
+ cp $(FSP_TRACE_IMAGES_DIR)/fsp-trace $(STAGING_DIR)/hostboot_sim_data/
+ mkdir -p $(OUTPUT_IMAGES_DIR)/sim/
+ tar -zcvf $(OUTPUT_IMAGES_DIR)/sim/hostboot_sim.tar -C $(STAGING_DIR)/hostboot_sim_data/ .
endef
$(eval $(generic-package))