[coreboot] New patch to review for coreboot: 7bbe683 Inagua+children: use board name only where code is actually board specific

Jens Rottmann (JRottmann@LiPPERTembedded.de) gerrit at coreboot.org
Wed Feb 20 21:45:06 CET 2013


Jens Rottmann (JRottmann at LiPPERTembedded.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2464

-gerrit

commit 7bbe6834d958cfbc5a2272187bca77dc4e6485bf
Author: Jens Rottmann <JRottmann at LiPPERTembedded.de>
Date:   Wed Feb 20 21:24:20 2013 +0100

    Inagua+children: use board name only where code is actually board specific
    
    Inagua & co. mention the board name in several places which are really not
    that board specific.  For example dsdt.asl for Persimmon and South Station
    would be identical - apart from the board name at the top.  Changed that to
    "COREBOOT" like many other boards do it.  Sometimes people even forget to
    change it:  Union Station's platform_cfg.h starts with "#ifndef
    _PERSIMMON_CFG_H_".  Funny.  Changed that to "_PLATFORM_CFG_H_" everywhere.
    
    This patch reduces unnecessary differences between AMD Inagua, Persimmon,
    Union Station, South Station and Asrock E350M1, making them a little bit
    easier to compare.
    
    Change-Id: Ida15fa6a7adfc770240ac30e795946000dae3f16
    Signed-off-by: Jens Rottmann <JRottmann at LiPPERTembedded.de>
---
 src/mainboard/amd/inagua/dsdt.asl              |  2 +-
 src/mainboard/amd/inagua/mainboard.c           | 10 +++++-----
 src/mainboard/amd/inagua/platform_cfg.h        |  4 ++--
 src/mainboard/amd/persimmon/dsdt.asl           |  2 +-
 src/mainboard/amd/persimmon/mainboard.c        | 10 +++++-----
 src/mainboard/amd/persimmon/platform_cfg.h     | 10 +++++-----
 src/mainboard/amd/south_station/dsdt.asl       |  2 +-
 src/mainboard/amd/south_station/mainboard.c    | 10 +++++-----
 src/mainboard/amd/south_station/platform_cfg.h |  4 ++--
 src/mainboard/amd/union_station/dsdt.asl       |  2 +-
 src/mainboard/amd/union_station/mainboard.c    | 10 +++++-----
 src/mainboard/amd/union_station/platform_cfg.h |  4 ++--
 src/mainboard/asrock/e350m1/mainboard.c        | 10 +++++-----
 src/mainboard/asrock/e350m1/platform_cfg.h     |  4 ++--
 14 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/src/mainboard/amd/inagua/dsdt.asl b/src/mainboard/amd/inagua/dsdt.asl
index 46b92f1..c7b44d0 100644
--- a/src/mainboard/amd/inagua/dsdt.asl
+++ b/src/mainboard/amd/inagua/dsdt.asl
@@ -23,7 +23,7 @@ DefinitionBlock (
 	"DSDT",                 /* Signature */
 	0x02,		/* DSDT Revision, needs to be 2 for 64bit */
 	"AMD   ",               /* OEMID */
-	"INAGUA  ",	     /* TABLE ID */
+	"COREBOOT",	     /* TABLE ID */
 	0x00010001	/* OEM Revision */
 	)
 {	/* Start of ASL file */
diff --git a/src/mainboard/amd/inagua/mainboard.c b/src/mainboard/amd/inagua/mainboard.c
index 9a5e00c..9952051 100644
--- a/src/mainboard/amd/inagua/mainboard.c
+++ b/src/mainboard/amd/inagua/mainboard.c
@@ -70,10 +70,10 @@ void set_pcie_dereset(void)
 }
 
 
-/*************************************************
- * enable the dedicated function in INAGUA    board.
- *************************************************/
-static void inagua_enable(device_t dev)
+/**********************************************
+ * Enable the dedicated functions of the board.
+ **********************************************/
+static void enable_dev(device_t dev)
 {
 	printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n");
 
@@ -82,5 +82,5 @@ static void inagua_enable(device_t dev)
 }
 
 struct chip_operations mainboard_ops = {
-		.enable_dev = inagua_enable,
+	.enable_dev = enable_dev,
 };
diff --git a/src/mainboard/amd/inagua/platform_cfg.h b/src/mainboard/amd/inagua/platform_cfg.h
index dd0251f..ded42df 100644
--- a/src/mainboard/amd/inagua/platform_cfg.h
+++ b/src/mainboard/amd/inagua/platform_cfg.h
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef _INAGUA_CFG_H_
-#define _INAGUA_CFG_H_
+#ifndef _PLATFORM_CFG_H_
+#define _PLATFORM_CFG_H_
 
 /**
  * @def BIOS_SIZE_1M
diff --git a/src/mainboard/amd/persimmon/dsdt.asl b/src/mainboard/amd/persimmon/dsdt.asl
index dd7b4b1..c7b44d0 100644
--- a/src/mainboard/amd/persimmon/dsdt.asl
+++ b/src/mainboard/amd/persimmon/dsdt.asl
@@ -23,7 +23,7 @@ DefinitionBlock (
 	"DSDT",                 /* Signature */
 	0x02,		/* DSDT Revision, needs to be 2 for 64bit */
 	"AMD   ",               /* OEMID */
-	"PERSIMMO",	     /* TABLE ID */
+	"COREBOOT",	     /* TABLE ID */
 	0x00010001	/* OEM Revision */
 	)
 {	/* Start of ASL file */
diff --git a/src/mainboard/amd/persimmon/mainboard.c b/src/mainboard/amd/persimmon/mainboard.c
index 5edacd3..9f1435d 100644
--- a/src/mainboard/amd/persimmon/mainboard.c
+++ b/src/mainboard/amd/persimmon/mainboard.c
@@ -50,10 +50,10 @@ void set_pcie_dereset(void)
 }
 
 
