Skip to content

Commit

Permalink
Automatically include config.h
Browse files Browse the repository at this point in the history 
Rather than having to remember to include config.h anywhere
we reference a CONFIG variable (and usually forgetting),
this adds it to the default compiler flags so that it
gets included in every source file we build.

Change-Id: I53622ab4d46c55d942e98cae6ec03049fd5b3d08
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/87475
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Zachary Clark <zach@ibm.com>
Reviewed-by: Roland Veloz <rveloz@us.ibm.com>
Reviewed-by: Christian R Geddes <crgeddes@us.ibm.com>
Reviewed-by: Nicholas E Bofferding <bofferdn@us.ibm.com>
  • Loading branch information
@dcrowell77
dcrowell77 authored and Nicholas E Bofferding committed Dec 6, 2019
1 parent b284071 commit c46f1ee
Show file tree
Hide file tree
Showing 173 changed files with 90 additions and 261 deletions.
1 change: 0 additions & 1 deletion src/bootloader/bootloader.C
View file
Expand Up @@ -46,7 +46,6 @@
#include <limits.h>

#include <securerom/ROM.H>
#include <config.h>
#include <secureboot/secure_reasoncodes.H>
#include <p9_sbe_hb_structures.H>

Expand Down
2 changes: 2 additions & 0 deletions src/build/mkrules/cflags.env.mk
View file
Expand Up @@ -38,6 +38,8 @@ CFLAGS += -DNO_INITIALIZER_LIST
CFLAGS += -D__FAPI
endif

# Force all files to pull in the CONFIG_ variables
CFLAGS += -include config.h

COMMONFLAGS += $(OPT_LEVEL) -nostdlib
CFLAGS += $(COMMONFLAGS) -mcpu=power7 -nostdinc -g -mno-vsx -mno-altivec\
Expand Down
3 changes: 1 addition & 2 deletions src/include/kernel/ptmgr.H
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2011,2015 */
/* Contributors Listed Below - COPYRIGHT 2011,2019 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand All @@ -28,7 +28,6 @@
#include <stdint.h>
#include <util/lockfree/stack.H>
#include <kernel/vmmmgr.H>
#include <config.h>

/**
* @class PageTableManager
Expand Down
4 changes: 2 additions & 2 deletions src/include/usr/console/consoleif.H
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2014,2017 */
/* Contributors Listed Below - COPYRIGHT 2014,2019 */
/* [+] Google Inc. */
/* [+] International Business Machines Corp. */
/* */
Expand All @@ -26,8 +26,8 @@
#ifndef __CONSOLE_CONSOLEIF_H
#define __CONSOLE_CONSOLEIF_H

#include <config.h>
#include <stdarg.h>
#include <stddef.h>

