diff options
| author | Sachin Gupta <sgupta2m@in.ibm.com> | 2014-12-17 05:00:43 -0600 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2015-01-16 13:36:55 -0600 |
| commit | f2680e6637e324f2619500a6870e7e23265319a4 (patch) | |
| tree | 11470218647e52f4cb3b7c6ff5c98c03adc047c0 | |
| parent | c068f50829ec46e4e5b056064dcbe9d786d549a4 (diff) | |
| download | talos-hostboot-f2680e6637e324f2619500a6870e7e23265319a4.tar.gz talos-hostboot-f2680e6637e324f2619500a6870e7e23265319a4.zip | |
PRD: Enable support for UtilFile and prf files for HBRT
Change-Id: I91f8157db632b6088fe64b28bf42f993d16e8b44
RTC: 119022
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/14944
Tested-by: Jenkins Server
Reviewed-by: Zane Shelley <zshelle@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: Christopher T. Phan <cphan@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
| -rw-r--r-- | src/include/sys/vfs.h | 2 | ||||
| -rw-r--r-- | src/makefile | 1 | ||||
| -rwxr-xr-x | src/usr/diag/prdf/common/framework/rule/prdrLoadChipCache.C | 8 |
3 files changed, 3 insertions, 8 deletions
diff --git a/src/include/sys/vfs.h b/src/include/sys/vfs.h index 20ed3c4d6..0d496243f 100644 --- a/src/include/sys/vfs.h +++ b/src/include/sys/vfs.h @@ -36,7 +36,7 @@ // make VFS_MODULE_MAX equal to the actual number of modules in the base image (+ 2?) #define VFS_MODULE_MAX 16 #else -#define VFS_MODULE_MAX 32 +#define VFS_MODULE_MAX 64 #endif // Extended use 4 4k pages diff --git a/src/makefile b/src/makefile index 3011faf77..3b073c368 100644 --- a/src/makefile +++ b/src/makefile @@ -302,6 +302,7 @@ hbirt_OBJECTS += ${RUNTIME_OBJECTS} hbirt_OBJECTS += ${BASE_OBJECTS} hbirt_MODULES += ${RUNTIME_MODULES} hbirt_DATA_MODULES += ${RUNTIME_DATA_MODULES} +hbirt_DATA_MODULES += ${prd_rule_prf_targets} hbirt_LDFLAGS = ${RELOCATABLE_IMAGE_LDFLAGS} hbirt_test_OBJECTS += ${hbirt_OBJECTS} diff --git a/src/usr/diag/prdf/common/framework/rule/prdrLoadChipCache.C b/src/usr/diag/prdf/common/framework/rule/prdrLoadChipCache.C index 5bf4855c3..1a1859f3f 100755 --- a/src/usr/diag/prdf/common/framework/rule/prdrLoadChipCache.C +++ b/src/usr/diag/prdf/common/framework/rule/prdrLoadChipCache.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2012,2015 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -99,8 +99,6 @@ namespace Prdr strncat( filePath, ext, sz_ext ); #ifdef __HOSTBOOT_MODULE - // TODO: RTC 119022 remove after UtilFile is supported in HBRT - #ifndef __HOSTBOOT_RUNTIME UtilFile l_ruleFile( filePath ); if ( !l_ruleFile.exists() ) @@ -113,7 +111,6 @@ namespace Prdr l_ruleFile.Open("r"); } - #endif #else // not __HOSTBOOT_MODULE // Read the correct directory path for flash. @@ -154,11 +151,8 @@ namespace Prdr #endif // end __HOSTBOOT_MODULE - // TODO: RTC 119022 remove after UtilFile is supported in HBRT - #ifndef __HOSTBOOT_RUNTIME // Load chip object. l_errl = LoadChip(l_ruleFile, *(*o_chip)); - #endif } while (0); |
