diff options
| author | Vikram Narayanan <vikram186@gmail.com> | 2012-04-21 23:47:56 +0530 |
|---|---|---|
| committer | Marc Jones <marcj303@gmail.com> | 2012-05-24 17:38:42 +0200 |
| commit | 2f00ce3d964e56e2bf3f45033451f0e44c69d78d (patch) | |
| tree | a59d95c8d16b5e67f09487a451f7518bbcebbf25 /src/northbridge/amd/cimx | |
| parent | ad422c0a7a90093fd14b386cf8f0802fce64b2cb (diff) | |
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@gmail.com>
Reviewed-on: http://review.coreboot.org/912
Tested-by: build bot (Jenkins)
Reviewed-by: Marc Jones <marcj303@gmail.com>
Diffstat (limited to 'src/northbridge/amd/cimx')
| -rw-r--r-- | src/northbridge/amd/cimx/rd890/NbPlatform.h | 2 | ||||
| -rw-r--r-- | src/northbridge/amd/cimx/rd890/amd.h | 3 | ||||
| -rw-r--r-- | src/northbridge/amd/cimx/rd890/cbtypes.h | 71 |
3 files changed, 2 insertions, 74 deletions
diff --git a/src/northbridge/amd/cimx/rd890/NbPlatform.h b/src/northbridge/amd/cimx/rd890/NbPlatform.h index 824057ad05..629e81007b 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 d99f90f575..3e2e78f571 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 ade55d7136..0000000000 --- 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 |