namespace CONSOLE
{
Expand Down
3 changes: 1 addition & 2 deletions src/include/usr/console/uartif.H
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2016 */
/* Contributors Listed Below - COPYRIGHT 2016,2019 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand All @@ -25,7 +25,6 @@
#ifndef __CONSOLE_UARTIF_H
#define __CONSOLE_UARTIF_H

#include <config.h>
#include <stdarg.h>

namespace CONSOLE
Expand Down
3 changes: 1 addition & 2 deletions src/include/usr/diag/attn/attn.H
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2012,2015 */
/* Contributors Listed Below - COPYRIGHT 2012,2019 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -34,7 +34,6 @@
#include <errl/errlentry.H>

// Custom compile configs
#include <config.h>

namespace ATTN
{
Expand Down
1 change: 0 additions & 1 deletion src/include/usr/diag/prdf/prdfMain_ipl.H
View file
Expand Up @@ -27,7 +27,6 @@
#define __prdfMain_ipl_H

// Custom compile configs
#include <config.h>

/**
* @file prdfMain_ipl.H
Expand Down
1 change: 0 additions & 1 deletion src/include/usr/errl/errlmanager.H
View file
Expand Up @@ -35,7 +35,6 @@
/*****************************************************************************/
// I n c l u d e s
/*****************************************************************************/
#include <config.h>
#include <util/singleton.H>
#include <errl/errlentry.H>
#include <errldisplay/errldisplay.H>
Expand Down
3 changes: 1 addition & 2 deletions src/include/usr/errldisplay/errldisplay.H
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2013,2017 */
/* Contributors Listed Below - COPYRIGHT 2013,2019 */
/* [+] Google Inc. */
/* [+] International Business Machines Corp. */
/* */
Expand Down Expand Up @@ -35,7 +35,6 @@
/*****************************************************************************/
// I n c l u d e s
/*****************************************************************************/
#include <config.h>
#include <errl/errlentry.H>

namespace ERRORLOGDISPLAY
Expand Down
1 change: 0 additions & 1 deletion src/include/usr/fapi2/attribute_service.H
View file
Expand Up @@ -49,7 +49,6 @@
#include <devicefw/driverif.H>
#include <plat_attr_override_sync.H>
#include <vpd/spdenums.H>
#include <config.h>

//******************************************************************************
// Interface
Expand Down
3 changes: 1 addition & 2 deletions src/include/usr/fapi2/fapiPlatTrace.H
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2011,2016 */
/* Contributors Listed Below - COPYRIGHT 2011,2019 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -40,7 +40,6 @@

#include <stdio.h>
#include <trace/interface.H>
#include <config.h>

//******************************************************************************
// Trace buffer names
Expand Down
1 change: 0 additions & 1 deletion src/include/usr/hwas/hwasPlat.H
View file
Expand Up @@ -25,7 +25,6 @@
#ifndef __HWAS_PLAT_H
#define __HWAS_PLAT_H

#include <config.h>

/**
* @file hwas/hwasPlat.H
Expand Down
3 changes: 1 addition & 2 deletions src/include/usr/isteps/istep09list.H
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2012,2018 */
/* Contributors Listed Below - COPYRIGHT 2012,2019 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -58,7 +58,6 @@
#include <initservice/initsvcreasoncodes.H>

// include prototypes file
#include <config.h>

namespace ISTEP_09
{
Expand Down
1 change: 0 additions & 1 deletion src/include/usr/isteps/istep10list.H
View file
Expand Up @@ -68,7 +68,6 @@
#include <initservice/initsvcreasoncodes.H>

// include prototypes file
#include <config.h>

namespace ISTEP_10
{
Expand Down
3 changes: 1 addition & 2 deletions src/include/usr/isteps/istep11list.H
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2012,2018 */
/* Contributors Listed Below - COPYRIGHT 2012,2019 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -74,7 +74,6 @@
#include <initservice/initsvcreasoncodes.H>

// include prototypes file
#include <config.h>

namespace ISTEP_11
{
Expand Down
1 change: 0 additions & 1 deletion src/include/usr/isteps/istep12list.H
View file
Expand Up @@ -69,7 +69,6 @@

// include prototypes file

#include <config.h>

namespace ISTEP_12
{
Expand Down
1 change: 0 additions & 1 deletion src/include/usr/isteps/istep13list.H
View file
Expand Up @@ -69,7 +69,6 @@
#include <initservice/initsvcreasoncodes.H>

// include prototypes file
#include <config.h>

namespace ISTEP_13
{
Expand Down
1 change: 0 additions & 1 deletion src/include/usr/isteps/istep14list.H
View file
Expand Up @@ -55,7 +55,6 @@

#include <initservice/initsvcstructs.H>
#include <initservice/initsvcreasoncodes.H>
#include <config.h>

namespace ISTEP_14
{
Expand Down
1 change: 0 additions & 1 deletion src/include/usr/isteps/istep15list.H
View file
Expand Up @@ -47,7 +47,6 @@

#include <initservice/initsvcstructs.H>
#include <initservice/initsvcreasoncodes.H>
#include <config.h>

namespace ISTEP_15
{
Expand Down
3 changes: 1 addition & 2 deletions src/include/usr/isteps/pm/occAccess.H
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2014,2017 */
/* Contributors Listed Below - COPYRIGHT 2014,2019 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand All @@ -25,7 +25,6 @@
#ifndef OCCACCESS_H_
#define OCCACCESS_H_

#include <config.h>
#include <errl/errlentry.H>
#include <targeting/common/commontargeting.H>

Expand Down
3 changes: 1 addition & 2 deletions src/include/usr/isteps/spless_255list.H
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2012,2017 */
/* Contributors Listed Below - COPYRIGHT 2012,2019 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -38,7 +38,6 @@

#include <initservice/initsvcstructs.H>
#include <initservice/initsvcreasoncodes.H>
#include <config.h>


/**
Expand Down
1 change: 0 additions & 1 deletion src/include/usr/pnor/pnor_const.H
View file
Expand Up @@ -27,7 +27,6 @@

#include <stdint.h>
#include <builtins.h>
#include <config.h>

namespace PNOR
{
Expand Down
1 change: 0 additions & 1 deletion src/include/usr/pnor/pnorif.H
View file
Expand Up @@ -31,7 +31,6 @@
#include <pnor/pnor_const.H>
#include <errl/errlentry.H>
#include <utility>
#include <config.h>

namespace PNOR
{
Expand Down
3 changes: 1 addition & 2 deletions src/include/usr/secureboot/drtm.H
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2013,2017 */
/* Contributors Listed Below - COPYRIGHT 2013,2019 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand All @@ -27,7 +27,6 @@
#define __SECUREBOOT_DRTM_H

#include <initservice/mboxRegs.H>
#include <config.h>
#include <errl/errlentry.H>
#include <errl/errlmanager.H>
#include <vector>
Expand Down
3 changes: 1 addition & 2 deletions src/include/usr/secureboot/nodecommif.H
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2018 */
/* Contributors Listed Below - COPYRIGHT 2018,2019 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand All @@ -26,7 +26,6 @@
#define __NODECOMMIF_H

#include <initservice/mboxRegs.H>
#include <config.h>
#include <errl/errlentry.H>

namespace SECUREBOOT
Expand Down
3 changes: 1 addition & 2 deletions src/include/usr/secureboot/service.H
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2013,2018 */
/* Contributors Listed Below - COPYRIGHT 2013,2019 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand All @@ -26,7 +26,6 @@
#define __SECUREBOOT_SERVICE_H

#include <errl/errlentry.H>
#include <config.h>
#include <secureboot/settings.H>
#include <utility>
#include <cstdint>
Expand Down
1 change: 0 additions & 1 deletion src/include/usr/secureboot/trustedbootif.H
View file
Expand Up @@ -41,7 +41,6 @@
#include <secureboot/containerheader.H>
#include <targeting/common/commontargeting.H>
#include <targeting/common/utilFilter.H>
#include <config.h>

namespace TRUSTEDBOOT
{
Expand Down
3 changes: 1 addition & 2 deletions src/include/usr/targeting/common/trace.H
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2012,2014 */
/* Contributors Listed Below - COPYRIGHT 2012,2019 */
/* [+] Google Inc. */
/* [+] International Business Machines Corp. */
/* */
Expand Down Expand Up @@ -41,7 +41,6 @@
// Other includes
#include <targeting/adapters/traceadapter.H>
#ifdef __HOSTBOOT_MODULE
#include <config.h>
#endif

#define TARG_LOC TARG_NAMESPACE TARG_CLASS TARG_FN ": "
Expand Down
1 change: 0 additions & 1 deletion src/include/usr/vmmconst.h
View file
Expand Up @@ -31,7 +31,6 @@
*/

#include <limits.h>
#include <config.h>

/**
* Segments
Expand Down
3 changes: 1 addition & 2 deletions src/kernel/heapmgr.C
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2010,2018 */
/* Contributors Listed Below - COPYRIGHT 2010,2019 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand All @@ -31,7 +31,6 @@
#include <util/align.H>
#include <arch/ppc.H>
#include <usr/debugpointers.H>
#include <config.h>

#ifdef HOSTBOOT_DEBUG
#define SMALL_HEAP_PAGES_TRACKED 64
Expand Down
3 changes: 1 addition & 2 deletions src/kernel/vmmmgr.C
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2010,2017 */
/* Contributors Listed Below - COPYRIGHT 2010,2019 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand All @@ -32,7 +32,6 @@
#include <kernel/basesegment.H>
#include <kernel/stacksegment.H>
#include <kernel/devicesegment.H>
#include <config.h>
#include <kernel/bltohbdatamgr.H>
#include <util/align.H>

Expand Down

0 comments on commit c46f1ee

Please sign in to comment.