5 files changed, 15 insertions, 174 deletions
diff --git a/src/vendorcode/amd/agesa/f12/Makefile.inc b/src/vendorcode/amd/agesa/f12/Makefile.inc
index 4f5e86cc04..5ed6a39c29 100644
--- a/src/vendorcode/amd/agesa/f12/Makefile.inc
+++ b/src/vendorcode/amd/agesa/f12/Makefile.inc
@@ -30,52 +30,13 @@
 # AGESA V5 Files
 AGESA_ROOT = src/vendorcode/amd/agesa/f12
 
+AGESA_AUTOINCLUDES := $(shell find $(AGESA_ROOT)/Proc -type d -exec echo -n "-I"{}" " \;)
+
 AGESA_INC  = -I$(src)/vendorcode/amd/include -I$(src)/mainboard/$(MAINBOARDDIR)
 AGESA_INC += -I$(AGESA_ROOT)
 AGESA_INC += -I$(AGESA_ROOT)/../common
-AGESA_INC += -I$(AGESA_ROOT)/Proc/CPU
-AGESA_INC += -I$(AGESA_ROOT)/Proc/CPU/Family
 AGESA_INC += -I$(AGESA_ROOT)/Include
-AGESA_INC += -I$(AGESA_ROOT)/Proc/IDS
-AGESA_INC += -I$(AGESA_ROOT)/Proc/CPU/Feature
-AGESA_INC += -I$(AGESA_ROOT)/Proc/Common
-AGESA_INC += -I$(AGESA_ROOT)/Proc/Mem
-AGESA_INC += -I$(AGESA_ROOT)/Proc/CPU/Family/0x12
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Nb
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Common
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Modules/GnbCommonLib
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Gfx
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Gfx/Family
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Modules/GnbGfxConfig
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Modules/GnbGfxInitLibV1
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Modules/GnbSbLib
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Modules/GnbPcieConfig
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Modules/GnbNbInitLibV1
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Nb/Family/LN
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Modules/GnbCableSafe
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Modules/GnbPcieInitLibV1
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Modules/GnbPcieAlibV1
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Modules/GnbPcieTrainingV1
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Nb/Family
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Nb/Feature
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/PCIe/Family
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/PCIe
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/PCIe/Family/LN
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/PCIe/Feature
-AGESA_INC += -I$(AGESA_ROOT)/Proc/HT
-AGESA_INC += -I$(AGESA_ROOT)/Proc/HT/Fam12
-AGESA_INC += -I$(AGESA_ROOT)/Proc/Mem/Feat/CHINTLV
-AGESA_INC += -I$(AGESA_ROOT)/Proc/Mem/Feat/CSINTLV
-AGESA_INC += -I$(AGESA_ROOT)/Proc/Mem/Feat/ECC
-AGESA_INC += -I$(AGESA_ROOT)/Proc/Mem/Feat/IDENDIMM
-AGESA_INC += -I$(AGESA_ROOT)/Proc/Mem/Feat/INTLVRN
-AGESA_INC += -I$(AGESA_ROOT)/Proc/Mem/Feat/LVDDR3
-AGESA_INC += -I$(AGESA_ROOT)/Proc/Mem/Feat/ODTHERMAL
-AGESA_INC += -I$(AGESA_ROOT)/Proc/Mem/Main
-AGESA_INC += -I$(AGESA_ROOT)/Proc/Mem/NB/LN
-AGESA_INC += -I$(AGESA_ROOT)/Proc/Mem/Tech
-AGESA_INC += -I$(AGESA_ROOT)/Proc/Mem/Tech/DDR3
+AGESA_INC += $(AGESA_AUTOINCLUDES)
 
 CFLAGS_x86_32 += -march=k8-sse3 -mtune=k8-sse3 -fno-zero-initialized-in-bss -fno-strict-aliasing
 CFLAGS_x86_64 += -march=k8-sse3 -mtune=k8-sse3 -fno-zero-initialized-in-bss -fno-strict-aliasing
diff --git a/src/vendorcode/amd/agesa/f14/Makefile.inc b/src/vendorcode/amd/agesa/f14/Makefile.inc
index eab84714ab..ea7198ff59 100644
--- a/src/vendorcode/amd/agesa/f14/Makefile.inc
+++ b/src/vendorcode/amd/agesa/f14/Makefile.inc
@@ -30,39 +30,17 @@
 # AGESA V5 Files
 AGESA_ROOT = src/vendorcode/amd/agesa/f14
 
+AGESA_AUTOINCLUDES := $(shell find $(AGESA_ROOT)/Proc -type d -exec echo -n "-I"{}" " \;)
+
 AGESA_INC  = -I$(src)/vendorcode/amd/include -I$(src)/mainboard/$(MAINBOARDDIR)
 AGESA_INC += -I$(AGESA_ROOT)
 AGESA_INC += -I$(AGESA_ROOT)/../common
 AGESA_INC += -I$(AGESA_ROOT)/Include
