[coreboot-gerrit] New patch to review for coreboot: a3bb57e Fix src/northbridge 'RAMINIT_H' header guards
HAOUAS Elyes (ehaouas@noos.fr)
gerrit at coreboot.org
Sat Aug 2 12:36:54 CEST 2014
HAOUAS Elyes (ehaouas at noos.fr) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6464
-gerrit
commit a3bb57ec0eeb120649650defb28f4759d99465b9
Author: Elyes HAOUAS <ehaouas at noos.fr>
Date: Sat Aug 2 12:31:56 2014 +0200
Fix src/northbridge 'RAMINIT_H' header guards
Change-Id: I46db08a575a2320f8fe00361ab7d72b95e86eed6
Signed-off-by: Elyes HAOUAS <ehaouas at noos.fr>
---
src/northbridge/amd/amdfam10/raminit.h | 7 +++----
src/northbridge/amd/amdk8/raminit.h | 6 +++---
src/northbridge/amd/gx1/raminit.h | 6 +++---
src/northbridge/amd/gx2/raminit.h | 6 +++---
src/northbridge/amd/lx/raminit.h | 6 +++---
src/northbridge/intel/e7501/raminit.h | 6 +++---
src/northbridge/intel/e7505/raminit.h | 6 +++---
src/northbridge/intel/e7520/raminit.h | 6 +++---
src/northbridge/intel/e7525/raminit.h | 6 +++---
src/northbridge/intel/fsp_sandybridge/raminit.h | 6 +++---
src/northbridge/intel/haswell/raminit.h | 6 +++---
src/northbridge/intel/i440bx/raminit.h | 6 +++---
src/northbridge/intel/i440lx/raminit.h | 6 +++---
src/northbridge/intel/i945/raminit.h | 6 +++---
src/northbridge/intel/nehalem/raminit.h | 6 +++---
src/northbridge/intel/sandybridge/raminit.h | 6 +++---
src/northbridge/intel/sandybridge/raminit_native.h | 6 +++---
src/northbridge/intel/sch/raminit.h | 6 +++---
src/northbridge/via/cn400/raminit.h | 6 +++---
src/northbridge/via/cn700/raminit.h | 6 +++---
src/northbridge/via/cx700/raminit.h | 6 +++---
src/northbridge/via/vt8601/raminit.h | 6 +++---
src/northbridge/via/vt8623/raminit.h | 6 +++---
src/northbridge/via/vx800/raminit.h | 6 +++---
24 files changed, 72 insertions(+), 73 deletions(-)
diff --git a/src/northbridge/amd/amdfam10/raminit.h b/src/northbridge/amd/amdfam10/raminit.h
index 8ecdac3..a93e2f0 100644
--- a/src/northbridge/amd/amdfam10/raminit.h
+++ b/src/northbridge/amd/amdfam10/raminit.h
@@ -17,8 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef RAMINIT_H
-#define RAMINIT_H
+#ifndef AMDFAM10_RAMINIT_H
+#define AMDFAM10_RAMINIT_H
#if 0
#if CONFIG_DIMM_SUPPORT==0x0110
@@ -69,5 +69,4 @@ struct mem_controller {
//#endif
-
-#endif
+#endif /* AMDFAM10_RAMINIT_H */
diff --git a/src/northbridge/amd/amdk8/raminit.h b/src/northbridge/amd/amdk8/raminit.h
index 9da8417..f428029 100644
--- a/src/northbridge/amd/amdk8/raminit.h
+++ b/src/northbridge/amd/amdk8/raminit.h
@@ -1,5 +1,5 @@
-#ifndef RAMINIT_H
-#define RAMINIT_H
+#ifndef AMDK8_RAMINIT_H
+#define AMDK8_RAMINIT_H
#define NODE_NUMS 8
@@ -21,4 +21,4 @@ void sdram_initialize(int controllers, const struct mem_controller *ctrl, void *
void sdram_initialize(int controllers, const struct mem_controller *ctrl);
#endif
-#endif /* RAMINIT_H */
+#endif /* AMDK8_RAMINIT_H */
diff --git a/src/northbridge/amd/gx1/raminit.h b/src/northbridge/amd/gx1/raminit.h
index 6e40683..4e0c7fc 100644
--- a/src/northbridge/amd/gx1/raminit.h
+++ b/src/northbridge/amd/gx1/raminit.h
@@ -1,5 +1,5 @@
-#ifndef RAMINIT_H
-#define RAMINIT_H
+#ifndef GX1_RAMINIT_H
+#define GX1_RAMINIT_H
#define DIMM_SOCKETS 4
struct mem_controller {
@@ -8,4 +8,4 @@ struct mem_controller {
};
-#endif /* RAMINIT_H */
+#endif /* GX1_RAMINIT_H */
diff --git a/src/northbridge/amd/gx2/raminit.h b/src/northbridge/amd/gx2/raminit.h
index a49bf20..4464dd7 100644
--- a/src/northbridge/amd/gx2/raminit.h
+++ b/src/northbridge/amd/gx2/raminit.h
@@ -1,5 +1,5 @@
-#ifndef RAMINIT_H
-#define RAMINIT_H
+#ifndef GX2_RAMINIT_H
+#define GX2_RAMINIT_H
#define DIMM_SOCKETS 2
@@ -9,4 +9,4 @@ struct mem_controller {
void sdram_initialize(int controllers, const struct mem_controller *ctrl);
-#endif /* RAMINIT_H */
+#endif /* GX2_RAMINIT_H */
diff --git a/src/northbridge/amd/lx/raminit.h b/src/northbridge/amd/lx/raminit.h
index 01d25e9..8bff8bc 100644
--- a/src/northbridge/amd/lx/raminit.h
+++ b/src/northbridge/amd/lx/raminit.h
@@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef RAMINIT_H
-#define RAMINIT_H
+#ifndef AMD_LX_RAMINIT_H
+#define AMD_LX_RAMINIT_H
#define DIMM_SOCKETS 2
@@ -36,4 +36,4 @@ void sdram_initialize(int controllers, const struct mem_controller *ctrl);
/* mainboard specific */
int spd_read_byte(unsigned device, unsigned address);
-#endif
+#endif /* AMD_LX_RAMINIT_H */
diff --git a/src/northbridge/intel/e7501/raminit.h b/src/northbridge/intel/e7501/raminit.h
index 05c3889..b1e6ef7 100644
--- a/src/northbridge/intel/e7501/raminit.h
+++ b/src/northbridge/intel/e7501/raminit.h
@@ -1,5 +1,5 @@
-#ifndef RAMINIT_H
-#define RAMINIT_H
+#ifndef E7501_RAMINIT_H
+#define E7501_RAMINIT_H
#define MAX_DIMM_SOCKETS_PER_CHANNEL 4
#define MAX_NUM_CHANNELS 2
@@ -17,4 +17,4 @@ struct mem_controller {
void sdram_initialize(int controllers, const struct mem_controller *ctrl);
-#endif /* RAMINIT_H */
+#endif /* E7501_RAMINIT_H */
diff --git a/src/northbridge/intel/e7505/raminit.h b/src/northbridge/intel/e7505/raminit.h
index 8eb4990..c64569e 100644
--- a/src/northbridge/intel/e7505/raminit.h
+++ b/src/northbridge/intel/e7505/raminit.h
@@ -1,5 +1,5 @@
-#ifndef RAMINIT_H
-#define RAMINIT_H
+#ifndef E7505_RAMINIT_H
+#define E7505_RAMINIT_H
#define MAX_DIMM_SOCKETS_PER_CHANNEL 4
#define MAX_NUM_CHANNELS 2
@@ -24,4 +24,4 @@ int e7505_mch_is_ready(void);
/* Mainboard exports this. */
int spd_read_byte(unsigned device, unsigned address);
-#endif /* RAMINIT_H */
+#endif /* E7505_RAMINIT_H */
diff --git a/src/northbridge/intel/e7520/raminit.h b/src/northbridge/intel/e7520/raminit.h
index 9fcc380..4d8c2d0 100644
--- a/src/northbridge/intel/e7520/raminit.h
+++ b/src/northbridge/intel/e7520/raminit.h
@@ -1,5 +1,5 @@
-#ifndef RAMINIT_H
-#define RAMINIT_H
+#ifndef E7520_RAMINIT_H
+#define E7520_RAMINIT_H
#define DIMM_SOCKETS 4
struct mem_controller {
@@ -9,4 +9,4 @@ struct mem_controller {
u16 channel1[DIMM_SOCKETS];
};
-#endif /* RAMINIT_H */
+#endif /* E7520_RAMINIT_H */
diff --git a/src/northbridge/intel/e7525/raminit.h b/src/northbridge/intel/e7525/raminit.h
index 183ace8..6077321 100644
--- a/src/northbridge/intel/e7525/raminit.h
+++ b/src/northbridge/intel/e7525/raminit.h
@@ -1,5 +1,5 @@
-#ifndef RAMINIT_H
-#define RAMINIT_H
+#ifndef E7525_RAMINIT_H
+#define E7525_RAMINIT_H
#define DIMM_SOCKETS 4
struct mem_controller {
@@ -9,4 +9,4 @@ struct mem_controller {
uint16_t channel1[DIMM_SOCKETS];
};
-#endif /* RAMINIT_H */
+#endif /* E7525_RAMINIT_H */
diff --git a/src/northbridge/intel/fsp_sandybridge/raminit.h b/src/northbridge/intel/fsp_sandybridge/raminit.h
index 73e563f..28e2f52 100644
--- a/src/northbridge/intel/fsp_sandybridge/raminit.h
+++ b/src/northbridge/intel/fsp_sandybridge/raminit.h
@@ -17,9 +17,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef RAMINIT_H
-#define RAMINIT_H
+#ifndef FSP_SANDYBRIDGE_RAMINIT_H
+#define FSP_SANDYBRIDGE_RAMINIT_H
void report_memory_config(void);
-#endif /* RAMINIT_H */
+#endif /* FSP_SANDYBRIDGE_RAMINIT_H */
diff --git a/src/northbridge/intel/haswell/raminit.h b/src/northbridge/intel/haswell/raminit.h
index 706c286..fe80605 100644
--- a/src/northbridge/intel/haswell/raminit.h
+++ b/src/northbridge/intel/haswell/raminit.h
@@ -17,8 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef RAMINIT_H
-#define RAMINIT_H
+#ifndef HASWELL_RAMINIT_H
+#define HASWELL_RAMINIT_H
#include "pei_data.h"
@@ -27,4 +27,4 @@ int fixup_haswell_errata(void);
/* save_mrc_data() must be called after cbmem has been initialized. */
void save_mrc_data(struct pei_data *pei_data);
-#endif /* RAMINIT_H */
+#endif /* HASWELL_RAMINIT_H */
diff --git a/src/northbridge/intel/i440bx/raminit.h b/src/northbridge/intel/i440bx/raminit.h
index a92c892..dcbee35 100644
--- a/src/northbridge/intel/i440bx/raminit.h
+++ b/src/northbridge/intel/i440bx/raminit.h
@@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef RAMINIT_H
-#define RAMINIT_H
+#ifndef I440BX_RAMINIT_H
+#define I440BX_RAMINIT_H
/* The 440BX supports up to four (single- or double-sided) DIMMs. */
#define DIMM_SOCKETS 4
@@ -36,4 +36,4 @@ void dump_pci_device(unsigned dev);
#else
#define dump_spd_registers()
#endif
-#endif /* RAMINIT_H */
+#endif /* I440BX_RAMINIT_H */
diff --git a/src/northbridge/intel/i440lx/raminit.h b/src/northbridge/intel/i440lx/raminit.h
index 3b906e9..8482a38 100644
--- a/src/northbridge/intel/i440lx/raminit.h
+++ b/src/northbridge/intel/i440lx/raminit.h
@@ -19,10 +19,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef RAMINIT_H
-#define RAMINIT_H
+#ifndef I440LX_RAMINIT_H
+#define I440LX_RAMINIT_H
/* The 440LX supports up to four (single- or double-sided) DIMMs. */
#define DIMM_SOCKETS 4
-#endif /* RAMINIT_H */
+#endif /* I440LX_RAMINIT_H */
diff --git a/src/northbridge/intel/i945/raminit.h b/src/northbridge/intel/i945/raminit.h
index 9eb4193..e20e2d1 100644
--- a/src/northbridge/intel/i945/raminit.h
+++ b/src/northbridge/intel/i945/raminit.h
@@ -17,8 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef RAMINIT_H
-#define RAMINIT_H
+#ifndef I945_RAMINIT_H
+#define I945_RAMINIT_H
#define DIMM_SOCKETS 2
@@ -75,4 +75,4 @@ void udelay(u32 us);
#if CONFIG_DEBUG_RAM_SETUP
void sdram_dump_mchbar_registers(void);
#endif
-#endif /* RAMINIT_H */
+#endif /* I945_RAMINIT_H */
diff --git a/src/northbridge/intel/nehalem/raminit.h b/src/northbridge/intel/nehalem/raminit.h
index 0485694..9400a26 100644
--- a/src/northbridge/intel/nehalem/raminit.h
+++ b/src/northbridge/intel/nehalem/raminit.h
@@ -17,8 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef RAMINIT_H
-#define RAMINIT_H
+#ifndef NEHALEM_RAMINIT_H
+#define NEHALEM_RAMINIT_H
#include "nehalem.h"
@@ -32,4 +32,4 @@ void chipset_init(const int s3resume);
*/
void raminit(const int s3resume, const u8 *spd_addrmap);
-#endif /* RAMINIT_H */
+#endif /* NEHALEM_RAMINIT_H */
diff --git a/src/northbridge/intel/sandybridge/raminit.h b/src/northbridge/intel/sandybridge/raminit.h
index c3b1c2a..2785cff 100644
--- a/src/northbridge/intel/sandybridge/raminit.h
+++ b/src/northbridge/intel/sandybridge/raminit.h
@@ -17,8 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef RAMINIT_H
-#define RAMINIT_H
+#ifndef SANDYBRIDGE_RAMINIT_H
+#define SANDYBRIDGE_RAMINIT_H
#include "pei_data.h"
@@ -33,4 +33,4 @@ void sdram_initialize(struct pei_data *pei_data);
void save_mrc_data(struct pei_data *pei_data);
int fixup_sandybridge_errata(void);
-#endif /* RAMINIT_H */
+#endif /* SANDYBRIDGE_RAMINIT_H */
diff --git a/src/northbridge/intel/sandybridge/raminit_native.h b/src/northbridge/intel/sandybridge/raminit_native.h
index 7ed75ff..0cab066 100644
--- a/src/northbridge/intel/sandybridge/raminit_native.h
+++ b/src/northbridge/intel/sandybridge/raminit_native.h
@@ -17,8 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef RAMINIT_H
-#define RAMINIT_H
+#ifndef RAMINIT_NATIVE_H
+#define RAMINIT_NATIVE_H
#include <device/dram/ddr3.h>
@@ -26,4 +26,4 @@
void init_dram_ddr3(spd_raw_data *spds, int mobile, int min_tck, int s3resume);
void read_spd(spd_raw_data *spd, u8 addr);
-#endif /* RAMINIT_H */
+#endif /* RAMINIT_NATIVE_H */
diff --git a/src/northbridge/intel/sch/raminit.h b/src/northbridge/intel/sch/raminit.h
index f139490..bcddb03 100644
--- a/src/northbridge/intel/sch/raminit.h
+++ b/src/northbridge/intel/sch/raminit.h
@@ -17,8 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef RAMINIT_H
-#define RAMINIT_H
+#ifndef SCH_RAMINIT_H
+#define SCH_RAMINIT_H
/**
* Bit Equates
@@ -179,4 +179,4 @@ struct sys_info {
void sdram_initialize(int boot_mode);
-#endif /* RAMINIT_H */
+#endif /* SCH_RAMINIT_H */
diff --git a/src/northbridge/via/cn400/raminit.h b/src/northbridge/via/cn400/raminit.h
index 89ea0d6..df98d60 100644
--- a/src/northbridge/via/cn400/raminit.h
+++ b/src/northbridge/via/cn400/raminit.h
@@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef RAMINIT_H
-#define RAMINIT_H
+#ifndef CN400_RAMINIT_H
+#define CN400_RAMINIT_H
#define DIMM_SOCKETS 1 /* Only one works, for now. */
@@ -28,4 +28,4 @@ struct mem_controller {
u8 channel0[DIMM_SOCKETS];
};
-#endif
+#endif /* CN400_RAMINIT_H */
diff --git a/src/northbridge/via/cn700/raminit.h b/src/northbridge/via/cn700/raminit.h
index 89ea0d6..f58d7ed 100644
--- a/src/northbridge/via/cn700/raminit.h
+++ b/src/northbridge/via/cn700/raminit.h
@@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef RAMINIT_H
-#define RAMINIT_H
+#ifndef CN700_RAMINIT_H
+#define CN700_RAMINIT_H
#define DIMM_SOCKETS 1 /* Only one works, for now. */
@@ -28,4 +28,4 @@ struct mem_controller {
u8 channel0[DIMM_SOCKETS];
};
-#endif
+#endif /* CN700_RAMINIT_H */
diff --git a/src/northbridge/via/cx700/raminit.h b/src/northbridge/via/cx700/raminit.h
index 98e21f0..30434ba 100644
--- a/src/northbridge/via/cx700/raminit.h
+++ b/src/northbridge/via/cx700/raminit.h
@@ -17,12 +17,12 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef RAMINIT_H
-#define RAMINIT_H
+#ifndef CX700_RAMINIT_H
+#define CX700_RAMINIT_H
#define DIMM_SOCKETS 2
struct mem_controller {
u16 channel0[DIMM_SOCKETS];
};
-#endif
+#endif /* CX700_RAMINIT_H */
diff --git a/src/northbridge/via/vt8601/raminit.h b/src/northbridge/via/vt8601/raminit.h
index b6d2339..de94452 100644
--- a/src/northbridge/via/vt8601/raminit.h
+++ b/src/northbridge/via/vt8601/raminit.h
@@ -1,8 +1,8 @@
-#ifndef RAMINIT_H
-#define RAMINIT_H
+#ifndef VT8601_RAMINIT_H
+#define VT8601_RAMINIT_H
struct mem_controller {
int empty;
};
-#endif /* RAMINIT_H */
+#endif /* VT8601_RAMINIT_H */
diff --git a/src/northbridge/via/vt8623/raminit.h b/src/northbridge/via/vt8623/raminit.h
index b6d2339..c41b4fa 100644
--- a/src/northbridge/via/vt8623/raminit.h
+++ b/src/northbridge/via/vt8623/raminit.h
@@ -1,8 +1,8 @@
-#ifndef RAMINIT_H
-#define RAMINIT_H
+#ifndef VT8623_RAMINIT_H
+#define VT8623_RAMINIT_H
struct mem_controller {
int empty;
};
-#endif /* RAMINIT_H */
+#endif /* VT8623_RAMINIT_H */
diff --git a/src/northbridge/via/vx800/raminit.h b/src/northbridge/via/vx800/raminit.h
index 4c4990c..df3fa5d 100644
--- a/src/northbridge/via/vx800/raminit.h
+++ b/src/northbridge/via/vx800/raminit.h
@@ -17,8 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef RAMINIT_H
-#define RAMINIT_H
+#ifndef VX800_RAMINIT_H
+#define VX800_RAMINIT_H
#define MEMCTRL PCI_DEV(0,0,3)
-#endif /* RAMINIT_H */
+#endif /* VX800_RAMINIT_H */
More information about the coreboot-gerrit
mailing list