Author: oxygene
Date: Tue May 10 23:53:13 2011
New Revision: 6565
URL: https://tracker.coreboot.org/trac/coreboot/changeset/6565
Log:
Change read_option() to a macro that wraps some API uglyness
Simplify
read_option(CMOS_VSTART_foo, CMOS_VLEN_foo, somedefault)
to
read_option(foo, somedefault)
Signed-off-by: Patrick Georgi <patr...@georgi-clan.de>
Acked-by: Stefan Reinauer <stefan.reina...@coreboot.org>
Modified:
trunk/src/cpu/amd/dualcore/dualcore.c
trunk/src/cpu/amd/model_10xxx/init_cpus.c
trunk/src/cpu/amd/model_fxx/init_cpus.c
trunk/src/cpu/amd/quadcore/quadcore.c
trunk/src/include/pc80/mc146818rtc.h
trunk/src/lib/uart8250.c
trunk/src/mainboard/getac/p470/romstage.c
trunk/src/mainboard/kontron/986lcd-m/romstage.c
trunk/src/mainboard/roda/rk886ex/romstage.c
trunk/src/northbridge/amd/amdk8/coherent_ht.c
trunk/src/northbridge/amd/amdk8/raminit.c
trunk/src/northbridge/amd/amdk8/raminit_f.c
trunk/src/northbridge/intel/e7520/raminit.c
trunk/src/northbridge/intel/e7525/raminit.c
trunk/src/pc80/mc146818rtc_early.c
Modified: trunk/src/cpu/amd/dualcore/dualcore.c
==============================================================================
--- trunk/src/cpu/amd/dualcore/dualcore.c Tue May 10 23:47:57 2011
(r6564)
+++ trunk/src/cpu/amd/dualcore/dualcore.c Tue May 10 23:53:13 2011
(r6565)
@@ -49,7 +49,7 @@
unsigned nodes;
unsigned nodeid;
- if (read_option(CMOS_VSTART_multi_core, CMOS_VLEN_multi_core, 0)) {
+ if (read_option(multi_core, 0)) {
return; // disable multi_core
}
Modified: trunk/src/cpu/amd/model_10xxx/init_cpus.c
==============================================================================
--- trunk/src/cpu/amd/model_10xxx/init_cpus.c Tue May 10 23:47:57 2011
(r6564)
+++ trunk/src/cpu/amd/model_10xxx/init_cpus.c Tue May 10 23:53:13 2011
(r6565)
@@ -72,7 +72,7 @@
nodes = get_nodes();
if (!CONFIG_LOGICAL_CPUS ||
- read_option(CMOS_VSTART_multi_core, CMOS_VLEN_multi_core, 0) != 0)
{ // 0 means multi core
+ read_option(multi_core, 0) != 0) { // 0 means multi core
disable_siblings = 1;
} else {
disable_siblings = 0;
Modified: trunk/src/cpu/amd/model_fxx/init_cpus.c
==============================================================================
--- trunk/src/cpu/amd/model_fxx/init_cpus.c Tue May 10 23:47:57 2011
(r6564)
+++ trunk/src/cpu/amd/model_fxx/init_cpus.c Tue May 10 23:53:13 2011
(r6565)
@@ -25,7 +25,7 @@
nodes = get_nodes();
if (!CONFIG_LOGICAL_CPUS ||
- read_option(CMOS_VSTART_multi_core, CMOS_VLEN_multi_core, 0) != 0)
{ // 0 means multi core
+ read_option(multi_core, 0) != 0) { // 0 means multi core
disable_siblings = 1;
} else {
disable_siblings = 0;
Modified: trunk/src/cpu/amd/quadcore/quadcore.c
==============================================================================
--- trunk/src/cpu/amd/quadcore/quadcore.c Tue May 10 23:47:57 2011
(r6564)
+++ trunk/src/cpu/amd/quadcore/quadcore.c Tue May 10 23:53:13 2011
(r6565)
@@ -82,7 +82,7 @@
u32 nodeid;
// disable multi_core
- if (read_option(CMOS_VSTART_multi_core, CMOS_VLEN_multi_core, 0) != 0)
{
+ if (read_option(multi_core, 0) != 0) {
printk(BIOS_DEBUG, "Skip additional core init\n");
return;
}
Modified: trunk/src/include/pc80/mc146818rtc.h
==============================================================================
--- trunk/src/include/pc80/mc146818rtc.h Tue May 10 23:47:57 2011
(r6564)
+++ trunk/src/include/pc80/mc146818rtc.h Tue May 10 23:53:13 2011
(r6565)
@@ -110,15 +110,16 @@
void rtc_init(int invalid);
#if CONFIG_USE_OPTION_TABLE
int get_option(void *dest, const char *name);
-unsigned read_option(unsigned start, unsigned size, unsigned def);
+unsigned read_option_lowlevel(unsigned start, unsigned size, unsigned def);
#else
static inline int get_option(void *dest __attribute__((unused)),
const char *name __attribute__((unused))) { return -2; }
-static inline unsigned read_option(unsigned start, unsigned size, unsigned def)
+static inline unsigned read_option_lowlevel(unsigned start, unsigned size,
unsigned def)
{ return def; }
#endif
#else
#include <pc80/mc146818rtc_early.c>
#endif
+#define read_option(name, default) read_option_lowlevel(CMOS_VSTART_ ##name,
CMOS_VLEN_ ##name, (default))
#endif /* PC80_MC146818RTC_H */
Modified: trunk/src/lib/uart8250.c
==============================================================================
--- trunk/src/lib/uart8250.c Tue May 10 23:47:57 2011 (r6564)
+++ trunk/src/lib/uart8250.c Tue May 10 23:53:13 2011 (r6565)
@@ -99,7 +99,7 @@
static const unsigned char divisor[8] = { 1, 2, 3, 6, 12, 24, 48, 96 };
unsigned b_index = 0;
#if defined(__PRE_RAM__)
- b_index = read_option(CMOS_VSTART_baud_rate, CMOS_VLEN_baud_rate, 0);
+ b_index = read_option(baud_rate, 0);
b_index &= 7;
div = divisor[b_index];
#else
Modified: trunk/src/mainboard/getac/p470/romstage.c
==============================================================================
--- trunk/src/mainboard/getac/p470/romstage.c Tue May 10 23:47:57 2011
(r6564)
+++ trunk/src/mainboard/getac/p470/romstage.c Tue May 10 23:53:13 2011
(r6565)
@@ -83,7 +83,7 @@
static void ich7_enable_lpc(void)
{
int lpt_en = 0;
- if (read_option(CMOS_VSTART_lpt, CMOS_VLEN_lpt, 0) != 0) {
+ if (read_option(lpt, 0) != 0) {
lpt_en = 1<<2; // enable LPT
}
// Enable Serial IRQ
Modified: trunk/src/mainboard/kontron/986lcd-m/romstage.c
==============================================================================
--- trunk/src/mainboard/kontron/986lcd-m/romstage.c Tue May 10 23:47:57
2011 (r6564)
+++ trunk/src/mainboard/kontron/986lcd-m/romstage.c Tue May 10 23:53:13
2011 (r6565)
@@ -59,7 +59,7 @@
static void ich7_enable_lpc(void)
{
int lpt_en = 0;
- if (read_option(CMOS_VSTART_lpt, CMOS_VLEN_lpt, 0) != 0) {
+ if (read_option(lpt, 0) != 0) {
lpt_en = 1<<2; // enable LPT
}
// Enable Serial IRQ
@@ -228,18 +228,18 @@
reg32 = FD_ACMOD|FD_ACAUD|FD_PATA;
reg32 |= FD_PCIE6|FD_PCIE5|FD_PCIE4;
- if (read_option(CMOS_VSTART_ethernet1, CMOS_VLEN_ethernet1, 0) != 0) {
+ if (read_option(ethernet1, 0) != 0) {
printk(BIOS_DEBUG, "Disabling ethernet adapter 1.\n");
reg32 |= FD_PCIE1;
}
- if (read_option(CMOS_VSTART_ethernet2, CMOS_VLEN_ethernet2, 0) != 0) {
+ if (read_option(ethernet2, 0) != 0) {
printk(BIOS_DEBUG, "Disabling ethernet adapter 2.\n");
reg32 |= FD_PCIE2;
} else {
if (reg32 & FD_PCIE1)
port_shuffle = 1;
}
- if (read_option(CMOS_VSTART_ethernet3, CMOS_VLEN_ethernet3, 0) != 0) {
+ if (read_option(ethernet3, 0) != 0) {
printk(BIOS_DEBUG, "Disabling ethernet adapter 3.\n");
reg32 |= FD_PCIE3;
} else {
Modified: trunk/src/mainboard/roda/rk886ex/romstage.c
==============================================================================
--- trunk/src/mainboard/roda/rk886ex/romstage.c Tue May 10 23:47:57 2011
(r6564)
+++ trunk/src/mainboard/roda/rk886ex/romstage.c Tue May 10 23:53:13 2011
(r6565)
@@ -70,7 +70,7 @@
static void ich7_enable_lpc(void)
{
int lpt_en = 0;
- if (read_option(CMOS_VSTART_lpt, CMOS_VLEN_lpt, 0) != 0) {
+ if (read_option(lpt, 0) != 0) {
lpt_en = 1<<2; // enable LPT
}
// Enable Serial IRQ
Modified: trunk/src/northbridge/amd/amdk8/coherent_ht.c
==============================================================================
--- trunk/src/northbridge/amd/amdk8/coherent_ht.c Tue May 10 23:47:57
2011 (r6564)
+++ trunk/src/northbridge/amd/amdk8/coherent_ht.c Tue May 10 23:53:13
2011 (r6565)
@@ -1599,7 +1599,7 @@
#if CONFIG_LOGICAL_CPUS==1
unsigned total_cpus;
- if (read_option(CMOS_VSTART_multi_core, CMOS_VLEN_multi_core, 0) == 0)
{ /* multi_core */
+ if (read_option(multi_core, 0) == 0) { /* multi_core */
total_cpus = verify_dualcore(nodes);
}
else {
Modified: trunk/src/northbridge/amd/amdk8/raminit.c
==============================================================================
--- trunk/src/northbridge/amd/amdk8/raminit.c Tue May 10 23:47:57 2011
(r6564)
+++ trunk/src/northbridge/amd/amdk8/raminit.c Tue May 10 23:53:13 2011
(r6565)
@@ -548,7 +548,7 @@
if (nbcap & NBCAP_ECC) {
dcl |= DCL_DimmEccEn;
}
- if (read_option(CMOS_VSTART_ECC_memory, CMOS_VLEN_ECC_memory, 1) == 0) {
+ if (read_option(ECC_memory, 1) == 0) {
dcl &= ~DCL_DimmEccEn;
}
pci_write_config32(ctrl->f2, DRAM_CONFIG_LOW, dcl);
@@ -1100,7 +1100,7 @@
{
unsigned long tom_k, base_k;
- if (read_option(CMOS_VSTART_interleave_chip_selects,
CMOS_VLEN_interleave_chip_selects, 1) != 0) {
+ if (read_option(interleave_chip_selects, 1) != 0) {
tom_k = interleave_chip_selects(ctrl);
} else {
printk(BIOS_DEBUG, "Interleaving disabled\n");
@@ -1530,7 +1530,7 @@
min_cycle_time = min_cycle_times[(value >> NBCAP_MEMCLK_SHIFT) &
NBCAP_MEMCLK_MASK];
bios_cycle_time = min_cycle_times[
- read_option(CMOS_VSTART_max_mem_clock, CMOS_VLEN_max_mem_clock,
0)];
+ read_option(max_mem_clock, 0)];
if (bios_cycle_time > min_cycle_time) {
min_cycle_time = bios_cycle_time;
}
Modified: trunk/src/northbridge/amd/amdk8/raminit_f.c
==============================================================================
--- trunk/src/northbridge/amd/amdk8/raminit_f.c Tue May 10 23:47:57 2011
(r6564)
+++ trunk/src/northbridge/amd/amdk8/raminit_f.c Tue May 10 23:53:13 2011
(r6565)
@@ -1108,7 +1108,7 @@
* and if so count them.
*/
#if defined(CMOS_VSTART_interleave_chip_selects)
- if (read_option(CMOS_VSTART_interleave_chip_selects,
CMOS_VLEN_interleave_chip_selects, 1) == 0)
+ if (read_option(interleave_chip_selects, 1) == 0)
return 0;
#else
#if !CONFIG_INTERLEAVE_CHIP_SELECTS
@@ -1806,7 +1806,7 @@
min_cycle_time = min_cycle_times[(value >> NBCAP_MEMCLK_SHIFT) &
NBCAP_MEMCLK_MASK];
bios_cycle_time = min_cycle_times[
#ifdef CMOS_VSTART_max_mem_clock
- read_option(CMOS_VSTART_max_mem_clock, CMOS_VLEN_max_mem_clock,
0)
+ read_option(max_mem_clock, 0)
#else
#if defined(CONFIG_MAX_MEM_CLOCK)
CONFIG_MAX_MEM_CLOCK
@@ -2375,7 +2375,7 @@
dcl |= DCL_DimmEccEn;
}
#ifdef CMOS_VSTART_ECC_memory
- if (read_option(CMOS_VSTART_ECC_memory, CMOS_VLEN_ECC_memory, 1) == 0) {
+ if (read_option(ECC_memory, 1) == 0) {
dcl &= ~DCL_DimmEccEn;
}
#else // CMOS_VSTART_ECC_memory not defined
Modified: trunk/src/northbridge/intel/e7520/raminit.c
==============================================================================
--- trunk/src/northbridge/intel/e7520/raminit.c Tue May 10 23:47:57 2011
(r6564)
+++ trunk/src/northbridge/intel/e7520/raminit.c Tue May 10 23:53:13 2011
(r6565)
@@ -618,7 +618,7 @@
}
ecc = 2;
#if CONFIG_HAVE_OPTION_TABLE
- if (read_option(CMOS_VSTART_ECC_memory, CMOS_VLEN_ECC_memory, 1) == 0) {
+ if (read_option(ECC_memory, 1) == 0) {
ecc = 0; /* ECC off in CMOS so disable it */
print_debug("ECC off\n");
} else
Modified: trunk/src/northbridge/intel/e7525/raminit.c
==============================================================================
--- trunk/src/northbridge/intel/e7525/raminit.c Tue May 10 23:47:57 2011
(r6564)
+++ trunk/src/northbridge/intel/e7525/raminit.c Tue May 10 23:53:13 2011
(r6565)
@@ -624,7 +624,7 @@
}
ecc = 2;
#if CONFIG_HAVE_OPTION_TABLE
- if (read_option(CMOS_VSTART_ECC_memory,CMOS_VLEN_ECC_memory,1) == 0) {
+ if (read_option(ECC_memory, 1) == 0) {
ecc = 0; /* ECC off in CMOS so disable it */
print_debug("ECC off\n");
} else
Modified: trunk/src/pc80/mc146818rtc_early.c
==============================================================================
--- trunk/src/pc80/mc146818rtc_early.c Tue May 10 23:47:57 2011 (r6564)
+++ trunk/src/pc80/mc146818rtc_early.c Tue May 10 23:53:13 2011 (r6565)
@@ -92,7 +92,7 @@
return (byte & (1<<1));
}
-unsigned read_option(unsigned start, unsigned size, unsigned def)
+unsigned read_option_lowlevel(unsigned start, unsigned size, unsigned def)
{
#if CONFIG_USE_OPTION_TABLE
unsigned byte;
--
coreboot mailing list: coreboot@coreboot.org
http://www.coreboot.org/mailman/listinfo/coreboot