-AGESA_INC += -I$(AGESA_ROOT)/Legacy
-AGESA_INC += -I$(AGESA_ROOT)/Proc/Common
-AGESA_INC += -I$(AGESA_ROOT)/Proc/CPU
-AGESA_INC += -I$(AGESA_ROOT)/Proc/CPU/Family
-AGESA_INC += -I$(AGESA_ROOT)/Proc/CPU/Family/0x14
-AGESA_INC += -I$(AGESA_ROOT)/Proc/CPU/Family/0x14/ON
-AGESA_INC += -I$(AGESA_ROOT)/Proc/CPU/Feature 
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Common
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Gfx
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Gfx/Family
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Modules/GnbCommonLib
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Nb
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Nb/Family
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Nb/Family/0x14
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Nb/Feature
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/PCIe
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/PCIe/Family
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/PCIe/Family/0x14
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/PCIe/Feature
-AGESA_INC += -I$(AGESA_ROOT)/Proc/HT
-AGESA_INC += -I$(AGESA_ROOT)/Proc/IDS
-AGESA_INC += -I$(AGESA_ROOT)/Proc/Mem
-AGESA_INC += -I$(AGESA_ROOT)/Proc/Mem/NB/ON
+AGESA_INC += $(AGESA_AUTOINCLUDES)
 
 CFLAGS_x86_32 += -march=k8-sse3 -mtune=k8-sse3 -fno-zero-initialized-in-bss -fno-strict-aliasing
 CFLAGS_x86_64 += -march=k8-sse3 -mtune=k8-sse3 -fno-zero-initialized-in-bss -fno-strict-aliasing
 
-export AGESA_ROOT := $(AGESA_ROOT)
 export AGESA_INC  := $(AGESA_INC)
 CPPFLAGS_x86_32 += $(AGESA_INC)
 CPPFLAGS_x86_64 += $(AGESA_INC)
diff --git a/src/vendorcode/amd/agesa/f15/Makefile.inc b/src/vendorcode/amd/agesa/f15/Makefile.inc
index 2ea4c3315a..d329add945 100644
--- a/src/vendorcode/amd/agesa/f15/Makefile.inc
+++ b/src/vendorcode/amd/agesa/f15/Makefile.inc
@@ -19,42 +19,18 @@
 AGESA_ROOT ?= $(PWD)
 AGESA_ROOT = src/vendorcode/amd/agesa/f15
 
+AGESA_AUTOINCLUDES := $(shell find $(AGESA_ROOT)/Proc -type d -exec echo -n "-I"{}" " \;)
+
 AGESA_INC  = -I$(src)/vendorcode/amd/include -I$(src)/mainboard/$(MAINBOARDDIR)
 AGESA_INC += -I$(AGESA_ROOT)
 AGESA_INC += -I$(AGESA_ROOT)/../common
 AGESA_INC += -I$(AGESA_ROOT)/Include
-AGESA_INC += -I$(AGESA_ROOT)/Legacy
-AGESA_INC += -I$(AGESA_ROOT)/Proc/CPU
-AGESA_INC += -I$(AGESA_ROOT)/Proc/CPU/Family
-AGESA_INC += -I$(AGESA_ROOT)/Proc/CPU/Family/0x10
-AGESA_INC += -I$(AGESA_ROOT)/Proc/CPU/Family/0x15
-AGESA_INC += -I$(AGESA_ROOT)/Proc/CPU/Family/0x15/OR
-AGESA_INC += -I$(AGESA_ROOT)/Proc/CPU/Feature
-AGESA_INC += -I$(AGESA_ROOT)/Proc/Common
-AGESA_INC += -I$(AGESA_ROOT)/Proc/HT
-AGESA_INC += -I$(AGESA_ROOT)/Proc/HT/Fam10
-AGESA_INC += -I$(AGESA_ROOT)/Proc/HT/Fam15
-AGESA_INC += -I$(AGESA_ROOT)/Proc/HT/Features
-AGESA_INC += -I$(AGESA_ROOT)/Proc/HT/NbCommon
-AGESA_INC += -I$(AGESA_ROOT)/Proc/HT/htGraph
-AGESA_INC += -I$(AGESA_ROOT)/Proc/IDS
-
-AGESA_INC += -I$(AGESA_ROOT)/Proc/Mem
-AGESA_INC += -I$(AGESA_ROOT)/Proc/Mem/NB
-AGESA_INC += -I$(AGESA_ROOT)/Proc/Mem/NB/OR
-AGESA_INC += -I$(AGESA_ROOT)/Proc/Mem/NB/C32
-AGESA_INC += -I$(AGESA_ROOT)/Proc/Mem/NB/HY
-AGESA_INC += -I$(AGESA_ROOT)/Proc/Mem/NB/DA
-AGESA_INC += -I$(AGESA_ROOT)/Proc/Mem/NB/PH
-AGESA_INC += -I$(AGESA_ROOT)/Proc/Mem/NB/RB
-AGESA_INC += -I$(AGESA_ROOT)/Proc/Mem/Feat/IDENDIMM/
-AGESA_INC += -I$(AGESA_ROOT)/Proc/Mem/Main
+AGESA_INC += $(AGESA_AUTOINCLUDES)
 
 ## AGESA need sse feature ##
 CFLAGS_x86_32 += -msse3 -fno-zero-initialized-in-bss -fno-strict-aliasing
 CFLAGS_x86_64 += -msse3 -fno-zero-initialized-in-bss -fno-strict-aliasing
 
