the following patch was just integrated into master:
commit dafc2ca40dbd9223dfa16cf351f49d1d19b085ad
Author: Alexandru Gagniuc <mr.nuke.me(a)gmail.com>
Date: Sat Mar 29 13:01:11 2014 -0500
x86/Makefile: Allow addition of link libraries for rom/ramstage
This is useful, for example, when using stage-independent code, as it
allows us to compile that code only once. It's also useful for vendor
code which needs wonky compiler definitions and include paths which
we'd rather not include in the other files.
Subsequent patches will make use of this when lib-izing AGESA.
Change-Id: Ifb0c5d353bf09d23864270b9eefb6b75fd86e6cb
Signed-off-by: Alexandru Gagniuc <mr.nuke.me(a)gmail.com>
See http://review.coreboot.org/5425 for details.
-gerrit
Alexandru Gagniuc (mr.nuke.me(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5426
-gerrit
commit 8a024ea4bd89580df435103addff2237eb544cbd
Author: Alexandru Gagniuc <mr.nuke.me(a)gmail.com>
Date: Sat Mar 29 18:06:57 2014 -0500
cpu/amd/agesa/s3_resume.c: Specify include paths from AGESA_ROOT
Following the same reasoning as in commit
* 1d87dac hp/pavilion_m6_1035dx: Sanitize #includes
include AGESA files with a path relative to AGESA_ROOT. We cannot
with more than one generation of AGESA, hence the path being relative
to AGESA_ROOT.
Change-Id: If15c4cbfd42e0264264fdb3e8c426a47609ad41f
Signed-off-by: Alexandru Gagniuc <mr.nuke.me(a)gmail.com>
---
src/cpu/amd/agesa/s3_resume.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/cpu/amd/agesa/s3_resume.c b/src/cpu/amd/agesa/s3_resume.c
index 7b1157d..d51203e 100644
--- a/src/cpu/amd/agesa/s3_resume.c
+++ b/src/cpu/amd/agesa/s3_resume.c
@@ -17,8 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "AGESA.h"
-#include "amdlib.h"
+#include <AGESA.h>
+#include <Lib/amdlib.h>
#include <console/console.h>
#include <cpu/x86/msr.h>
#include <cpu/x86/mtrr.h>
Alexandru Gagniuc (mr.nuke.me(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5424
-gerrit
commit 4bf70b747a1a0702d239b1073b0c6cfca7b9c384
Author: Alexandru Gagniuc <mr.nuke.me(a)gmail.com>
Date: Sat Mar 29 16:52:46 2014 -0500
vendorcode/amd/agesa/fam15tn: Clean #includes in public headers
Right now, coreboot code using AGESA headers can only build if all the
AGESA path are given to the compiler via the "-I" option. This is sub-
optimal, as it requires us to have every AGESA source directory
specified as a compiler include path. This pollutes our global include
paths.
We restrict the compiler include paths to only allow "AGESA_ROOT/" and
"AGESA_ROOT/Include". We then modify the AGESA headers to specify
non-local include files relative to "AGESA_ROOT/Include".
We use the convention that includes relative to the directory of the
header are included as "path/to/header.h", while includes relative to
AGESA_ROOT are included as <path/to/header.h>.
This change allows building coreboot code based on AGESA with the
limited subset of include paths, but does not allow AGESA itself to
build with this restricted subset.
Change-Id: I31102273c8caa8d6b1d80774bfd35711825bec03
Signed-off-by: Alexandru Gagniuc <mr.nuke.me(a)gmail.com>
---
src/vendorcode/amd/agesa/f15tn/Include/OptionApmInstall.h | 2 +-
src/vendorcode/amd/agesa/f15tn/Include/OptionC6Install.h | 2 +-
src/vendorcode/amd/agesa/f15tn/Include/OptionCpbInstall.h | 2 +-
.../agesa/f15tn/Include/OptionCpuCacheFlushOnHaltInstall.h | 2 +-
src/vendorcode/amd/agesa/f15tn/Include/OptionDmiInstall.h | 2 +-
.../amd/agesa/f15tn/Include/OptionFamily15hInstall.h | 2 +-
src/vendorcode/amd/agesa/f15tn/Include/OptionFchInstall.h | 2 +-
src/vendorcode/amd/agesa/f15tn/Include/OptionGnbInstall.h | 10 +++++-----
src/vendorcode/amd/agesa/f15tn/Include/OptionHtInstall.h | 8 ++++----
src/vendorcode/amd/agesa/f15tn/Include/OptionHtcInstall.h | 2 +-
src/vendorcode/amd/agesa/f15tn/Include/OptionHwC1eInstall.h | 2 +-
src/vendorcode/amd/agesa/f15tn/Include/OptionIdsInstall.h | 4 ++--
.../amd/agesa/f15tn/Include/OptionIoCstateInstall.h | 2 +-
.../amd/agesa/f15tn/Include/OptionL3FeaturesInstall.h | 2 +-
src/vendorcode/amd/agesa/f15tn/Include/OptionMemory.h | 10 +++++-----
.../amd/agesa/f15tn/Include/OptionMemoryRecovery.h | 6 +++---
.../amd/agesa/f15tn/Include/OptionMmioMapInstall.h | 2 +-
.../amd/agesa/f15tn/Include/OptionMsgBasedC1eInstall.h | 2 +-
.../amd/agesa/f15tn/Include/OptionPreserveMailboxInstall.h | 2 +-
src/vendorcode/amd/agesa/f15tn/Include/OptionPsiInstall.h | 2 +-
src/vendorcode/amd/agesa/f15tn/Include/OptionPstate.h | 2 +-
.../amd/agesa/f15tn/Include/OptionPstateHpcModeInstall.h | 2 +-
src/vendorcode/amd/agesa/f15tn/Include/OptionPstateInstall.h | 2 +-
.../amd/agesa/f15tn/Include/OptionS3ScriptInstall.h | 2 +-
src/vendorcode/amd/agesa/f15tn/Include/OptionSwC1eInstall.h | 2 +-
src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuRegisters.h | 2 +-
src/vendorcode/amd/agesa/f15tn/Proc/Fch/FchPlatform.h | 12 ++++++------
.../f15tn/Proc/GNB/Modules/GnbInitTN/GnbInitTNInstall.h | 6 +++---
src/vendorcode/amd/agesa/f15tn/Proc/IDS/IdsLib.h | 6 +++---
29 files changed, 52 insertions(+), 52 deletions(-)
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionApmInstall.h b/src/vendorcode/amd/agesa/f15tn/Include/OptionApmInstall.h
index e88d35b..368104c 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionApmInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Include/OptionApmInstall.h
@@ -44,7 +44,7 @@
#ifndef _OPTION_APM_INSTALL_H_
#define _OPTION_APM_INSTALL_H_
-#include "cpuApm.h"
+#include <Proc/CPU/Feature/cpuApm.h>
/* This option is designed to be included into the platform solution install
* file. The platform solution install file will define the options status.
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionC6Install.h b/src/vendorcode/amd/agesa/f15tn/Include/OptionC6Install.h
index 088d303..b6186c6 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionC6Install.h
+++ b/src/vendorcode/amd/agesa/f15tn/Include/OptionC6Install.h
@@ -44,7 +44,7 @@
#ifndef _OPTION_C6_STATE_INSTALL_H_
#define _OPTION_C6_STATE_INSTALL_H_
-#include "cpuC6State.h"
+#include <Proc/CPU/Feature/cpuC6State.h>
/* This option is designed to be included into the platform solution install
* file. The platform solution install file will define the options status.
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionCpbInstall.h b/src/vendorcode/amd/agesa/f15tn/Include/OptionCpbInstall.h
index b2fa7d6..308dc73 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionCpbInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Include/OptionCpbInstall.h
@@ -44,7 +44,7 @@
#ifndef _OPTION_CPB_INSTALL_H_
#define _OPTION_CPB_INSTALL_H_
-#include "cpuCpb.h"
+#include <Proc/CPU/Feature/cpuCpb.h>
/* This option is designed to be included into the platform solution install
* file. The platform solution install file will define the options status.
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionCpuCacheFlushOnHaltInstall.h b/src/vendorcode/amd/agesa/f15tn/Include/OptionCpuCacheFlushOnHaltInstall.h
index f00ee23..8b5db5a 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionCpuCacheFlushOnHaltInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Include/OptionCpuCacheFlushOnHaltInstall.h
@@ -44,7 +44,7 @@
#ifndef _OPTION_CPU_CACHEFLUSHONHALT_INSTALL_H_
#define _OPTION_CPU_CACHEFLUSHONHALT_INSTALL_H_
-#include "cpuPostInit.h"
+#include "Proc/CPU/cpuPostInit.h"
/* This option is designed to be included into the platform solution install
* file. The platform solution install file will define the options status.
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionDmiInstall.h b/src/vendorcode/amd/agesa/f15tn/Include/OptionDmiInstall.h
index 73e5041..fb1b54d 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionDmiInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Include/OptionDmiInstall.h
@@ -44,7 +44,7 @@
#ifndef _OPTION_DMI_INSTALL_H_
#define _OPTION_DMI_INSTALL_H_
-#include "cpuLateInit.h"
+#include <Proc/CPU/cpuLateInit.h>
/* This option is designed to be included into the platform solution install
* file. The platform solution install file will define the options status.
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionFamily15hInstall.h b/src/vendorcode/amd/agesa/f15tn/Include/OptionFamily15hInstall.h
index d1e5c5b..f0d9194 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionFamily15hInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Include/OptionFamily15hInstall.h
@@ -43,7 +43,7 @@
#ifndef _OPTION_FAMILY_15H_INSTALL_H_
#define _OPTION_FAMILY_15H_INSTALL_H_
-#include "cpuFamilyTranslation.h"
+#include <Proc/CPU/cpuFamilyTranslation.h>
/*
* Pull in family specific services based on entry point
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionFchInstall.h b/src/vendorcode/amd/agesa/f15tn/Include/OptionFchInstall.h
index bf4c208..4a8237a 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionFchInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Include/OptionFchInstall.h
@@ -42,7 +42,7 @@
#ifndef _OPTION_FCH_INSTALL_H_
#define _OPTION_FCH_INSTALL_H_
-#include "AmdFch.h"
+#include <Proc/Common/AmdFch.h>
#ifndef FCH_SUPPORT
#define FCH_SUPPORT FALSE
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionGnbInstall.h b/src/vendorcode/amd/agesa/f15tn/Include/OptionGnbInstall.h
index 022eee3..f6fc162 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionGnbInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Include/OptionGnbInstall.h
@@ -44,7 +44,7 @@
#ifndef _OPTION_GNB_INSTALL_H_
#define _OPTION_GNB_INSTALL_H_
-#include "S3SaveState.h"
+#include <Proc/Common/S3SaveState.h>
/* This option is designed to be included into the platform solution install
* file. The platform solution install file will define the options status.
* Check to validate the definition
@@ -82,13 +82,13 @@
// Service installation
//---------------------------------------------------------------------------------------------------
- #include "Gnb.h"
- #include "GnbPcie.h"
- #include "GnbGfx.h"
+ #include <Proc/GNB/Common/Gnb.h>
+ #include <Proc/GNB/Common/GnbPcie.h>
+ #include <Proc/GNB/Common/GnbGfx.h>
#define SERVICES_POINTER NULL
#if (GNB_TYPE_TN == TRUE)
- #include "GnbInitTNInstall.h"
+ #include <Proc/GNB/Modules/GnbInitTN/GnbInitTNInstall.h>
#endif
GNB_SERVICE *ServiceTable = SERVICES_POINTER;
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionHtInstall.h b/src/vendorcode/amd/agesa/f15tn/Include/OptionHtInstall.h
index d6055bc..5069412 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionHtInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Include/OptionHtInstall.h
@@ -45,10 +45,10 @@
#define _OPTION_HT_INSTALL_H_
#include "Topology.h"
-#include "htFeat.h"
-#include "htInterface.h"
-#include "htNb.h"
-#include "htTopologies.h"
+#include <Proc/HT/htFeat.h>
+#include <Proc/HT/htInterface.h>
+#include <Proc/HT/htNb.h>
+#include <Proc/HT/htTopologies.h>
/*
* Advanced Option only, hardware socket naming is the preferred method.
*/
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionHtcInstall.h b/src/vendorcode/amd/agesa/f15tn/Include/OptionHtcInstall.h
index 0b6f4f0..671b0fb 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionHtcInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Include/OptionHtcInstall.h
@@ -44,7 +44,7 @@
#ifndef _OPTION_HTC_INSTALL_H_
#define _OPTION_HTC_INSTALL_H_
-#include "cpuHtc.h"
+#include <Proc/CPU/Feature/cpuHtc.h>
/* This option is designed to be included into the platform solution install
* file. The platform solution install file will define the options status.
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionHwC1eInstall.h b/src/vendorcode/amd/agesa/f15tn/Include/OptionHwC1eInstall.h
index 0f85c71..374ceb4 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionHwC1eInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Include/OptionHwC1eInstall.h
@@ -44,7 +44,7 @@
#ifndef _OPTION_HW_C1E_INSTALL_H_
#define _OPTION_HW_C1E_INSTALL_H_
-#include "cpuHwC1e.h"
+#include <Proc/CPU/Feature/cpuHwC1e.h>
/* This option is designed to be included into the platform solution install
* file. The platform solution install file will define the options status.
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionIdsInstall.h b/src/vendorcode/amd/agesa/f15tn/Include/OptionIdsInstall.h
index 83c28d2..a60667f 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionIdsInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Include/OptionIdsInstall.h
@@ -43,8 +43,8 @@
#define _OPTION_IDS_INSTALL_H_
#include "Ids.h"
#include "IdsHt.h"
-#include "IdsLib.h"
-#include "IdsDebugPrint.h"
+#include <Proc/IDS/IdsLib.h>
+#include <Proc/IDS/Debug/IdsDebugPrint.h>
#ifdef __IDS_EXTENDED__
#include OPTION_IDS_EXT_INSTALL_FILE
#endif
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionIoCstateInstall.h b/src/vendorcode/amd/agesa/f15tn/Include/OptionIoCstateInstall.h
index b94b043..b83ee6b 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionIoCstateInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Include/OptionIoCstateInstall.h
@@ -44,7 +44,7 @@
#ifndef _OPTION_IO_CSTATE_INSTALL_H_
#define _OPTION_IO_CSTATE_INSTALL_H_
-#include "cpuIoCstate.h"
+#include <Proc/CPU/Feature/cpuIoCstate.h>
/* This option is designed to be included into the platform solution install
* file. The platform solution install file will define the options status.
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionL3FeaturesInstall.h b/src/vendorcode/amd/agesa/f15tn/Include/OptionL3FeaturesInstall.h
index 981e7c9..5d188e2 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionL3FeaturesInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Include/OptionL3FeaturesInstall.h
@@ -44,7 +44,7 @@
#ifndef _OPTION_L3_FEATURES_INSTALL_H_
#define _OPTION_L3_FEATURES_INSTALL_H_
-#include "cpuL3Features.h"
+#include <Proc/CPU/Feature/cpuL3Features.h>
/* This option is designed to be included into the platform solution install
* file. The platform solution install file will define the options status.
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionMemory.h b/src/vendorcode/amd/agesa/f15tn/Include/OptionMemory.h
index 017c981..2494ba9 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionMemory.h
+++ b/src/vendorcode/amd/agesa/f15tn/Include/OptionMemory.h
@@ -45,11 +45,11 @@
#define _OPTION_MEMORY_H_
/* Memory Includes */
-#include "mm.h"
-#include "mn.h"
-#include "mt.h"
-#include "ma.h"
-#include "mp.h"
+#include <Proc/Mem/mm.h>
+#include <Proc/Mem/mn.h>
+#include <Proc/Mem/mt.h>
+#include <Proc/Mem/ma.h>
+#include <Proc/Mem/mp.h>
/*----------------------------------------------------------------------------------------
* M I X E D (Definitions And Macros / Typedefs, Structures, Enums)
*----------------------------------------------------------------------------------------
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionMemoryRecovery.h b/src/vendorcode/amd/agesa/f15tn/Include/OptionMemoryRecovery.h
index 713e73d..710d218 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionMemoryRecovery.h
+++ b/src/vendorcode/amd/agesa/f15tn/Include/OptionMemoryRecovery.h
@@ -44,9 +44,9 @@
#ifndef _OPTION_MEMORY_RECOVERY_H_
#define _OPTION_MEMORY_RECOVERY_H_
-#include "mm.h"
-#include "mn.h"
-#include "mt.h"
+#include <Proc/Mem/mm.h>
+#include <Proc/Mem/mn.h>
+#include <Proc/Mem/mt.h>
typedef BOOLEAN MEM_REC_NB_CONSTRUCTOR (
IN OUT MEM_NB_BLOCK *NBPtr,
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionMmioMapInstall.h b/src/vendorcode/amd/agesa/f15tn/Include/OptionMmioMapInstall.h
index f43ff86..5ba255d 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionMmioMapInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Include/OptionMmioMapInstall.h
@@ -44,7 +44,7 @@
#ifndef _OPTION_MMIO_MAP_INSTALL_H_
#define _OPTION_MMIO_MAP_INSTALL_H_
-#include "mmioMapManager.h"
+#include <Proc/CPU/mmioMapManager.h>
/* This option is designed to be included into the platform solution install
* file. The platform solution install file will define the options status.
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionMsgBasedC1eInstall.h b/src/vendorcode/amd/agesa/f15tn/Include/OptionMsgBasedC1eInstall.h
index 986690b..6d0aeef 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionMsgBasedC1eInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Include/OptionMsgBasedC1eInstall.h
@@ -44,7 +44,7 @@
#ifndef _OPTION_MSG_BASED_C1E_INSTALL_H_
#define _OPTION_MSG_BASED_C1E_INSTALL_H_
-#include "cpuMsgBasedC1e.h"
+#include <Proc/CPU/Feature/cpuMsgBasedC1e.h>
/* This option is designed to be included into the platform solution install
* file. The platform solution install file will define the options status.
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionPreserveMailboxInstall.h b/src/vendorcode/amd/agesa/f15tn/Include/OptionPreserveMailboxInstall.h
index d42175c..310dc54 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionPreserveMailboxInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Include/OptionPreserveMailboxInstall.h
@@ -44,7 +44,7 @@
#ifndef _OPTION_PRESERVE_MAILBOX_INSTALL_H_
#define _OPTION_PRESERVE_MAILBOX_INSTALL_H_
-#include "PreserveMailbox.h"
+#include <Proc/CPU/Feature/PreserveMailbox.h>
/* This option is designed to be included into the platform solution install
* file. The platform solution install file will define the options status.
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionPsiInstall.h b/src/vendorcode/amd/agesa/f15tn/Include/OptionPsiInstall.h
index 83e4734..0053a49 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionPsiInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Include/OptionPsiInstall.h
@@ -44,7 +44,7 @@
#ifndef _OPTION_PSI_INSTALL_H_
#define _OPTION_PSI_INSTALL_H_
-#include "cpuPsi.h"
+#include <Proc/CPU/Feature/cpuPsi.h>
/* This option is designed to be included into the platform solution install
* file. The platform solution install file will define the options status.
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionPstate.h b/src/vendorcode/amd/agesa/f15tn/Include/OptionPstate.h
index 1ffaf94..2b576b1 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionPstate.h
+++ b/src/vendorcode/amd/agesa/f15tn/Include/OptionPstate.h
@@ -44,7 +44,7 @@
#ifndef _OPTION_PSTATE_H_
#define _OPTION_PSTATE_H_
-#include "cpuPstateTables.h"
+#include <Proc/CPU/Feature/cpuPstateTables.h>
/*----------------------------------------------------------------------------------------
* M I X E D (Definitions And Macros / Typedefs, Structures, Enums)
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionPstateHpcModeInstall.h b/src/vendorcode/amd/agesa/f15tn/Include/OptionPstateHpcModeInstall.h
index 6b7f7f7..5106ed2 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionPstateHpcModeInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Include/OptionPstateHpcModeInstall.h
@@ -44,7 +44,7 @@
#ifndef _OPTION_PSTATE_HPC_MODE_INSTALL_H_
#define _OPTION_PSTATE_HPC_MODE_INSTALL_H_
-#include "cpuPstateHpcMode.h"
+#include <Proc/CPU/Feature/cpuPstateHpcMode.h>
/* This option is designed to be included into the platform solution install
* file. The platform solution install file will define the options status.
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionPstateInstall.h b/src/vendorcode/amd/agesa/f15tn/Include/OptionPstateInstall.h
index 18f22ac..e80a69d 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionPstateInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Include/OptionPstateInstall.h
@@ -44,7 +44,7 @@
#ifndef _OPTION_PSTATE_INSTALL_H_
#define _OPTION_PSTATE_INSTALL_H_
-#include "cpuPstateTables.h"
+#include <Proc/CPU/Feature/cpuPstateTables.h>
/* This option is designed to be included into the platform solution install
* file. The platform solution install file will define the options status.
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionS3ScriptInstall.h b/src/vendorcode/amd/agesa/f15tn/Include/OptionS3ScriptInstall.h
index 5b62bdf..f470042 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionS3ScriptInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Include/OptionS3ScriptInstall.h
@@ -44,7 +44,7 @@
#ifndef _OPTION_S3SCRIPT_INSTALL_H_
#define _OPTION_S3SCRIPT_INSTALL_H_
-#include "S3SaveState.h"
+#include <Proc/Common/S3SaveState.h>
/* This option is designed to be included into the platform solution install
* file. The platform solution install file will define the options status.
* Check to validate the definition
diff --git a/src/vendorcode/amd/agesa/f15tn/Include/OptionSwC1eInstall.h b/src/vendorcode/amd/agesa/f15tn/Include/OptionSwC1eInstall.h
index 34886ee..4fa53ce 100644
--- a/src/vendorcode/amd/agesa/f15tn/Include/OptionSwC1eInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Include/OptionSwC1eInstall.h
@@ -44,7 +44,7 @@
#ifndef _OPTION_SW_C1E_INSTALL_H_
#define _OPTION_SW_C1E_INSTALL_H_
-#include "cpuSwC1e.h"
+#include <Proc/CPU/Feature/cpuSwC1e.h>
/* This option is designed to be included into the platform solution install
* file. The platform solution install file will define the options status.
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuRegisters.h b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuRegisters.h
index f3e7116..48fcb24 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuRegisters.h
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuRegisters.h
@@ -45,7 +45,7 @@
#ifndef _CPU_REGISTERS_H_
#define _CPU_REGISTERS_H_
-#include "cpuFamRegisters.h"
+#include "Family/cpuFamRegisters.h"
/*
*--------------------------------------------------------------
*
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/Fch/FchPlatform.h b/src/vendorcode/amd/agesa/f15tn/Proc/Fch/FchPlatform.h
index aeace64..55ff7c0 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/Fch/FchPlatform.h
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/Fch/FchPlatform.h
@@ -106,12 +106,12 @@
#endif
#include "Fch.h"
-#include "amdlib.h"
-#include "FchCommonCfg.h"
-#include "AcpiLib.h"
-#include "FchDef.h"
-#include "FchBiosRamUsage.h"
-#include "AmdFch.h"
+#include <Lib/amdlib.h>
+#include "Common/FchCommonCfg.h"
+#include "Common/AcpiLib.h"
+#include "Common/FchDef.h"
+#include "Common/FchBiosRamUsage.h"
+#include <Proc/Common/AmdFch.h>
extern BUILD_OPT_CFG UserOptions;
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbInitTNInstall.h b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbInitTNInstall.h
index 6055818..1be9d7c 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbInitTNInstall.h
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbInitTNInstall.h
@@ -50,9 +50,9 @@
// Specify definition used by module services
//-----------------------------------------------------------------------
-#include "GnbPcie.h"
-#include "GnbPcieFamServices.h"
-#include "GnbFamServices.h"
+#include <Proc/GNB/Common/GnbPcie.h>
+#include <Proc/GNB/Common/GnbPcieFamServices.h>
+#include <Proc/GNB/Common/GnbFamServices.h>
//-----------------------------------------------------------------------
// Export services
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/IDS/IdsLib.h b/src/vendorcode/amd/agesa/f15tn/Proc/IDS/IdsLib.h
index 904e72d..a30dc37 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/IDS/IdsLib.h
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/IDS/IdsLib.h
@@ -43,9 +43,9 @@
#ifndef _IDS_LIB_H_
#define _IDS_LIB_H_
#include "OptionsIds.h"
-#include "cpuRegisters.h"
-#include "cpuApicUtilities.h"
-#include "Table.h"
+#include <Proc/CPU/cpuRegisters.h>
+#include <Proc/CPU/cpuApicUtilities.h>
+#include <Proc/CPU/Table.h>
///Specific time stamp performance analysis which need ids control support
#if IDSOPT_CONTROL_ENABLED == TRUE
#define PERF_SPEC_TS_ANALYSE(StdHeader) IdsPerfSpecTsAnalyse(StdHeader)
Alexandru Gagniuc (mr.nuke.me(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5445
-gerrit
commit 0a9fa510c4a56739ef029243bfc5383c8e3d2248
Author: Alexandru Gagniuc <mr.nuke.me(a)gmail.com>
Date: Mon Mar 31 16:17:54 2014 -0500
hp/pavilion_m6_1035dx: Add ACPI support for reading battery level
Hook in the EC ASL code. This provides just enough information for the
OS to be able to read the battery information.
EC notifications (_Qxx) do not yet work, and it is unclear if the
issue is in the ACPI code, or if the EC is not set up properly. Thus,
the OS must boot with the battery inserted in order to be able to read
its status.
The _L03 ACPI method is also removed, as the EC SCI uses this event.
Change-Id: I85cbaeb9c77e60bd1c68d928412f897de50c6329
Signed-off-by: Alexandru Gagniuc <mr.nuke.me(a)gmail.com>
---
src/mainboard/hp/pavilion_m6_1035dx/acpi/ec.asl | 14 ++++++++++++++
src/mainboard/hp/pavilion_m6_1035dx/acpi/gpe.asl | 6 ------
.../hp/pavilion_m6_1035dx/acpi/mainboard.asl | 19 +++++++++++++++++++
src/mainboard/hp/pavilion_m6_1035dx/dsdt.asl | 4 ++++
4 files changed, 37 insertions(+), 6 deletions(-)
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/acpi/ec.asl b/src/mainboard/hp/pavilion_m6_1035dx/acpi/ec.asl
new file mode 100644
index 0000000..e0d92fa
--- /dev/null
+++ b/src/mainboard/hp/pavilion_m6_1035dx/acpi/ec.asl
@@ -0,0 +1,14 @@
+/*
+ * Copyright (C) 2014 Alexandru Gagniuc <mr.nuke.me(a)gmail.com>
+ * Subject to the GNU GPL v2, or (at your option) any later version.
+ */
+
+/*
+ * EC bits specific to the mainboard
+ */
+#define EC_SCI 3
+/* TODO: We do not yet know how the LID is connected to the platform */
+#define EC_ACPI_LID_SWITCH_OBJECT Zero
+
+/* ACPI code for EC functions */
+#include <ec/compal/ene932/acpi/ec.asl>
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/acpi/gpe.asl b/src/mainboard/hp/pavilion_m6_1035dx/acpi/gpe.asl
index 40a19d4..a240308 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/acpi/gpe.asl
+++ b/src/mainboard/hp/pavilion_m6_1035dx/acpi/gpe.asl
@@ -19,12 +19,6 @@
Scope(\_GPE) { /* Start Scope GPE */
- /* General event 3 */
- Method(_L03) {
- /* DBGO("\\_GPE\\_L00\n") */
- Notify(\_SB.PCI0.PWRB, 0x02) /* NOTIFY_DEVICE_WAKE */
- }
-
/* Legacy PM event */
Method(_L08) {
/* DBGO("\\_GPE\\_L08\n") */
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/acpi/mainboard.asl b/src/mainboard/hp/pavilion_m6_1035dx/acpi/mainboard.asl
index 040f069..0ddb038 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/acpi/mainboard.asl
+++ b/src/mainboard/hp/pavilion_m6_1035dx/acpi/mainboard.asl
@@ -35,9 +35,28 @@
Name(OSV, Ones) /* Assume nothing */
Name(PMOD, One) /* Assume APIC */
+ /* Variables used by EC */
+ /* TODO: These may belong in global non-volatile storage */
+ Name(PWRS, Zero)
+ Name(LIDS, Zero)
+
/* AcpiGpe0Blk */
OperationRegion(GP0B, SystemMemory, 0xfed80814, 0x04)
Field(GP0B, ByteAcc, NoLock, Preserve) {
, 11,
USBS, 1,
}
+
+ /*
+ * Used by EC code on certain events
+ *
+ * From ec/compal/ene932/acpi/ec.asl:
+ * The mainboard must define a PNOT method to handle power state
+ * notifications and Notify CPU device objects to re-evaluate their
+ * _PPC and _CST tables.
+ */
+ Method (PNOT)
+ {
+ Store("Received PNOT call (probably from EC)", Debug)
+ /* TODO: Implement this */
+ }
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/dsdt.asl b/src/mainboard/hp/pavilion_m6_1035dx/dsdt.asl
index ef2ae6f..c1f1933 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/dsdt.asl
+++ b/src/mainboard/hp/pavilion_m6_1035dx/dsdt.asl
@@ -69,6 +69,10 @@ DefinitionBlock (
} /* End Scope(_SB) */
+ Scope(\_SB.PCI0.LIBR) {
+ #include "acpi/ec.asl"
+ }
+
/* Describe SMBUS for the Southbridge */
#include <southbridge/amd/agesa/hudson/acpi/smbus.asl>
Alexandru Gagniuc (mr.nuke.me(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5445
-gerrit
commit 4a94cba2cbac43402727a73f02e0256f53a69a24
Author: Alexandru Gagniuc <mr.nuke.me(a)gmail.com>
Date: Mon Mar 31 16:17:54 2014 -0500
hp/pavilion_m6_1035dx: Add ACPI support for reading battery level
Hook in the EC ASL code. This provides just enough information for the
OS to be able to read the battery information.
EC notifications (_Qxx) do not yet work, and it is unclear if the
issue is in the ACPI code, or if the EC is not set up properly. Thus,
the OS must boot with the battery inserted in order to be able to read
its status.
The _L03 ACPI method is also removed, as the EC SCI uses this event.
Change-Id: I85cbaeb9c77e60bd1c68d928412f897de50c6329
Signed-off-by: Alexandru Gagniuc <mr.nuke.me(a)gmail.com>
---
src/mainboard/hp/pavilion_m6_1035dx/acpi/ec.asl | 16 ++++++++++++++++
src/mainboard/hp/pavilion_m6_1035dx/acpi/gpe.asl | 6 ------
.../hp/pavilion_m6_1035dx/acpi/mainboard.asl | 19 +++++++++++++++++++
src/mainboard/hp/pavilion_m6_1035dx/dsdt.asl | 4 ++++
4 files changed, 39 insertions(+), 6 deletions(-)
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/acpi/ec.asl b/src/mainboard/hp/pavilion_m6_1035dx/acpi/ec.asl
new file mode 100644
index 0000000..cf8747b
--- /dev/null
+++ b/src/mainboard/hp/pavilion_m6_1035dx/acpi/ec.asl
@@ -0,0 +1,16 @@
+/*
+ * Copyright (C) 2014 Alexandru Gagniuc <mr.nuke.me(a)gmail.com>
+ * Subject to the GNU GPL v2, or (at your option) any later version.
+ */
+
+/*
+ * EC bits specific to the mainboard
+ */
+#define EC_SCI 3
+/* TODO: We do not yet know how the LID is connected to the platform */
+#define EC_ACPI_LID_SWITCH_OBJECT Zero
+
+/* ACPI code for EC functions */
+#include <ec/compal/ene932/acpi/ec.asl>
+
+
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/acpi/gpe.asl b/src/mainboard/hp/pavilion_m6_1035dx/acpi/gpe.asl
index 40a19d4..a240308 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/acpi/gpe.asl
+++ b/src/mainboard/hp/pavilion_m6_1035dx/acpi/gpe.asl
@@ -19,12 +19,6 @@
Scope(\_GPE) { /* Start Scope GPE */
- /* General event 3 */
- Method(_L03) {
- /* DBGO("\\_GPE\\_L00\n") */
- Notify(\_SB.PCI0.PWRB, 0x02) /* NOTIFY_DEVICE_WAKE */
- }
-
/* Legacy PM event */
Method(_L08) {
/* DBGO("\\_GPE\\_L08\n") */
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/acpi/mainboard.asl b/src/mainboard/hp/pavilion_m6_1035dx/acpi/mainboard.asl
index 040f069..0ddb038 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/acpi/mainboard.asl
+++ b/src/mainboard/hp/pavilion_m6_1035dx/acpi/mainboard.asl
@@ -35,9 +35,28 @@
Name(OSV, Ones) /* Assume nothing */
Name(PMOD, One) /* Assume APIC */
+ /* Variables used by EC */
+ /* TODO: These may belong in global non-volatile storage */
+ Name(PWRS, Zero)
+ Name(LIDS, Zero)
+
/* AcpiGpe0Blk */
OperationRegion(GP0B, SystemMemory, 0xfed80814, 0x04)
Field(GP0B, ByteAcc, NoLock, Preserve) {
, 11,
USBS, 1,
}
+
+ /*
+ * Used by EC code on certain events
+ *
+ * From ec/compal/ene932/acpi/ec.asl:
+ * The mainboard must define a PNOT method to handle power state
+ * notifications and Notify CPU device objects to re-evaluate their
+ * _PPC and _CST tables.
+ */
+ Method (PNOT)
+ {
+ Store("Received PNOT call (probably from EC)", Debug)
+ /* TODO: Implement this */
+ }
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/dsdt.asl b/src/mainboard/hp/pavilion_m6_1035dx/dsdt.asl
index ef2ae6f..c1f1933 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/dsdt.asl
+++ b/src/mainboard/hp/pavilion_m6_1035dx/dsdt.asl
@@ -69,6 +69,10 @@ DefinitionBlock (
} /* End Scope(_SB) */
+ Scope(\_SB.PCI0.LIBR) {
+ #include "acpi/ec.asl"
+ }
+
/* Describe SMBUS for the Southbridge */
#include <southbridge/amd/agesa/hudson/acpi/smbus.asl>