GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Vikram Narayanan 2012-04-21 23:47:56 +05:30 committed by Marc Jones
parent ad422c0a7a
commit 2f00ce3d96
12 changed files with 17 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/southbridge/amd/cimx/sb900/cbtypes.h → src/include/cpu/amd/common/cbtypes.h
View File

@ -20,8 +20,6 @@
#ifndef _CBTYPES_H_
#define _CBTYPES_H_
//#include <stdint.h>
typedef signed long long __int64;
typedef void VOID;
typedef unsigned int UINTN;
@ -29,6 +27,7 @@ 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;
@ -56,4 +55,12 @@ typedef unsigned char BOOLEAN;
#define OUT
#endif
#ifndef STATIC
#define STATIC static
#endif
#ifndef VOLATILE
#define VOLATILE volatile
#endif
#endif

2
src/mainboard/amd/torpedo/gpio.h
View File

@ -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

2
src/northbridge/amd/cimx/rd890/NbPlatform.h
View File

@ -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

3
src/northbridge/amd/cimx/rd890/amd.h
View File

@ -20,8 +20,7 @@
#ifndef _AMD_H_
#define _AMD_H_
#include "cbtypes.h"
#include <cpu/amd/common/cbtypes.h>
#define VOLATILE volatile
#define CALLCONV

71
src/northbridge/amd/cimx/rd890/cbtypes.h
View File

@ -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

2
src/southbridge/amd/cimx/sb700/Platform.h
View File

@ -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

53
src/southbridge/amd/cimx/sb700/cbtypes.h
View File

@ -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

53
src/southbridge/amd/cimx/sb800/cbtypes.h
View File

@ -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

1
src/vendorcode/amd/cimx/rd890/Makefile.inc
View File

@ -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

1
src/vendorcode/amd/cimx/sb700/Makefile.inc
View File

@ -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

1
src/vendorcode/amd/cimx/sb800/Makefile.inc
View File

@ -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

1
src/vendorcode/amd/cimx/sb900/Makefile.inc
View File

@ -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