-export AGESA_ROOT := $(AGESA_ROOT)
 export AGESA_INC  := $(AGESA_INC)
 CPPFLAGS_x86_32 += $(AGESA_INC)
 CPPFLAGS_x86_64 += $(AGESA_INC)
diff --git a/src/vendorcode/amd/agesa/f15tn/Makefile.inc b/src/vendorcode/amd/agesa/f15tn/Makefile.inc
index 07ff1bc3e3..d060dddc97 100644
--- a/src/vendorcode/amd/agesa/f15tn/Makefile.inc
+++ b/src/vendorcode/amd/agesa/f15tn/Makefile.inc
@@ -30,55 +30,19 @@
 # AGESA V5 Files
 AGESA_ROOT = src/vendorcode/amd/agesa/f15tn
 
+AGESA_AUTOINCLUDES := $(shell find $(AGESA_ROOT)/Proc -type d -exec echo -n "-I"{}" " \;)
+
 AGESA_INC  = -I$(src)/vendorcode/amd/include -I$(src)/mainboard/$(MAINBOARDDIR)
 AGESA_INC += -I$(AGESA_ROOT)
 AGESA_INC += -I$(AGESA_ROOT)/../common
 AGESA_INC += -I$(AGESA_ROOT)/Include
-AGESA_INC += -I$(AGESA_ROOT)/Legacy
-AGESA_INC += -I$(AGESA_ROOT)/Proc/Common
-AGESA_INC += -I$(AGESA_ROOT)/Proc/HT
-AGESA_INC += -I$(AGESA_ROOT)/Proc/CPU
-AGESA_INC += -I$(AGESA_ROOT)/Proc/CPU/Feature
-AGESA_INC += -I$(AGESA_ROOT)/Proc/CPU/Family
-AGESA_INC += -I$(AGESA_ROOT)/Proc/CPU/Family/0x15
-AGESA_INC += -I$(AGESA_ROOT)/Proc/CPU/Family/0x15/TN
-AGESA_INC += -I$(AGESA_ROOT)/Proc/Mem
-AGESA_INC += -I$(AGESA_ROOT)/Proc/Mem/NB/TN
-AGESA_INC += -I$(AGESA_ROOT)/Proc/IDS
-AGESA_INC += -I$(AGESA_ROOT)/Proc/IDS/Family
-AGESA_INC += -I$(AGESA_ROOT)/Proc/IDS/Family/0x15
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Common
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Modules/GnbGfxConfig
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Modules/GnbPcieConfig
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Modules/GnbGfxInitLibV1
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Modules/GnbPcieInitLibV1
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Modules/GnbNbInitLibV1
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Modules/GnbInitTN
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Modules/GnbSbLib
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Modules/GnbPcieTrainingV1
-AGESA_INC += -I$(AGESA_ROOT)/Proc/IDS/Family/0x15/TN
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Modules/GnbCommonLib
-AGESA_INC += -I$(AGESA_ROOT)/Proc/Mem/Main
-AGESA_INC += -I$(AGESA_ROOT)/Proc/IDS/Library
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Modules/GnbNbInitLibV4
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Modules/GnbIommuIvrs
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Modules/GnbIvrsLib
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Modules/GnbSbIommuLib
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Modules/GnbTable
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Modules/GnbPcieInitLibV4
-AGESA_INC += -I$(AGESA_ROOT)/Proc/Fch
-AGESA_INC += -I$(AGESA_ROOT)/Proc/Fch/Common
-AGESA_INC += -I$(AGESA_ROOT)/Proc/IDS/Debug
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Modules/GnbPcieAspm
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Include/Library
+AGESA_INC += $(AGESA_AUTOINCLUDES)
 
 AGESA_INC += -I$(src)/southbridge/amd/agesa/hudson
 
 CFLAGS_x86_32 += -march=k8-sse3 -mtune=k8-sse3 -fno-zero-initialized-in-bss -fno-strict-aliasing
 CFLAGS_x86_64 += -march=k8-sse3 -mtune=k8-sse3 -fno-zero-initialized-in-bss -fno-strict-aliasing
 