-/*************************************************
-* enable the dedicated function in persimmon board.
-*************************************************/
-static void persimmon_enable(device_t dev)
+/**********************************************
+ * Enable the dedicated functions of the board.
+ **********************************************/
+static void enable_dev(device_t dev)
 {
 	printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n");
 
@@ -76,5 +76,5 @@ static void persimmon_enable(device_t dev)
 }
 
 struct chip_operations mainboard_ops = {
-	.enable_dev = persimmon_enable,
+	.enable_dev = enable_dev,
 };
diff --git a/src/mainboard/amd/persimmon/platform_cfg.h b/src/mainboard/amd/persimmon/platform_cfg.h
index 7051e7d..1c0a7e4 100644
--- a/src/mainboard/amd/persimmon/platform_cfg.h
+++ b/src/mainboard/amd/persimmon/platform_cfg.h
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef _PERSIMMON_CFG_H_
-#define _PERSIMMON_CFG_H_
+#ifndef _PLATFORM_CFG_H_
+#define _PLATFORM_CFG_H_
 
 /**
  * @def BIOS_SIZE_1M
@@ -227,7 +227,7 @@
  */
 #define GEC_CONFIG			0
 
-const static CODECENTRY persimmon_codec_alc269[] =
+static const CODECENTRY persimmon_codec_alc269[] =
 {
 	/* NID, PinConfig */
 	{0x12, 0x411111F0},
@@ -244,7 +244,7 @@ const static CODECENTRY persimmon_codec_alc269[] =
 	{0xff, 0xffffffff} /* end of table */
 };
 
-const static CODECTBLLIST persimmon_codec_tablelist[] =
+static const CODECTBLLIST codec_tablelist[] =
 {
 	{0x010ec0269, (CODECENTRY*)&persimmon_codec_alc269[0]},
 	{0x0FFFFFFFFUL, (CODECENTRY*)0x0FFFFFFFFUL}
@@ -254,7 +254,7 @@ const static CODECTBLLIST persimmon_codec_tablelist[] =
  * @def AZALIA_OEM_VERB_TABLE
  *  Mainboard specific cocec verb table list
  */
-#define AZALIA_OEM_VERB_TABLE		(&persimmon_codec_tablelist[0])
+#define AZALIA_OEM_VERB_TABLE		(&codec_tablelist[0])
 
 /* set up an ACPI prefered power management profile */
 /*  from acpi.h
diff --git a/src/mainboard/amd/south_station/dsdt.asl b/src/mainboard/amd/south_station/dsdt.asl
index 958295b..c7b44d0 100644
--- a/src/mainboard/amd/south_station/dsdt.asl
+++ b/src/mainboard/amd/south_station/dsdt.asl
@@ -23,7 +23,7 @@ DefinitionBlock (
 	"DSDT",                 /* Signature */
 	0x02,		/* DSDT Revision, needs to be 2 for 64bit */
 	"AMD   ",               /* OEMID */
-	"SOUTHSTN",	     /* TABLE ID */
+	"COREBOOT",	     /* TABLE ID */
 	0x00010001	/* OEM Revision */
 	)
 {	/* Start of ASL file */
diff --git a/src/mainboard/amd/south_station/mainboard.c b/src/mainboard/amd/south_station/mainboard.c
index 5f31e03..a896129 100644
--- a/src/mainboard/amd/south_station/mainboard.c
+++ b/src/mainboard/amd/south_station/mainboard.c
@@ -72,15 +72,15 @@ static void southstation_led_init(void)
 }
 
 
