[coreboot] Patch set updated for coreboot: 6cf94df cbtypes.h: Unify cbtypes.h used in AMD board's code

Vikram Narayanan (vikram186@gmail.com) gerrit at coreboot.org
Thu Apr 26 18:32:03 CEST 2012


Vikram Narayanan (vikram186 at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/912

-gerrit

commit 6cf94dfec7b4ac5cdb3716ae45726a5fa8ea0235
Author: Vikram Narayanan <vikram186 at gmail.com>
Date:   Sat Apr 21 23:47:56 2012 +0530

    cbtypes.h: Unify cbtypes.h used in AMD board's code
    
    Remove all the repeated sections of code in cbtypes.h and place it
    in a common location. Add include dir in vendor code's Makefile.
    
    Change-Id: Ida92c2a7a88e9520b84b0dcbbf37cd5c9f63f798
    Signed-off-by: Vikram Narayanan <vikram186 at gmail.com>
---
 src/include/cpu/amd/common/cbtypes.h        |   66 +++++++++++++++++++++++++
 src/mainboard/amd/torpedo/gpio.h            |    2 +-
 src/northbridge/amd/cimx/rd890/NbPlatform.h |    2 +-
 src/northbridge/amd/cimx/rd890/amd.h        |    3 +-
 src/northbridge/amd/cimx/rd890/cbtypes.h    |   71 ---------------------------
 src/southbridge/amd/cimx/sb700/Platform.h   |    2 +-
 src/southbridge/amd/cimx/sb700/cbtypes.h    |   53 --------------------
 src/southbridge/amd/cimx/sb800/cbtypes.h    |   53 --------------------
 src/southbridge/amd/cimx/sb900/cbtypes.h    |   59 ----------------------
 src/vendorcode/amd/cimx/rd890/Makefile.inc  |    1 +
 src/vendorcode/amd/cimx/sb700/Makefile.inc  |    1 +
 src/vendorcode/amd/cimx/sb800/Makefile.inc  |    1 +
 src/vendorcode/amd/cimx/sb900/Makefile.inc  |    1 +
 13 files changed, 74 insertions(+), 241 deletions(-)

diff --git a/src/include/cpu/amd/common/cbtypes.h b/src/include/cpu/amd/common/cbtypes.h
new file mode 100644
index 0000000..dd9e469
--- /dev/null
+++ b/src/include/cpu/amd/common/cbtypes.h
@@ -0,0 +1,66 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2011 Advanced Micro Devices, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+#ifndef _CBTYPES_H_
+#define _CBTYPES_H_
+
+typedef signed long long __int64;
+typedef void VOID;
+typedef unsigned int UINTN;
+typedef signed char CHAR8;
+typedef unsigned char UINT8;
+typedef unsigned short UINT16;
+typedef unsigned int UINT32;
+typedef signed int INT32;
+typedef unsigned long long UINT64;
+typedef unsigned char BOOLEAN;
+
+#define DMSG_SB_TRACE   0x02
+#define TRACE(Arguments)
+
+#ifndef TRUE
+#define TRUE  1
+#endif
+#ifndef FALSE
+#define FALSE 0
+#endif
+
+#ifndef VOLATILE
+#define VOLATILE volatile
+#endif
+#ifndef CONST
+#define CONST const
+#endif
+
+#ifndef IN
+#define IN
+#endif
+#ifndef OUT
+#define OUT
+#endif
+
+
+#ifndef STATIC
+#define STATIC static
+#endif
+#ifndef VOLATILE
+#define VOLATILE volatile
+#endif
+
+#endif
diff --git a/src/mainboard/amd/torpedo/gpio.h b/src/mainboard/amd/torpedo/gpio.h
index 45394ef..a33323e 100644
--- a/src/mainboard/amd/torpedo/gpio.h
+++ b/src/mainboard/amd/torpedo/gpio.h
@@ -27,7 +27,7 @@
 #define _GPIO_H_
 
 #include <stdint.h>
-#include <cbtypes.h>
+#include <cpu/amd/common/cbtypes.h>
 
 /*----------------------------------------------------------------------------------------
  *                   D E F I N I T I O N S    A N D    M A C R O S
diff --git a/src/northbridge/amd/cimx/rd890/NbPlatform.h b/src/northbridge/amd/cimx/rd890/NbPlatform.h
index 824057a..629e810 100644
--- a/src/northbridge/amd/cimx/rd890/NbPlatform.h
+++ b/src/northbridge/amd/cimx/rd890/NbPlatform.h
@@ -94,7 +94,7 @@
 
 
 #define CIMX_S3_SAVE 1
-#include "cbtypes.h"
+#include <cpu/amd/common/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 d99f90f..3e2e78f 100644
--- a/src/northbridge/amd/cimx/rd890/amd.h
+++ b/src/northbridge/amd/cimx/rd890/amd.h
@@ -20,8 +20,7 @@
 #ifndef _AMD_H_
 #define _AMD_H_
 
-#include "cbtypes.h"
-
+#include <cpu/amd/common/cbtypes.h>
 
 #define VOLATILE  volatile
 #define CALLCONV
diff --git a/src/northbridge/amd/cimx/rd890/cbtypes.h b/src/northbridge/amd/cimx/rd890/cbtypes.h
deleted file mode 100644
index ade55d7..0000000
--- a/src/northbridge/amd/cimx/rd890/cbtypes.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2010 - 2012 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-#ifndef _CBTYPES_H_
-#define _CBTYPES_H_
-
-//#include <stdint.h>
-
-/*
-typedef int64_t __int64;
-typedef void VOID;
-typedef uint32_t UINTN;//
-typedef int8_t CHAR8;
-typedef uint8_t UINT8;
-typedef uint16_t UINT16;
-typedef uint32_t UINT32;
-typedef uint64_t UINT64;
-*/
-typedef signed long long __int64;
-typedef void VOID;
-typedef unsigned int UINTN;//
-typedef signed char CHAR8;
-typedef unsigned char UINT8;
-typedef unsigned short UINT16;
-typedef unsigned int UINT32;
-typedef signed int INT32;
-typedef unsigned long long UINT64;
-
-#define TRUE  1
-#define FALSE 0
-typedef unsigned char BOOLEAN;
-
-#ifndef VOLATILE
-#define VOLATILE volatile
-#endif
-
-#ifndef IN
-#define IN
-#endif
-#ifndef OUT
-#define OUT
-#endif
-
-//porting.h
-#ifndef CONST
-#define CONST const
-#endif
-#ifndef STATIC
-#define STATIC static
-#endif
-#ifndef VOLATILE
-#define VOLATILE volatile
-#endif
-
-#endif
diff --git a/src/southbridge/amd/cimx/sb700/Platform.h b/src/southbridge/amd/cimx/sb700/Platform.h
index 15e5b07..d70345d 100644
--- a/src/southbridge/amd/cimx/sb700/Platform.h
+++ b/src/southbridge/amd/cimx/sb700/Platform.h
@@ -22,7 +22,7 @@
 
 #pragma pack(push,1)
 
-#include "cbtypes.h"
+#include <cpu/amd/common/cbtypes.h>
 #include <console/console.h>
 #include <console/loglevel.h>
 #ifdef NULL
diff --git a/src/southbridge/amd/cimx/sb700/cbtypes.h b/src/southbridge/amd/cimx/sb700/cbtypes.h
deleted file mode 100644
index d37e1e3..0000000
--- a/src/southbridge/amd/cimx/sb700/cbtypes.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2012 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-#ifndef _CBTYPES_H_
-#define _CBTYPES_H_
-
-//#include <stdint.h>
-
-typedef signed long long __int64;
-typedef void VOID;
-typedef unsigned int UINTN;
-typedef signed char CHAR8;
-typedef unsigned char UINT8;
-typedef unsigned short UINT16;
-typedef unsigned int UINT32;
-typedef unsigned long long UINT64;
-
-#ifndef TRUE
-#define TRUE  1
-#endif
-#ifndef FALSE
-#define FALSE 0
-#endif
-typedef unsigned char BOOLEAN;
-
-#ifndef VOLATILE
-#define VOLATILE volatile
-#endif
-
-#ifndef IN
-#define IN
-#endif
-#ifndef OUT
-#define OUT
-#endif
-
-#endif
diff --git a/src/southbridge/amd/cimx/sb800/cbtypes.h b/src/southbridge/amd/cimx/sb800/cbtypes.h
deleted file mode 100644
index 03a0854..0000000
--- a/src/southbridge/amd/cimx/sb800/cbtypes.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2011 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-#ifndef _CBTYPES_H_
-#define _CBTYPES_H_
-
-//#include <stdint.h>
-
-typedef signed long long __int64;
-typedef void VOID;
-typedef unsigned int UINTN;
-typedef signed char CHAR8;
-typedef unsigned char UINT8;
-typedef unsigned short UINT16;
-typedef unsigned int UINT32;
-typedef unsigned long long UINT64;
-
-#ifndef TRUE
-#define TRUE  1
-#endif
-#ifndef FALSE
-#define FALSE 0
-#endif
-typedef unsigned char BOOLEAN;
-
-#ifndef VOLATILE
-#define VOLATILE volatile
-#endif
-
-#ifndef IN
-#define IN
-#endif
-#ifndef OUT
-#define OUT
-#endif
-
-#endif
diff --git a/src/southbridge/amd/cimx/sb900/cbtypes.h b/src/southbridge/amd/cimx/sb900/cbtypes.h
deleted file mode 100644
index 4c97a33..0000000
--- a/src/southbridge/amd/cimx/sb900/cbtypes.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2011 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-#ifndef _CBTYPES_H_
-#define _CBTYPES_H_
-
-//#include <stdint.h>
-
-typedef signed long long __int64;
-typedef void VOID;
-typedef unsigned int UINTN;
-typedef signed char CHAR8;
-typedef unsigned char UINT8;
-typedef unsigned short UINT16;
-typedef unsigned int UINT32;
-typedef unsigned long long UINT64;
-typedef unsigned char BOOLEAN;
-
-#define DMSG_SB_TRACE   0x02
-#define TRACE(Arguments)
-
-#ifndef TRUE
-#define TRUE  1
-#endif
-#ifndef FALSE
-#define FALSE 0
-#endif
-
-#ifndef VOLATILE
-#define VOLATILE volatile
-#endif
-#ifndef CONST
-#define CONST const
-#endif
-
-#ifndef IN
-#define IN
-#endif
-#ifndef OUT
-#define OUT
-#endif
-
-#endif
diff --git a/src/vendorcode/amd/cimx/rd890/Makefile.inc b/src/vendorcode/amd/cimx/rd890/Makefile.inc
index 8a05570..feeb2cd 100644
--- a/src/vendorcode/amd/cimx/rd890/Makefile.inc
+++ b/src/vendorcode/amd/cimx/rd890/Makefile.inc
@@ -32,6 +32,7 @@ CIMX_ROOT = $(src)/vendorcode/amd/cimx
 
 NB_CIMX_INC  = -I$(src)/mainboard/$(MAINBOARDDIR)
 NB_CIMX_INC  += -I$(src)/northbridge/amd/cimx/rd890
+NB_CIMX_INC  += -I$(src)/include/cpu/amd/common
 NB_CIMX_INC  += -I$(CIMX_ROOT)/rd890
 
 romstage-y += amdAcpiIvrs.c
diff --git a/src/vendorcode/amd/cimx/sb700/Makefile.inc b/src/vendorcode/amd/cimx/sb700/Makefile.inc
index 8954133..10d03e6 100644
--- a/src/vendorcode/amd/cimx/sb700/Makefile.inc
+++ b/src/vendorcode/amd/cimx/sb700/Makefile.inc
@@ -32,6 +32,7 @@ CIMX_ROOT = $(src)/vendorcode/amd/cimx
 
 SB_CIMX_INC  = -I$(src)/mainboard/$(MAINBOARDDIR)
 SB_CIMX_INC  += -I$(src)/southbridge/amd/cimx/sb700
+SB_CIMX_INC  += -I$(src)/include/cpu/amd/common
 SB_CIMX_INC  += -I$(CIMX_ROOT)/sb700
 
 romstage-y += ACPILIB.c
diff --git a/src/vendorcode/amd/cimx/sb800/Makefile.inc b/src/vendorcode/amd/cimx/sb800/Makefile.inc
index 7badca5..00ba471 100644
--- a/src/vendorcode/amd/cimx/sb800/Makefile.inc
+++ b/src/vendorcode/amd/cimx/sb800/Makefile.inc
@@ -22,6 +22,7 @@ CIMX_ROOT = $(src)/vendorcode/amd/cimx
 
 CIMX_INC  = -I$(src)/mainboard/$(MAINBOARDDIR)
 CIMX_INC  += -I$(src)/southbridge/amd/cimx/sb800
+CIMX_INC  += -I$(src)/include/cpu/amd/common
 CIMX_INC  += -I$(CIMX_ROOT)/sb800
 
 romstage-y += ACPILIB.c
diff --git a/src/vendorcode/amd/cimx/sb900/Makefile.inc b/src/vendorcode/amd/cimx/sb900/Makefile.inc
index 76b610f..e29bdc9 100755
--- a/src/vendorcode/amd/cimx/sb900/Makefile.inc
+++ b/src/vendorcode/amd/cimx/sb900/Makefile.inc
@@ -22,6 +22,7 @@ CIMX_ROOT = $(src)/vendorcode/amd/cimx
 
 CIMX_INC  = -I$(src)/mainboard/$(MAINBOARDDIR)
 CIMX_INC  += -I$(src)/southbridge/amd/cimx/sb900
+CIMX_INC  += -I$(src)/include/cpu/amd/common
 CIMX_INC  += -I$(CIMX_ROOT)/sb900
 
 romstage-y += AcpiLib.c




More information about the coreboot mailing list