-export AGESA_ROOT := $(AGESA_ROOT)
 export AGESA_INC  := $(AGESA_INC)
 CPPFLAGS_x86_32 += $(AGESA_INC)
 CPPFLAGS_x86_64 += $(AGESA_INC)
diff --git a/src/vendorcode/amd/agesa/f16kb/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Makefile.inc
index 981166fc73..db7a00d49f 100644
--- a/src/vendorcode/amd/agesa/f16kb/Makefile.inc
+++ b/src/vendorcode/amd/agesa/f16kb/Makefile.inc
@@ -30,50 +30,13 @@
 # AGESA V5 Files
 AGESA_ROOT = src/vendorcode/amd/agesa/f16kb
 
+AGESA_AUTOINCLUDES := $(shell find $(AGESA_ROOT)/Proc -type d -exec echo -n "-I"{}" " \;)
+
 AGESA_INC  = -I$(src)/vendorcode/amd/include -I$(src)/mainboard/$(MAINBOARDDIR)
 AGESA_INC += -I$(AGESA_ROOT)
 AGESA_INC += -I$(AGESA_ROOT)/../common
 AGESA_INC += -I$(AGESA_ROOT)/Include
-AGESA_INC += -I$(AGESA_ROOT)/Legacy
-AGESA_INC += -I$(AGESA_ROOT)/Proc/Common
-AGESA_INC += -I$(AGESA_ROOT)/Proc/HT
-AGESA_INC += -I$(AGESA_ROOT)/Proc/CPU
-AGESA_INC += -I$(AGESA_ROOT)/Proc/CPU/Feature
-AGESA_INC += -I$(AGESA_ROOT)/Proc/CPU/Family
-AGESA_INC += -I$(AGESA_ROOT)/Proc/CPU/Family/0x16
-AGESA_INC += -I$(AGESA_ROOT)/Proc/CPU/Family/0x16/KB
-AGESA_INC += -I$(AGESA_ROOT)/Proc/Mem
-AGESA_INC += -I$(AGESA_ROOT)/Proc/Mem/NB/KB
-AGESA_INC += -I$(AGESA_ROOT)/Proc/IDS
-AGESA_INC += -I$(AGESA_ROOT)/Proc/IDS/Family
-AGESA_INC += -I$(AGESA_ROOT)/Proc/IDS/Family/0x16
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Common
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Modules/GnbGfxConfig
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Modules/GnbPcieConfig
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Modules/GnbGfxInitLibV1
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Modules/GnbPcieInitLibV1
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Modules/GnbNbInitLibV1
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Modules/GnbInitKB
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Modules/GnbSbLib
-AGESA_INC += -I$(AGESA_ROOT)/Proc/IDS/Family/0x16/KB
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Modules/GnbCommonLib
-AGESA_INC += -I$(AGESA_ROOT)/Proc/Mem/Main
-AGESA_INC += -I$(AGESA_ROOT)/Proc/IDS/Library
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Modules/GnbNbInitLibV4
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Modules/GnbTable
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Modules/GnbPcieInitLibV4
-AGESA_INC += -I$(AGESA_ROOT)/Proc/Fch
-AGESA_INC += -I$(AGESA_ROOT)/Proc/Fch/Common
-AGESA_INC += -I$(AGESA_ROOT)/Proc/IDS/Debug
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Modules/GnbPcieAspm
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Modules/GnbSmuLibV7
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Modules/GnbNbInitLibV5
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Modules/GnbPcieTrainingV2
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Modules/GnbPcieInitLibV5
-AGESA_INC += -I$(AGESA_ROOT)/Proc/Mem/Feat/CRAT
-AGESA_INC += -I$(AGESA_ROOT)/Proc/GNB/Modules/GnbGfxIntTableV3
-AGESA_INC += -I$(AGESA_ROOT)/Proc/Mem/Feat/RDWR2DTRAINING
+AGESA_INC += $(AGESA_AUTOINCLUDES)
 
 AGESA_INC += -I$(src)/southbridge/amd/agesa/hudson
 
@@ -81,7 +44,6 @@ CFLAGS_x86_32 += -march=k8-sse3 -mtune=k8-sse3 -fno-zero-initialized-in-bss -fno
 CFLAGS_x86_64 += -march=k8-sse3 -mtune=k8-sse3 -fno-zero-initialized-in-bss -fno-strict-aliasing
 
 
-export AGESA_ROOT := $(AGESA_ROOT)
 export AGESA_INC  := $(AGESA_INC)
 CPPFLAGS_x86_32 += $(AGESA_INC)
 CPPFLAGS_x86_64 += $(AGESA_INC)