-/*************************************************
-* enable the dedicated function in southstation board.
-*************************************************/
-static void southstation_enable(device_t dev)
+/**********************************************
+ * Enable the dedicated functions of the board.
+ **********************************************/
+static void enable_dev(device_t dev)
 {
 	printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n");
 	southstation_led_init();
 }
 
 struct chip_operations mainboard_ops = {
-	.enable_dev = southstation_enable,
+	.enable_dev = enable_dev,
 };
diff --git a/src/mainboard/amd/south_station/platform_cfg.h b/src/mainboard/amd/south_station/platform_cfg.h
index 1c8506b..3be7b19 100644
--- a/src/mainboard/amd/south_station/platform_cfg.h
+++ b/src/mainboard/amd/south_station/platform_cfg.h
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef _PERSIMMON_CFG_H_
-#define _PERSIMMON_CFG_H_
+#ifndef _PLATFORM_CFG_H_
+#define _PLATFORM_CFG_H_
 
 /**
  * @def BIOS_SIZE_1M
diff --git a/src/mainboard/amd/union_station/dsdt.asl b/src/mainboard/amd/union_station/dsdt.asl
index 0752640..f56020a 100644
--- a/src/mainboard/amd/union_station/dsdt.asl
+++ b/src/mainboard/amd/union_station/dsdt.asl
@@ -23,7 +23,7 @@ DefinitionBlock (
 	"DSDT",                 /* Signature */
 	0x02,		/* DSDT Revision, needs to be 2 for 64bit */
 	"AMD   ",               /* OEMID */
-	"UNIONSTN",	     /* TABLE ID */
+	"COREBOOT",	     /* TABLE ID */
 	0x00010001	/* OEM Revision */
 	)
 {	/* Start of ASL file */
diff --git a/src/mainboard/amd/union_station/mainboard.c b/src/mainboard/amd/union_station/mainboard.c
index 063f9b4..a980d6b 100644
--- a/src/mainboard/amd/union_station/mainboard.c
+++ b/src/mainboard/amd/union_station/mainboard.c
@@ -46,14 +46,14 @@ void set_pcie_dereset(void)
 }
 
 
-/*************************************************
-* enable the dedicated function in unionstation board.
-*************************************************/
-static void unionstation_enable(device_t dev)
+/**********************************************
+ * Enable the dedicated functions of the board.
+ **********************************************/
+static void enable_dev(device_t dev)
 {
 	printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n");
 }
 
 struct chip_operations mainboard_ops = {
-	.enable_dev = unionstation_enable,
+	.enable_dev = enable_dev,
 };
diff --git a/src/mainboard/amd/union_station/platform_cfg.h b/src/mainboard/amd/union_station/platform_cfg.h
index 1c8506b..3be7b19 100644
--- a/src/mainboard/amd/union_station/platform_cfg.h
+++ b/src/mainboard/amd/union_station/platform_cfg.h
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef _PERSIMMON_CFG_H_
-#define _PERSIMMON_CFG_H_
+#ifndef _PLATFORM_CFG_H_
+#define _PLATFORM_CFG_H_
 
 /**
  * @def BIOS_SIZE_1M
diff --git a/src/mainboard/asrock/e350m1/mainboard.c b/src/mainboard/asrock/e350m1/mainboard.c
index a17778a..53645c2 100644
--- a/src/mainboard/asrock/e350m1/mainboard.c
+++ b/src/mainboard/asrock/e350m1/mainboard.c
@@ -45,14 +45,14 @@ void set_pcie_dereset(void)
 }
 
 
-/*************************************************
-* enable the dedicated function in e350m1 board.
-*************************************************/
-static void e350m1_enable(device_t dev)
+/**********************************************
+ * Enable the dedicated functions of the board.
+ **********************************************/
+static void enable_dev(device_t dev)
 {
 	printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n");
 }
 
 struct chip_operations mainboard_ops = {
-	.enable_dev = e350m1_enable,
+	.enable_dev = enable_dev,
 };
diff --git a/src/mainboard/asrock/e350m1/platform_cfg.h b/src/mainboard/asrock/e350m1/platform_cfg.h
index 7fa9c23..1b09590 100644
--- a/src/mainboard/asrock/e350m1/platform_cfg.h
+++ b/src/mainboard/asrock/e350m1/platform_cfg.h
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef _E350M1_CFG_H_
-#define _E350M1_CFG_H_
+#ifndef _PLATFORM_CFG_H_
+#define _PLATFORM_CFG_H_
 
 /**
  * @def BIOS_SIZE_1M



More information about the coreboot mailing list