Paul Menzel (paulepanter@users.sourceforge.net) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2493
-gerrit
commit 000ab5ce9821f473a5309d1c59d06944f5c5df87 Author: Paul Menzel paulepanter@users.sourceforge.net Date: Sat Feb 23 21:31:23 2013 +0100
mainboard.c: Name enable_dev function uniformly `mainboard_enable`
To reduce the differences between these file name the enabling device function in the directory `src/mainboard` uniformly `mainboard_enable` [1].
Thanks to the awesome help of gnomon and BlastHardcheese in the IRC channel #sed on <irc.freenode.net>. gnomon came up with the following command to do the actual work.
$ cd src/mainboard $ for f in */*/mainboard.c ; \ > do src="$(awk '/.enable_dev = /{v=$NF; sub(/,$/,"",v); print v}' "$f")" ; \ > [[ -z $src ]] && continue ; \ > printf '%s\n' "g/${src}/s/${src}([,(])/mainboard_enable\1/p" w | ed -s "$f" ; \ > done
`src/mainboard/digitallogic/msm586seg/mainboard.c` and `src/mainboard/technologic/ts5300/mainboard.c` had to be adapted manually as no comma was used separating the struct members.
And with the following statement, gnomon is even more likable!
My pleasure entirely. Good luck with coreboot; I'm a big fan of the project.
[1] http://www.coreboot.org/pipermail/coreboot/2013-February/074548.html
Change-Id: Ife9cd0c2d9cc1ed14afc6d40063450553f06a6c6 Signed-off-by: Paul Menzel paulepanter@users.sourceforge.net --- src/mainboard/aaeon/pfm-540i_revb/mainboard.c | 4 ++-- src/mainboard/advansus/a785e-i/mainboard.c | 4 ++-- src/mainboard/amd/bimini_fam10/mainboard.c | 4 ++-- src/mainboard/amd/db800/mainboard.c | 4 ++-- src/mainboard/amd/dbm690t/mainboard.c | 4 ++-- src/mainboard/amd/dinar/mainboard.c | 4 ++-- src/mainboard/amd/inagua/mainboard.c | 4 ++-- src/mainboard/amd/mahogany/mainboard.c | 4 ++-- src/mainboard/amd/mahogany_fam10/mainboard.c | 4 ++-- src/mainboard/amd/norwich/mainboard.c | 4 ++-- src/mainboard/amd/parmer/mainboard.c | 4 ++-- src/mainboard/amd/persimmon/mainboard.c | 4 ++-- src/mainboard/amd/pistachio/mainboard.c | 4 ++-- src/mainboard/amd/rumba/mainboard.c | 4 ++-- src/mainboard/amd/south_station/mainboard.c | 4 ++-- src/mainboard/amd/thatcher/mainboard.c | 4 ++-- src/mainboard/amd/tilapia_fam10/mainboard.c | 4 ++-- src/mainboard/amd/torpedo/mainboard.c | 4 ++-- src/mainboard/amd/union_station/mainboard.c | 4 ++-- src/mainboard/artecgroup/dbe61/mainboard.c | 4 ++-- src/mainboard/asrock/939a785gmh/mainboard.c | 4 ++-- src/mainboard/asrock/e350m1/mainboard.c | 4 ++-- src/mainboard/asus/m4a78-em/mainboard.c | 4 ++-- src/mainboard/asus/m4a785-m/mainboard.c | 4 ++-- src/mainboard/asus/m5a88-v/mainboard.c | 4 ++-- src/mainboard/avalue/eax-785e/mainboard.c | 4 ++-- src/mainboard/bachmann/ot200/mainboard.c | 4 ++-- src/mainboard/digitallogic/msm586seg/mainboard.c | 4 ++-- src/mainboard/digitallogic/msm800sev/mainboard.c | 4 ++-- src/mainboard/emulation/qemu-armv7/mainboard.c | 4 ++-- src/mainboard/gigabyte/ma785gm/mainboard.c | 4 ++-- src/mainboard/gigabyte/ma785gmt/mainboard.c | 4 ++-- src/mainboard/gigabyte/ma78gm/mainboard.c | 4 ++-- src/mainboard/iei/kino-780am2-fam10/mainboard.c | 4 ++-- src/mainboard/iei/pm-lx2-800-r10/mainboard.c | 4 ++-- src/mainboard/jetway/pa78vm5/mainboard.c | 4 ++-- src/mainboard/kontron/kt690/mainboard.c | 4 ++-- src/mainboard/lippert/hurricane-lx/mainboard.c | 4 ++-- src/mainboard/lippert/literunner-lx/mainboard.c | 4 ++-- src/mainboard/lippert/roadrunner-lx/mainboard.c | 4 ++-- src/mainboard/lippert/spacerunner-lx/mainboard.c | 4 ++-- src/mainboard/pcengines/alix1c/mainboard.c | 4 ++-- src/mainboard/pcengines/alix2d/mainboard.c | 4 ++-- src/mainboard/siemens/sitemp_g1p1/mainboard.c | 4 ++-- src/mainboard/supermicro/h8qgi/mainboard.c | 4 ++-- src/mainboard/supermicro/h8scm/mainboard.c | 4 ++-- src/mainboard/supermicro/h8scm_fam10/mainboard.c | 4 ++-- src/mainboard/technexion/tim5690/mainboard.c | 4 ++-- src/mainboard/technexion/tim8690/mainboard.c | 4 ++-- src/mainboard/technologic/ts5300/mainboard.c | 4 ++-- src/mainboard/traverse/geos/mainboard.c | 4 ++-- src/mainboard/tyan/s8226/mainboard.c | 4 ++-- src/mainboard/winent/pl6064/mainboard.c | 4 ++-- src/mainboard/wyse/s50/mainboard.c | 4 ++-- 54 files changed, 108 insertions(+), 108 deletions(-)
diff --git a/src/mainboard/aaeon/pfm-540i_revb/mainboard.c b/src/mainboard/aaeon/pfm-540i_revb/mainboard.c index ba64b9e..f6906a8 100644 --- a/src/mainboard/aaeon/pfm-540i_revb/mainboard.c +++ b/src/mainboard/aaeon/pfm-540i_revb/mainboard.c @@ -26,11 +26,11 @@ static void init(struct device *dev) printk(BIOS_DEBUG, "AAEON PFM-540I_REVB EXIT %s\n", __func__); }
-static void enable_dev(struct device *dev) +static void mainboard_enable(struct device *dev) { dev->ops->init = init; }
struct chip_operations mainboard_ops = { - .enable_dev = enable_dev, + .enable_dev = mainboard_enable, }; diff --git a/src/mainboard/advansus/a785e-i/mainboard.c b/src/mainboard/advansus/a785e-i/mainboard.c index e0f7c3b..0af8ba7 100644 --- a/src/mainboard/advansus/a785e-i/mainboard.c +++ b/src/mainboard/advansus/a785e-i/mainboard.c @@ -73,7 +73,7 @@ u8 is_dev3_present(void) * enable the dedicated function in A785E-I board. * This function called early than rs780_enable. *************************************************/ -static void a785e_i_enable(device_t dev) +static void mainboard_enable(device_t dev) { printk(BIOS_INFO, "Mainboard A785E-I Enable. dev=0x%p\n", dev);
@@ -82,5 +82,5 @@ static void a785e_i_enable(device_t dev) }
struct chip_operations mainboard_ops = { - .enable_dev = a785e_i_enable, + .enable_dev = mainboard_enable, }; diff --git a/src/mainboard/amd/bimini_fam10/mainboard.c b/src/mainboard/amd/bimini_fam10/mainboard.c index c9f0732..46b4e21 100644 --- a/src/mainboard/amd/bimini_fam10/mainboard.c +++ b/src/mainboard/amd/bimini_fam10/mainboard.c @@ -123,7 +123,7 @@ static void get_ide_dma66(void) * enable the dedicated function in bimini board. * This function called early than rs780_enable. *************************************************/ -static void bimini_enable(device_t dev) +static void mainboard_enable(device_t dev) { printk(BIOS_INFO, "Mainboard BIMINI Enable. dev=0x%p\n", dev);
@@ -133,5 +133,5 @@ static void bimini_enable(device_t dev) }
struct chip_operations mainboard_ops = { - .enable_dev = bimini_enable, + .enable_dev = mainboard_enable, }; diff --git a/src/mainboard/amd/db800/mainboard.c b/src/mainboard/amd/db800/mainboard.c index e34990b..0e19242 100644 --- a/src/mainboard/amd/db800/mainboard.c +++ b/src/mainboard/amd/db800/mainboard.c @@ -26,11 +26,11 @@ static void init(struct device *dev) printk(BIOS_DEBUG, "AMD DB800 EXIT %s\n", __func__); }
-static void enable_dev(struct device *dev) +static void mainboard_enable(struct device *dev) { dev->ops->init = init; }
struct chip_operations mainboard_ops = { - .enable_dev = enable_dev, + .enable_dev = mainboard_enable, }; diff --git a/src/mainboard/amd/dbm690t/mainboard.c b/src/mainboard/amd/dbm690t/mainboard.c index 39475ce..4355b6b 100644 --- a/src/mainboard/amd/dbm690t/mainboard.c +++ b/src/mainboard/amd/dbm690t/mainboard.c @@ -180,7 +180,7 @@ static void set_thermal_config(void) * enable the dedicated function in dbm690t board. * This function called early than rs690_enable. *************************************************/ -static void dbm690t_enable(device_t dev) +static void mainboard_enable(device_t dev) { printk(BIOS_INFO, "Mainboard DBM690T Enable. dev=0x%p\n", dev);
@@ -190,5 +190,5 @@ static void dbm690t_enable(device_t dev) }
struct chip_operations mainboard_ops = { - .enable_dev = dbm690t_enable, + .enable_dev = mainboard_enable, }; diff --git a/src/mainboard/amd/dinar/mainboard.c b/src/mainboard/amd/dinar/mainboard.c index ce9f2ca..df5519b 100644 --- a/src/mainboard/amd/dinar/mainboard.c +++ b/src/mainboard/amd/dinar/mainboard.c @@ -68,11 +68,11 @@ void set_pcie_dereset(void *nbconfig) /************************************************* * enable the dedicated function in dinar board. *************************************************/ -static void dinar_enable(device_t dev) +static void mainboard_enable(device_t dev) { printk(BIOS_INFO, "Mainboard Dinar Enable. dev=0x%p\n", dev); }
struct chip_operations mainboard_ops = { - .enable_dev = dinar_enable, + .enable_dev = mainboard_enable, }; diff --git a/src/mainboard/amd/inagua/mainboard.c b/src/mainboard/amd/inagua/mainboard.c index 9a5e00c..2e2edc3 100644 --- a/src/mainboard/amd/inagua/mainboard.c +++ b/src/mainboard/amd/inagua/mainboard.c @@ -73,7 +73,7 @@ void set_pcie_dereset(void) /************************************************* * enable the dedicated function in INAGUA board. *************************************************/ -static void inagua_enable(device_t dev) +static void mainboard_enable(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 = mainboard_enable, }; diff --git a/src/mainboard/amd/mahogany/mainboard.c b/src/mainboard/amd/mahogany/mainboard.c index c8405fc..3ad3602 100644 --- a/src/mainboard/amd/mahogany/mainboard.c +++ b/src/mainboard/amd/mahogany/mainboard.c @@ -97,7 +97,7 @@ u8 is_dev3_present(void) * enable the dedicated function in mahogany board. * This function called early than rs780_enable. *************************************************/ -static void mahogany_enable(device_t dev) +static void mainboard_enable(device_t dev) { printk(BIOS_INFO, "Mainboard MAHOGANY Enable. dev=0x%p\n", dev);
@@ -106,5 +106,5 @@ static void mahogany_enable(device_t dev) }
struct chip_operations mainboard_ops = { - .enable_dev = mahogany_enable, + .enable_dev = mainboard_enable, }; diff --git a/src/mainboard/amd/mahogany_fam10/mainboard.c b/src/mainboard/amd/mahogany_fam10/mainboard.c index f944bd3..c9e7160 100644 --- a/src/mainboard/amd/mahogany_fam10/mainboard.c +++ b/src/mainboard/amd/mahogany_fam10/mainboard.c @@ -98,7 +98,7 @@ u8 is_dev3_present(void) * enable the dedicated function in mahogany board. * This function called early than rs780_enable. *************************************************/ -static void mahogany_enable(device_t dev) +static void mainboard_enable(device_t dev) { printk(BIOS_INFO, "Mainboard MAHOGANY Enable. dev=0x%p\n", dev);
@@ -107,5 +107,5 @@ static void mahogany_enable(device_t dev) }
struct chip_operations mainboard_ops = { - .enable_dev = mahogany_enable, + .enable_dev = mainboard_enable, }; diff --git a/src/mainboard/amd/norwich/mainboard.c b/src/mainboard/amd/norwich/mainboard.c index 9002a57..e0e9001 100644 --- a/src/mainboard/amd/norwich/mainboard.c +++ b/src/mainboard/amd/norwich/mainboard.c @@ -26,11 +26,11 @@ static void init(struct device *dev) printk(BIOS_DEBUG, "Norwich EXIT %s\n", __func__); }
-static void enable_dev(struct device *dev) +static void mainboard_enable(struct device *dev) { dev->ops->init = init; }
struct chip_operations mainboard_ops = { - .enable_dev = enable_dev, + .enable_dev = mainboard_enable, }; diff --git a/src/mainboard/amd/parmer/mainboard.c b/src/mainboard/amd/parmer/mainboard.c index 7c5dfc0..4b22214 100644 --- a/src/mainboard/amd/parmer/mainboard.c +++ b/src/mainboard/amd/parmer/mainboard.c @@ -32,7 +32,7 @@ /************************************************* * enable the dedicated function in parmer board. *************************************************/ -static void parmer_enable(device_t dev) +static void mainboard_enable(device_t dev) { printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n"); /* @@ -47,5 +47,5 @@ static void parmer_enable(device_t dev) }
struct chip_operations mainboard_ops = { - .enable_dev = parmer_enable, + .enable_dev = mainboard_enable, }; diff --git a/src/mainboard/amd/persimmon/mainboard.c b/src/mainboard/amd/persimmon/mainboard.c index 5edacd3..2f7cfd1 100644 --- a/src/mainboard/amd/persimmon/mainboard.c +++ b/src/mainboard/amd/persimmon/mainboard.c @@ -53,7 +53,7 @@ void set_pcie_dereset(void) /************************************************* * enable the dedicated function in persimmon board. *************************************************/ -static void persimmon_enable(device_t dev) +static void mainboard_enable(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 = mainboard_enable, }; diff --git a/src/mainboard/amd/pistachio/mainboard.c b/src/mainboard/amd/pistachio/mainboard.c index f59e2bc..2b61ace 100644 --- a/src/mainboard/amd/pistachio/mainboard.c +++ b/src/mainboard/amd/pistachio/mainboard.c @@ -250,7 +250,7 @@ static void set_thermal_config(void) * enable the dedicated function in pistachio board. * This function called early than rs690_enable. *************************************************/ -static void pistachio_enable(device_t dev) +static void mainboard_enable(device_t dev) { printk(BIOS_INFO, "Mainboard Pistachio Enable. dev=0x%p\n", dev);
@@ -259,5 +259,5 @@ static void pistachio_enable(device_t dev) }
struct chip_operations mainboard_ops = { - .enable_dev = pistachio_enable, + .enable_dev = mainboard_enable, }; diff --git a/src/mainboard/amd/rumba/mainboard.c b/src/mainboard/amd/rumba/mainboard.c index 71d2d68..8c97109 100644 --- a/src/mainboard/amd/rumba/mainboard.c +++ b/src/mainboard/amd/rumba/mainboard.c @@ -27,12 +27,12 @@ static void init(struct device *dev) printk(BIOS_DEBUG, "AMD RUMBA EXIT %s\n", __func__); }
-static void enable_dev(struct device *dev) +static void mainboard_enable(struct device *dev) { dev->ops->init = init; }
struct chip_operations mainboard_ops = { - .enable_dev = enable_dev, + .enable_dev = mainboard_enable, };
diff --git a/src/mainboard/amd/south_station/mainboard.c b/src/mainboard/amd/south_station/mainboard.c index 5f31e03..b7d8bea 100644 --- a/src/mainboard/amd/south_station/mainboard.c +++ b/src/mainboard/amd/south_station/mainboard.c @@ -75,12 +75,12 @@ static void southstation_led_init(void) /************************************************* * enable the dedicated function in southstation board. *************************************************/ -static void southstation_enable(device_t dev) +static void mainboard_enable(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 = mainboard_enable, }; diff --git a/src/mainboard/amd/thatcher/mainboard.c b/src/mainboard/amd/thatcher/mainboard.c index d1c389c..655ff31 100644 --- a/src/mainboard/amd/thatcher/mainboard.c +++ b/src/mainboard/amd/thatcher/mainboard.c @@ -32,7 +32,7 @@ /************************************************* * enable the dedicated function in thatcher board. *************************************************/ -static void thatcher_enable(device_t dev) +static void mainboard_enable(device_t dev) { msr_t msr;
@@ -64,5 +64,5 @@ static void thatcher_enable(device_t dev) }
struct chip_operations mainboard_ops = { - .enable_dev = thatcher_enable, + .enable_dev = mainboard_enable, }; diff --git a/src/mainboard/amd/tilapia_fam10/mainboard.c b/src/mainboard/amd/tilapia_fam10/mainboard.c index 79fdbc2..f9598b9 100644 --- a/src/mainboard/amd/tilapia_fam10/mainboard.c +++ b/src/mainboard/amd/tilapia_fam10/mainboard.c @@ -273,7 +273,7 @@ static void set_thermal_config(void) * enable the dedicated function in tilapia board. * This function called early than rs780_enable. *************************************************/ -static void tilapia_enable(device_t dev) +static void mainboard_enable(device_t dev) { printk(BIOS_INFO, "Mainboard TILAPIA Enable. dev=0x%p\n", dev);
@@ -284,5 +284,5 @@ static void tilapia_enable(device_t dev) }
struct chip_operations mainboard_ops = { - .enable_dev = tilapia_enable, + .enable_dev = mainboard_enable, }; diff --git a/src/mainboard/amd/torpedo/mainboard.c b/src/mainboard/amd/torpedo/mainboard.c index d0f3f2b..b7a59a0 100644 --- a/src/mainboard/amd/torpedo/mainboard.c +++ b/src/mainboard/amd/torpedo/mainboard.c @@ -52,11 +52,11 @@ void set_pcie_dereset(void) /************************************************* * enable the dedicated function in torpedo board. *************************************************/ -static void torpedo_enable(device_t dev) +static void mainboard_enable(device_t dev) { printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable. dev=0x%p\n", dev); }
struct chip_operations mainboard_ops = { - .enable_dev = torpedo_enable, + .enable_dev = mainboard_enable, }; diff --git a/src/mainboard/amd/union_station/mainboard.c b/src/mainboard/amd/union_station/mainboard.c index 063f9b4..57dfe44 100644 --- a/src/mainboard/amd/union_station/mainboard.c +++ b/src/mainboard/amd/union_station/mainboard.c @@ -49,11 +49,11 @@ void set_pcie_dereset(void) /************************************************* * enable the dedicated function in unionstation board. *************************************************/ -static void unionstation_enable(device_t dev) +static void mainboard_enable(device_t dev) { printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n"); }
struct chip_operations mainboard_ops = { - .enable_dev = unionstation_enable, + .enable_dev = mainboard_enable, }; diff --git a/src/mainboard/artecgroup/dbe61/mainboard.c b/src/mainboard/artecgroup/dbe61/mainboard.c index 804b918..3ec3a7e 100644 --- a/src/mainboard/artecgroup/dbe61/mainboard.c +++ b/src/mainboard/artecgroup/dbe61/mainboard.c @@ -46,11 +46,11 @@ static void init(struct device *dev) printk(BIOS_DEBUG, "ARTECGROUP DBE61 EXIT %s\n", __func__); }
-static void enable_dev(struct device *dev) +static void mainboard_enable(struct device *dev) { dev->ops->init = init; }
struct chip_operations mainboard_ops = { - .enable_dev = enable_dev, + .enable_dev = mainboard_enable, }; diff --git a/src/mainboard/asrock/939a785gmh/mainboard.c b/src/mainboard/asrock/939a785gmh/mainboard.c index d018696..8939957 100644 --- a/src/mainboard/asrock/939a785gmh/mainboard.c +++ b/src/mainboard/asrock/939a785gmh/mainboard.c @@ -95,7 +95,7 @@ u8 is_dev3_present(void) * enable the dedicated function in mahogany board. * This function called early than rs780_enable. *************************************************/ -static void mb_enable(device_t dev) +static void mainboard_enable(device_t dev) { printk(BIOS_INFO, "Mainboard 939A785GMH/128M Enable. dev=0x%p\n", dev);
@@ -104,7 +104,7 @@ static void mb_enable(device_t dev) }
struct chip_operations mainboard_ops = { - .enable_dev = mb_enable, + .enable_dev = mainboard_enable, };
/* override the default SATA PHY setup */ diff --git a/src/mainboard/asrock/e350m1/mainboard.c b/src/mainboard/asrock/e350m1/mainboard.c index a17778a..2bedff5 100644 --- a/src/mainboard/asrock/e350m1/mainboard.c +++ b/src/mainboard/asrock/e350m1/mainboard.c @@ -48,11 +48,11 @@ void set_pcie_dereset(void) /************************************************* * enable the dedicated function in e350m1 board. *************************************************/ -static void e350m1_enable(device_t dev) +static void mainboard_enable(device_t dev) { printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n"); }
struct chip_operations mainboard_ops = { - .enable_dev = e350m1_enable, + .enable_dev = mainboard_enable, }; diff --git a/src/mainboard/asus/m4a78-em/mainboard.c b/src/mainboard/asus/m4a78-em/mainboard.c index 9b56277..096d6ba 100644 --- a/src/mainboard/asus/m4a78-em/mainboard.c +++ b/src/mainboard/asus/m4a78-em/mainboard.c @@ -118,7 +118,7 @@ u8 is_dev3_present(void) * enable the dedicated function in this board. * This function called early than rs780_enable. *************************************************/ -static void m4a78em_enable(device_t dev) +static void mainboard_enable(device_t dev) { printk(BIOS_INFO, "Mainboard enable. dev=0x%p\n", dev);
@@ -128,5 +128,5 @@ static void m4a78em_enable(device_t dev) }
struct chip_operations mainboard_ops = { - .enable_dev = m4a78em_enable, + .enable_dev = mainboard_enable, }; diff --git a/src/mainboard/asus/m4a785-m/mainboard.c b/src/mainboard/asus/m4a785-m/mainboard.c index a0b79fe..a36dce0 100644 --- a/src/mainboard/asus/m4a785-m/mainboard.c +++ b/src/mainboard/asus/m4a785-m/mainboard.c @@ -190,7 +190,7 @@ static void set_thermal_config(void) * enable the dedicated function in this board. * This function called early than rs780_enable. *************************************************/ -static void m4a785m_enable(device_t dev) +static void mainboard_enable(device_t dev) { printk(BIOS_INFO, "Mainboard enable. dev=0x%p\n", dev);
@@ -200,5 +200,5 @@ static void m4a785m_enable(device_t dev) }
struct chip_operations mainboard_ops = { - .enable_dev = m4a785m_enable, + .enable_dev = mainboard_enable, }; diff --git a/src/mainboard/asus/m5a88-v/mainboard.c b/src/mainboard/asus/m5a88-v/mainboard.c index d1e530f..8a5e8a1 100644 --- a/src/mainboard/asus/m5a88-v/mainboard.c +++ b/src/mainboard/asus/m5a88-v/mainboard.c @@ -73,7 +73,7 @@ u8 is_dev3_present(void) * enable the dedicated function in M5A88-V board. * This function called early than rs780_enable. *************************************************/ -static void m5a88pm_v_enable(device_t dev) +static void mainboard_enable(device_t dev) {
printk(BIOS_INFO, "Mainboard ASUS M5A88-V Enable. dev=0x%p\n", dev); @@ -83,5 +83,5 @@ static void m5a88pm_v_enable(device_t dev) }
struct chip_operations mainboard_ops = { - .enable_dev = m5a88pm_v_enable, + .enable_dev = mainboard_enable, }; diff --git a/src/mainboard/avalue/eax-785e/mainboard.c b/src/mainboard/avalue/eax-785e/mainboard.c index 631891f..f812137 100644 --- a/src/mainboard/avalue/eax-785e/mainboard.c +++ b/src/mainboard/avalue/eax-785e/mainboard.c @@ -73,7 +73,7 @@ u8 is_dev3_present(void) * enable the dedicated function in EAX-785E board. * This function called early than rs780_enable. *************************************************/ -static void eax_785e(device_t dev) +static void mainboard_enable(device_t dev) { printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n");
@@ -82,5 +82,5 @@ static void eax_785e(device_t dev) }
struct chip_operations mainboard_ops = { - .enable_dev = eax_785e, + .enable_dev = mainboard_enable, }; diff --git a/src/mainboard/bachmann/ot200/mainboard.c b/src/mainboard/bachmann/ot200/mainboard.c index 2b1fe83..f8aefec 100644 --- a/src/mainboard/bachmann/ot200/mainboard.c +++ b/src/mainboard/bachmann/ot200/mainboard.c @@ -65,11 +65,11 @@ static void init(struct device *dev) printk(BIOS_DEBUG, "hw revision: %u\n", hw_rev); }
-static void enable_dev(struct device *dev) +static void mainboard_enable(struct device *dev) { dev->ops->init = init; }
struct chip_operations mainboard_ops = { - .enable_dev = enable_dev, + .enable_dev = mainboard_enable, }; diff --git a/src/mainboard/digitallogic/msm586seg/mainboard.c b/src/mainboard/digitallogic/msm586seg/mainboard.c index f2902c8..6cb5f07 100644 --- a/src/mainboard/digitallogic/msm586seg/mainboard.c +++ b/src/mainboard/digitallogic/msm586seg/mainboard.c @@ -31,7 +31,7 @@ static void irqdump(void) /* TODO: finish up mmcr struct in sc520.h, and; - set ADDDECTL (now done in raminit.c in cpu/amd/sc520 */ -static void enable_dev(struct device *dev) +static void mainboard_enable(struct device *dev) { //volatile struct mmcrpic *pic = MMCRPIC; volatile struct mmcr *mmcr = MMCRDEFAULT; @@ -129,6 +129,6 @@ static void enable_dev(struct device *dev) }
struct chip_operations mainboard_ops = { - .enable_dev = enable_dev + .enable_dev = mainboard_enable, };
diff --git a/src/mainboard/digitallogic/msm800sev/mainboard.c b/src/mainboard/digitallogic/msm800sev/mainboard.c index 2b2b9fe..b8e3ba1 100644 --- a/src/mainboard/digitallogic/msm800sev/mainboard.c +++ b/src/mainboard/digitallogic/msm800sev/mainboard.c @@ -26,12 +26,12 @@ static void init(struct device *dev) printk(BIOS_DEBUG, "MSM800SEV EXIT %s\n", __func__); }
-static void enable_dev(struct device *dev) +static void mainboard_enable(struct device *dev) { dev->ops->init = init; }
struct chip_operations mainboard_ops = { - .enable_dev = enable_dev, + .enable_dev = mainboard_enable, };
diff --git a/src/mainboard/emulation/qemu-armv7/mainboard.c b/src/mainboard/emulation/qemu-armv7/mainboard.c index cbc3197..603d00e 100644 --- a/src/mainboard/emulation/qemu-armv7/mainboard.c +++ b/src/mainboard/emulation/qemu-armv7/mainboard.c @@ -16,12 +16,12 @@ #include <console/console.h> #include <device/device.h>
-static void enable_dev(device_t dev) +static void mainboard_enable(device_t dev) { printk(BIOS_INFO, "Enable qemu/armv7 device...\n"); }
struct chip_operations mainboard_ops = { - .enable_dev = enable_dev, + .enable_dev = mainboard_enable, };
diff --git a/src/mainboard/gigabyte/ma785gm/mainboard.c b/src/mainboard/gigabyte/ma785gm/mainboard.c index 3ce0db6..5b3a963 100644 --- a/src/mainboard/gigabyte/ma785gm/mainboard.c +++ b/src/mainboard/gigabyte/ma785gm/mainboard.c @@ -134,7 +134,7 @@ static void set_gpio40_gfx(void) * enable the dedicated function in ma785gm board. * This function called early than rs780_enable. *************************************************/ -static void ma785gm_enable(device_t dev) +static void mainboard_enable(device_t dev) { printk(BIOS_INFO, "Mainboard MA785GM-US2H Enable. dev=0x%p\n", dev);
@@ -144,5 +144,5 @@ static void ma785gm_enable(device_t dev) }
struct chip_operations mainboard_ops = { - .enable_dev = ma785gm_enable, + .enable_dev = mainboard_enable, }; diff --git a/src/mainboard/gigabyte/ma785gmt/mainboard.c b/src/mainboard/gigabyte/ma785gmt/mainboard.c index 8961bc8..7ed897f 100644 --- a/src/mainboard/gigabyte/ma785gmt/mainboard.c +++ b/src/mainboard/gigabyte/ma785gmt/mainboard.c @@ -244,7 +244,7 @@ static void set_thermal_config(void) * enable the dedicated function in ma785gmt board. * This function called early than rs780_enable. *************************************************/ -static void ma785gmt_enable(device_t dev) +static void mainboard_enable(device_t dev) { printk(BIOS_INFO, "Mainboard MA785GMT-UD2H Enable. dev=0x%p\n", dev);
@@ -255,5 +255,5 @@ static void ma785gmt_enable(device_t dev) }
struct chip_operations mainboard_ops = { - .enable_dev = ma785gmt_enable, + .enable_dev = mainboard_enable, }; diff --git a/src/mainboard/gigabyte/ma78gm/mainboard.c b/src/mainboard/gigabyte/ma78gm/mainboard.c index 9a8e5dc..5ac2420 100644 --- a/src/mainboard/gigabyte/ma78gm/mainboard.c +++ b/src/mainboard/gigabyte/ma78gm/mainboard.c @@ -71,7 +71,7 @@ u8 is_dev3_present(void) * enable the dedicated function in board. * This function called early than rs780_enable. *************************************************/ -static void ma78gm_enable(device_t dev) +static void mainboard_enable(device_t dev) { printk(BIOS_INFO, "Mainboard MA78GM-US2H Enable. dev=0x%p\n", dev);
@@ -80,5 +80,5 @@ static void ma78gm_enable(device_t dev) }
struct chip_operations mainboard_ops = { - .enable_dev = ma78gm_enable, + .enable_dev = mainboard_enable, }; diff --git a/src/mainboard/iei/kino-780am2-fam10/mainboard.c b/src/mainboard/iei/kino-780am2-fam10/mainboard.c index a9458fd..27b0fe4 100644 --- a/src/mainboard/iei/kino-780am2-fam10/mainboard.c +++ b/src/mainboard/iei/kino-780am2-fam10/mainboard.c @@ -53,7 +53,7 @@ u8 is_dev3_present(void) * enable the dedicated function in kino board. * This function called early than rs780_enable. *************************************************/ -static void kino_enable(device_t dev) +static void mainboard_enable(device_t dev) { printk(BIOS_INFO, "Mainboard Kino Enable. dev=0x%p\n", dev);
@@ -62,5 +62,5 @@ static void kino_enable(device_t dev) }
struct chip_operations mainboard_ops = { - .enable_dev = kino_enable, + .enable_dev = mainboard_enable, }; diff --git a/src/mainboard/iei/pm-lx2-800-r10/mainboard.c b/src/mainboard/iei/pm-lx2-800-r10/mainboard.c index 9ba687f..4af206b 100644 --- a/src/mainboard/iei/pm-lx2-800-r10/mainboard.c +++ b/src/mainboard/iei/pm-lx2-800-r10/mainboard.c @@ -41,12 +41,12 @@ static void init(struct device *dev) outb(inb(SCH3114_RTR_HWM_DAT) | 0x01, SCH3114_RTR_HWM_DAT); }
-static void enable_dev(struct device *dev) +static void mainboard_enable(struct device *dev) { dev->ops->init = init; }
struct chip_operations mainboard_ops = { CHIP_NAME("IEI PM-LX2-800-R10 Mainboard") - .enable_dev = enable_dev, + .enable_dev = mainboard_enable, }; diff --git a/src/mainboard/jetway/pa78vm5/mainboard.c b/src/mainboard/jetway/pa78vm5/mainboard.c index 3cf1b0d..84f049a 100644 --- a/src/mainboard/jetway/pa78vm5/mainboard.c +++ b/src/mainboard/jetway/pa78vm5/mainboard.c @@ -100,7 +100,7 @@ u8 is_dev3_present(void) * enable the dedicated function in this board. * This function called early than rs780_enable. *************************************************/ -static void pa78vm5_enable(device_t dev) +static void mainboard_enable(device_t dev) { printk(BIOS_INFO, "Mainboard PA78VM5 Enable. dev=0x%p\n", dev);
@@ -109,5 +109,5 @@ static void pa78vm5_enable(device_t dev) }
struct chip_operations mainboard_ops = { - .enable_dev = pa78vm5_enable, + .enable_dev = mainboard_enable, }; diff --git a/src/mainboard/kontron/kt690/mainboard.c b/src/mainboard/kontron/kt690/mainboard.c index 189b65c..bc5beee 100644 --- a/src/mainboard/kontron/kt690/mainboard.c +++ b/src/mainboard/kontron/kt690/mainboard.c @@ -180,7 +180,7 @@ static void set_thermal_config(void) * enable the dedicated function in dbm690t board. * This function called early than rs690_enable. *************************************************/ -static void kt690_enable(device_t dev) +static void mainboard_enable(device_t dev) { printk(BIOS_INFO, "Mainboard KT690 Enable. dev=0x%p\n", dev);
@@ -190,5 +190,5 @@ static void kt690_enable(device_t dev) }
struct chip_operations mainboard_ops = { - .enable_dev = kt690_enable, + .enable_dev = mainboard_enable, }; diff --git a/src/mainboard/lippert/hurricane-lx/mainboard.c b/src/mainboard/lippert/hurricane-lx/mainboard.c index f13e48b..5b9100b 100644 --- a/src/mainboard/lippert/hurricane-lx/mainboard.c +++ b/src/mainboard/lippert/hurricane-lx/mainboard.c @@ -77,11 +77,11 @@ static void init(struct device *dev) printk(BIOS_DEBUG, "LiPPERT Hurricane-LX EXIT %s\n", __func__); }
-static void enable_dev(struct device *dev) +static void mainboard_enable(struct device *dev) { dev->ops->init = init; }
struct chip_operations mainboard_ops = { - .enable_dev = enable_dev, + .enable_dev = mainboard_enable, }; diff --git a/src/mainboard/lippert/literunner-lx/mainboard.c b/src/mainboard/lippert/literunner-lx/mainboard.c index c1b8fc2..c29098f 100644 --- a/src/mainboard/lippert/literunner-lx/mainboard.c +++ b/src/mainboard/lippert/literunner-lx/mainboard.c @@ -81,11 +81,11 @@ static void init(struct device *dev) printk(BIOS_DEBUG, "LiPPERT LiteRunner-LX EXIT %s\n", __func__); }
-static void enable_dev(struct device *dev) +static void mainboard_enable(struct device *dev) { dev->ops->init = init; }
struct chip_operations mainboard_ops = { - .enable_dev = enable_dev, + .enable_dev = mainboard_enable, }; diff --git a/src/mainboard/lippert/roadrunner-lx/mainboard.c b/src/mainboard/lippert/roadrunner-lx/mainboard.c index 22bcf43..93a7970 100644 --- a/src/mainboard/lippert/roadrunner-lx/mainboard.c +++ b/src/mainboard/lippert/roadrunner-lx/mainboard.c @@ -71,11 +71,11 @@ static void init(struct device *dev) printk(BIOS_DEBUG, "LiPPERT RoadRunner-LX EXIT %s\n", __func__); }
-static void enable_dev(struct device *dev) +static void mainboard_enable(struct device *dev) { dev->ops->init = init; }
struct chip_operations mainboard_ops = { - .enable_dev = enable_dev, + .enable_dev = mainboard_enable, }; diff --git a/src/mainboard/lippert/spacerunner-lx/mainboard.c b/src/mainboard/lippert/spacerunner-lx/mainboard.c index e2e6093..6da1485 100644 --- a/src/mainboard/lippert/spacerunner-lx/mainboard.c +++ b/src/mainboard/lippert/spacerunner-lx/mainboard.c @@ -76,11 +76,11 @@ static void init(struct device *dev) printk(BIOS_DEBUG, "LiPPERT SpaceRunner-LX EXIT %s\n", __func__); }
-static void enable_dev(struct device *dev) +static void mainboard_enable(struct device *dev) { dev->ops->init = init; }
struct chip_operations mainboard_ops = { - .enable_dev = enable_dev, + .enable_dev = mainboard_enable, }; diff --git a/src/mainboard/pcengines/alix1c/mainboard.c b/src/mainboard/pcengines/alix1c/mainboard.c index 7dda79a..95335a7 100644 --- a/src/mainboard/pcengines/alix1c/mainboard.c +++ b/src/mainboard/pcengines/alix1c/mainboard.c @@ -26,12 +26,12 @@ static void init(struct device *dev) printk(BIOS_DEBUG, "ALIX1.C EXIT %s\n", __func__); }
-static void enable_dev(struct device *dev) +static void mainboard_enable(struct device *dev) { dev->ops->init = init; }
struct chip_operations mainboard_ops = { - .enable_dev = enable_dev, + .enable_dev = mainboard_enable, };
diff --git a/src/mainboard/pcengines/alix2d/mainboard.c b/src/mainboard/pcengines/alix2d/mainboard.c index c60b134..1188a55 100644 --- a/src/mainboard/pcengines/alix2d/mainboard.c +++ b/src/mainboard/pcengines/alix2d/mainboard.c @@ -26,12 +26,12 @@ static void init(struct device *dev) printk(BIOS_DEBUG, "ALIX.2D EXIT %s\n", __func__); }
-static void enable_dev(struct device *dev) +static void mainboard_enable(struct device *dev) { dev->ops->init = init; }
struct chip_operations mainboard_ops = { - .enable_dev = enable_dev, + .enable_dev = mainboard_enable, };
diff --git a/src/mainboard/siemens/sitemp_g1p1/mainboard.c b/src/mainboard/siemens/sitemp_g1p1/mainboard.c index a73fbd6..466b4a9 100644 --- a/src/mainboard/siemens/sitemp_g1p1/mainboard.c +++ b/src/mainboard/siemens/sitemp_g1p1/mainboard.c @@ -832,7 +832,7 @@ static void init(device_t dev) * enable the dedicated function in sina board. * This function called early than rs690_enable. *************************************************/ -static void enable_dev(device_t dev) +static void mainboard_enable(device_t dev) {
printk(BIOS_INFO, "%s %s[%x/%x] %s\n", @@ -849,5 +849,5 @@ static void enable_dev(device_t dev) }
struct chip_operations mainboard_ops = { - .enable_dev = enable_dev, + .enable_dev = mainboard_enable, }; diff --git a/src/mainboard/supermicro/h8qgi/mainboard.c b/src/mainboard/supermicro/h8qgi/mainboard.c index 30695ff..aa855c8 100644 --- a/src/mainboard/supermicro/h8qgi/mainboard.c +++ b/src/mainboard/supermicro/h8qgi/mainboard.c @@ -65,11 +65,11 @@ void set_pcie_dereset(void *nbconfig) /************************************************* * enable the dedicated function in h8qgi board. *************************************************/ -static void h8qgi_enable(device_t dev) +static void mainboard_enable(device_t dev) { printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n"); }
struct chip_operations mainboard_ops = { - .enable_dev = h8qgi_enable, + .enable_dev = mainboard_enable, }; diff --git a/src/mainboard/supermicro/h8scm/mainboard.c b/src/mainboard/supermicro/h8scm/mainboard.c index 6c655f5..01edfe0 100644 --- a/src/mainboard/supermicro/h8scm/mainboard.c +++ b/src/mainboard/supermicro/h8scm/mainboard.c @@ -67,7 +67,7 @@ void set_pcie_dereset(void *nbconfig) /************************************************* * enable the dedicated function in h8scm board. *************************************************/ -static void h8scm_enable(device_t dev) +static void mainboard_enable(device_t dev) { printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n"); } @@ -80,5 +80,5 @@ int add_mainboard_resources(struct lb_memory *mem) #endif
struct chip_operations mainboard_ops = { - .enable_dev = h8scm_enable, + .enable_dev = mainboard_enable, }; diff --git a/src/mainboard/supermicro/h8scm_fam10/mainboard.c b/src/mainboard/supermicro/h8scm_fam10/mainboard.c index 5faca50..83b1957 100644 --- a/src/mainboard/supermicro/h8scm_fam10/mainboard.c +++ b/src/mainboard/supermicro/h8scm_fam10/mainboard.c @@ -69,7 +69,7 @@ void set_pcie_dereset(void) * enable the dedicated function in h8scm board. * This function called early than sr5650_enable. *************************************************/ -static void h8scm_enable(device_t dev) +static void mainboard_enable(device_t dev) { printk(BIOS_INFO, "Mainboard H8SCM Enable. dev=0x%p\n", dev);
@@ -92,5 +92,5 @@ static void h8scm_enable(device_t dev) }
struct chip_operations mainboard_ops = { - .enable_dev = h8scm_enable, + .enable_dev = mainboard_enable, }; diff --git a/src/mainboard/technexion/tim5690/mainboard.c b/src/mainboard/technexion/tim5690/mainboard.c index 7974ce9..5be58cd 100644 --- a/src/mainboard/technexion/tim5690/mainboard.c +++ b/src/mainboard/technexion/tim5690/mainboard.c @@ -222,7 +222,7 @@ static void lcd_panel_id(rs690_vbios_regs *vbios_regs, u8 num_id) * enable the dedicated function in tim5690 board. * This function called early than rs690_enable. *************************************************/ -static void tim5690_enable(device_t dev) +static void mainboard_enable(device_t dev) { u16 gpio_base = IT8712F_SIMPLE_IO_BASE; #if CONFIG_VGA_ROM_RUN @@ -257,5 +257,5 @@ void mainboard_post(u8 value) }
struct chip_operations mainboard_ops = { - .enable_dev = tim5690_enable, + .enable_dev = mainboard_enable, }; diff --git a/src/mainboard/technexion/tim8690/mainboard.c b/src/mainboard/technexion/tim8690/mainboard.c index 377cbd7..69788e9 100644 --- a/src/mainboard/technexion/tim8690/mainboard.c +++ b/src/mainboard/technexion/tim8690/mainboard.c @@ -140,7 +140,7 @@ static void set_thermal_config(void) * enable the dedicated function in tim8690 board. * This function called early than rs690_enable. *************************************************/ -static void tim8690_enable(device_t dev) +static void mainboard_enable(device_t dev) { printk(BIOS_INFO, "Mainboard tim8690 Enable. dev=0x%p\n", dev);
@@ -149,5 +149,5 @@ static void tim8690_enable(device_t dev) }
struct chip_operations mainboard_ops = { - .enable_dev = tim8690_enable, + .enable_dev = mainboard_enable, }; diff --git a/src/mainboard/technologic/ts5300/mainboard.c b/src/mainboard/technologic/ts5300/mainboard.c index 1b7d023..7a0e2f3 100644 --- a/src/mainboard/technologic/ts5300/mainboard.c +++ b/src/mainboard/technologic/ts5300/mainboard.c @@ -35,7 +35,7 @@ static void irqdump(void) /* TODO: finish up mmcr struct in sc520.h, and; - set ADDDECTL (now done in raminit.c in cpu/amd/sc520 */ -static void enable_dev(struct device *dev) +static void mainboard_enable(struct device *dev) { volatile struct mmcr *mmcr = MMCRDEFAULT;
@@ -143,6 +143,6 @@ static void enable_dev(struct device *dev) }
struct chip_operations mainboard_ops = { - .enable_dev = enable_dev + .enable_dev = mainboard_enable, };
diff --git a/src/mainboard/traverse/geos/mainboard.c b/src/mainboard/traverse/geos/mainboard.c index 7bcc396..6980cda 100644 --- a/src/mainboard/traverse/geos/mainboard.c +++ b/src/mainboard/traverse/geos/mainboard.c @@ -26,11 +26,11 @@ static void init(struct device *dev) printk(BIOS_DEBUG, "Geos EXIT %s\n", __func__); }
-static void enable_dev(struct device *dev) +static void mainboard_enable(struct device *dev) { dev->ops->init = init; }
struct chip_operations mainboard_ops = { - .enable_dev = enable_dev, + .enable_dev = mainboard_enable, }; diff --git a/src/mainboard/tyan/s8226/mainboard.c b/src/mainboard/tyan/s8226/mainboard.c index b0d6b48..d9cacdc 100644 --- a/src/mainboard/tyan/s8226/mainboard.c +++ b/src/mainboard/tyan/s8226/mainboard.c @@ -67,11 +67,11 @@ void set_pcie_dereset(void *nbconfig) /************************************************* * enable the dedicated function in s8226 board. *************************************************/ -static void s8226_enable(device_t dev) +static void mainboard_enable(device_t dev) { printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n"); }
struct chip_operations mainboard_ops = { - .enable_dev = s8226_enable, + .enable_dev = mainboard_enable, }; diff --git a/src/mainboard/winent/pl6064/mainboard.c b/src/mainboard/winent/pl6064/mainboard.c index 5fd83ed..1ddc110 100644 --- a/src/mainboard/winent/pl6064/mainboard.c +++ b/src/mainboard/winent/pl6064/mainboard.c @@ -26,11 +26,11 @@ static void init(struct device *dev) printk(BIOS_DEBUG, "Win Enterprises PL-6064/65 EXIT %s\n", __func__); }
-static void enable_dev(struct device *dev) +static void mainboard_enable(struct device *dev) { dev->ops->init = init; }
struct chip_operations mainboard_ops = { - .enable_dev = enable_dev, + .enable_dev = mainboard_enable, }; diff --git a/src/mainboard/wyse/s50/mainboard.c b/src/mainboard/wyse/s50/mainboard.c index 644a64e..ee92745 100644 --- a/src/mainboard/wyse/s50/mainboard.c +++ b/src/mainboard/wyse/s50/mainboard.c @@ -28,12 +28,12 @@ static void init(struct device *dev) printk(BIOS_DEBUG, "S50 EXIT %s\n", __func__); }
-static void enable_dev(struct device *dev) +static void mainboard_enable(struct device *dev) { dev->ops->init = init; }
struct chip_operations mainboard_ops = { - .enable_dev = enable_dev, + .enable_dev = mainboard_enable, };
Paul Menzel wrote:
+++ b/src/mainboard/aaeon/pfm-540i_revb/mainboard.c @@ -26,11 +26,11 @@ static void init(struct device *dev) printk(BIOS_DEBUG, "AAEON PFM-540I_REVB EXIT %s\n", __func__);
Next step: Replace all explicit strings like the above with vendor and board names in Kconfig.
+++ b/src/mainboard/advansus/a785e-i/mainboard.c @@ -73,7 +73,7 @@ u8 is_dev3_present(void)
- enable the dedicated function in A785E-I board.
- This function called early than rs780_enable.
*************************************************/ -static void a785e_i_enable(device_t dev) +static void mainboard_enable(device_t dev) { printk(BIOS_INFO, "Mainboard A785E-I Enable. dev=0x%p\n", dev);
And here too.
printk(BIOS_INFO "%s " CONFIG_MAINBOARD_DIR ". dev=0x%p\n", __func__, dev);
Those changes should be accompanied with a test that FAILs if "mainboard" and "enable" are in the same string in mainboard.c.
//Peter