AGESA cimx: Move cb_types.h to vendorcode

This file mostly mimics Porting.h and should be removed.
For now, move it and use it consistently with incorrect form
as #include "cbtypes.h".

Change-Id: Ifaee2694f9f33a4da6e780b03d41bdfab9e2813e
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/21663
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>

12 files changed, 7 insertions, 15 deletions

diff --git a/src/mainboard/amd/dinar/gpio.h b/src/mainboard/amd/dinar/gpio.h
index 3ac8bfa818..e5c1fd398e 100644
--- a/src/mainboard/amd/dinar/gpio.h
+++ b/src/mainboard/amd/dinar/gpio.h
@@ -17,7 +17,7 @@
 #define _GPIO_H_
 
 #include <stdint.h>
-#include <cbtypes.h>
+#include "cbtypes.h"
 
 #define Mmio_Address( BaseAddr, Register ) \
 	( (UINTN)BaseAddr + \
diff --git a/src/mainboard/amd/torpedo/gpio.h b/src/mainboard/amd/torpedo/gpio.h
index 0df5d501b1..04897f5c24 100644
--- a/src/mainboard/amd/torpedo/gpio.h
+++ b/src/mainboard/amd/torpedo/gpio.h
@@ -17,7 +17,7 @@
 #define _GPIO_H_
 
 #include <stdint.h>
-#include <cpu/amd/common/cbtypes.h>
+#include "cbtypes.h"
 
 #define Mmio_Address( BaseAddr, Register ) \
 	  ( (UINTN)BaseAddr + \
diff --git a/src/northbridge/amd/cimx/rd890/NbPlatform.h b/src/northbridge/amd/cimx/rd890/NbPlatform.h
index 3efa84d685..1a8c40e0cb 100644
--- a/src/northbridge/amd/cimx/rd890/NbPlatform.h
+++ b/src/northbridge/amd/cimx/rd890/NbPlatform.h
@@ -81,7 +81,7 @@
 
 
 #define CIMX_S3_SAVE 1
-#include <cpu/amd/common/cbtypes.h>
+#include "cbtypes.h"
 #include <console/console.h>
 
 #include "amd.h" //cimx typedef
diff --git a/src/northbridge/amd/cimx/rd890/amd.h b/src/northbridge/amd/cimx/rd890/amd.h
index a49aaf2e45..898966df6c 100644
--- a/src/northbridge/amd/cimx/rd890/amd.h
+++ b/src/northbridge/amd/cimx/rd890/amd.h
@@ -16,7 +16,7 @@
 #ifndef _AMD_H_
 #define _AMD_H_
 
-#include <cpu/amd/common/cbtypes.h>
+#include "cbtypes.h"
 
 #define VOLATILE  volatile
 #define CALLCONV
diff --git a/src/southbridge/amd/cimx/sb700/Platform.h b/src/southbridge/amd/cimx/sb700/Platform.h
index 08cff4ad71..f83ec2375d 100644
--- a/src/southbridge/amd/cimx/sb700/Platform.h
+++ b/src/southbridge/amd/cimx/sb700/Platform.h
@@ -18,7 +18,7 @@
 
 #pragma pack(push,1)
 
-#include <cpu/amd/common/cbtypes.h>
+#include "cbtypes.h"
 #include <console/console.h>
 #include <commonlib/loglevel.h>
 #ifdef NULL
diff --git a/src/vendorcode/amd/cimx/rd890/Makefile.inc b/src/vendorcode/amd/cimx/rd890/Makefile.inc
index 670d26c5e8..c0e3534047 100644
--- a/src/vendorcode/amd/cimx/rd890/Makefile.inc
+++ b/src/vendorcode/amd/cimx/rd890/Makefile.inc
@@ -28,11 +28,9 @@
 #*****************************************************************************
 
 CPPFLAGS_x86_32 += -I$(src)/northbridge/amd/cimx/rd890
-CPPFLAGS_x86_32 += -I$(src)/include/cpu/amd/common
 CPPFLAGS_x86_32 += -I$(src)/vendorcode/amd/cimx/rd890
 
 CPPFLAGS_x86_64 += -I$(src)/northbridge/amd/cimx/rd890
-CPPFLAGS_x86_64 += -I$(src)/include/cpu/amd/common
 CPPFLAGS_x86_64 += -I$(src)/vendorcode/amd/cimx/rd890
 
 romstage-y += amdAcpiIvrs.c
diff --git a/src/vendorcode/amd/cimx/sb700/Makefile.inc b/src/vendorcode/amd/cimx/sb700/Makefile.inc
index 1d7ccd1494..b96fbb8b1a 100644
--- a/src/vendorcode/amd/cimx/sb700/Makefile.inc
+++ b/src/vendorcode/amd/cimx/sb700/Makefile.inc
@@ -28,11 +28,9 @@
 #*****************************************************************************
 
 CPPFLAGS_x86_32 += -I$(src)/southbridge/amd/cimx/sb700
-CPPFLAGS_x86_32 += -I$(src)/include/cpu/amd/common
 CPPFLAGS_x86_32 += -I$(src)/vendorcode/amd/cimx/sb700
 
 CPPFLAGS_x86_64 += -I$(src)/southbridge/amd/cimx/sb700
-CPPFLAGS_x86_64 += -I$(src)/include/cpu/amd/common
 CPPFLAGS_x86_64 += -I$(src)/vendorcode/amd/cimx/sb700
 
 romstage-y += ACPILIB.c
diff --git a/src/vendorcode/amd/cimx/sb800/AMDSBLIB.h b/src/vendorcode/amd/cimx/sb800/AMDSBLIB.h
index a50cda4427..3b09dac71c 100644
--- a/src/vendorcode/amd/cimx/sb800/AMDSBLIB.h
+++ b/src/vendorcode/amd/cimx/sb800/AMDSBLIB.h
@@ -46,7 +46,7 @@
 #ifndef __VENDORCODE_AMD_CIMX_SB800_AMDSBLIB_H__
 #define __VENDORCODE_AMD_CIMX_SB800_AMDSBLIB_H__
 
-#include <cpu/amd/common/cbtypes.h>
+#include "cbtypes.h"
 
 //AMDSBLIB Routines
 
diff --git a/src/vendorcode/amd/cimx/sb800/Makefile.inc b/src/vendorcode/amd/cimx/sb800/Makefile.inc
index d7cf136e11..86a51f77f9 100644
--- a/src/vendorcode/amd/cimx/sb800/Makefile.inc
+++ b/src/vendorcode/amd/cimx/sb800/Makefile.inc
@@ -14,11 +14,9 @@
 #
 
 CPPFLAGS_x86_32 += -I$(src)/southbridge/amd/cimx/sb800
-CPPFLAGS_x86_32 += -I$(src)/include/cpu/amd/common
 CPPFLAGS_x86_32 += -I$(src)/vendorcode/amd/cimx/sb800
 
 CPPFLAGS_x86_64 += -I$(src)/southbridge/amd/cimx/sb800
-CPPFLAGS_x86_64 += -I$(src)/include/cpu/amd/common
 CPPFLAGS_x86_64 += -I$(src)/vendorcode/amd/cimx/sb800
 
 romstage-y += ACPILIB.c
diff --git a/src/vendorcode/amd/cimx/sb900/Makefile.inc b/src/vendorcode/amd/cimx/sb900/Makefile.inc
index f82e674c84..0c62cdde14 100644
--- a/src/vendorcode/amd/cimx/sb900/Makefile.inc
+++ b/src/vendorcode/amd/cimx/sb900/Makefile.inc
@@ -14,11 +14,9 @@
 #
 
 CPPFLAGS_x86_32 += -I$(src)/southbridge/amd/cimx/sb900
-CPPFLAGS_x86_32 += -I$(src)/include/cpu/amd/common
 CPPFLAGS_x86_32 += -I$(src)/vendorcode/amd/cimx/sb900
 
 CPPFLAGS_x86_64 += -I$(src)/southbridge/amd/cimx/sb900
-CPPFLAGS_x86_64 += -I$(src)/include/cpu/amd/common
 CPPFLAGS_x86_64 += -I$(src)/vendorcode/amd/cimx/sb900
 
 romstage-y += AcpiLib.c
diff --git a/src/vendorcode/amd/cimx/sb900/SbSubFun.h b/src/vendorcode/amd/cimx/sb900/SbSubFun.h
index 68574a77dc..41ce7b7a9a 100644
--- a/src/vendorcode/amd/cimx/sb900/SbSubFun.h
+++ b/src/vendorcode/amd/cimx/sb900/SbSubFun.h
@@ -40,7 +40,7 @@
 ;
 ;*********************************************************************************/
 
-#include <cpu/amd/common/cbtypes.h>
+#include "cbtypes.h"
 // Southbridge SBMAIN Routines
 
 /**
diff --git a/src/include/cpu/amd/common/cbtypes.h b/src/vendorcode/amd/include/cbtypes.h
index 4a6765d411..4a6765d411 100644
--- a/src/include/cpu/amd/common/cbtypes.h
+++ b/src/vendorcode/amd/include/cbtypes.h