Trivial patch:

* Drop empty file (0 bytes) northbridge/amd/amdk8/cpu_rev.c
  and references to it.
* move config option decision to preprocessor instead of code
  since config options can not change during runtime
* slightly more verbose output in built_opt_tbl.c

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2586 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/arch/i386/boot/linuxbios_table.c b/src/arch/i386/boot/linuxbios_table.c
index f1be49bbc62de36aa8b27281744215544e13c172..569692e019e49d19be07eef2a4a38be0bd3bdcd6 100644 (file)
--- a/src/arch/i386/boot/linuxbios_table.c
+++ b/src/arch/i386/boot/linuxbios_table.c
@@ -365,7 +365,8 @@ unsigned long write_linuxbios_table(
                low_table_end = (unsigned long)head;
        }
 
-       if (HAVE_OPTION_TABLE == 1) {
+#if (HAVE_OPTION_TABLE == 1) 
+       {
                struct lb_record *rec_dest, *rec_src;
                /* Write the option config table... */
                rec_dest = lb_new_record(head);
@@ -374,6 +375,7 @@ unsigned long write_linuxbios_table(
                /* Create cmos checksum entry in linuxbios table */
                lb_cmos_checksum(head);
        }
+#endif
        /* Record where RAM is located */
        mem = build_lb_mem(head);
        

diff --git a/src/mainboard/tyan/s2881/auto.c b/src/mainboard/tyan/s2881/auto.c
index be3deaacbf06f76ef2cdaf232e9635fb394fe14f..924d7589b2b4e73c1c4ed2970f5bd0ec65c957be 100644 (file)
--- a/src/mainboard/tyan/s2881/auto.c
+++ b/src/mainboard/tyan/s2881/auto.c
@@ -20,7 +20,6 @@
 #include "cpu/x86/lapic/boot_cpu.c"
 #include "northbridge/amd/amdk8/reset_test.c"
 #include "northbridge/amd/amdk8/debug.c"
-#include "northbridge/amd/amdk8/cpu_rev.c"
 #include "superio/winbond/w83627hf/w83627hf_early_serial.c"
 #include "cpu/amd/mtrr/amd_earlymtrr.c"
 #include "cpu/x86/bist.h"

diff --git a/src/mainboard/tyan/s2885/auto.c b/src/mainboard/tyan/s2885/auto.c
index 365ac241fbaf5327adc4e58ebe7b8d7d763920b2..7b892d0527472d8d00dc7492f611520fdfa62adf 100644 (file)
--- a/src/mainboard/tyan/s2885/auto.c
+++ b/src/mainboard/tyan/s2885/auto.c
@@ -19,7 +19,6 @@
 #include "northbridge/amd/amdk8/reset_test.c"
 #include "northbridge/amd/amdk8/debug.c"
 #include "northbridge/amd/amdk8/incoherent_ht.c"
-#include "northbridge/amd/amdk8/cpu_rev.c"
 #include "superio/winbond/w83627hf/w83627hf_early_serial.c"
 #include "cpu/amd/mtrr/amd_earlymtrr.c"
 #include "cpu/x86/bist.h"

diff --git a/src/mainboard/tyan/s2891/auto.c b/src/mainboard/tyan/s2891/auto.c
index bf9968e4a19eb03063196ed6343c5718a0aa0116..c8747a88cb5b7b36ad487958b4651fbfb0915730 100644 (file)
--- a/src/mainboard/tyan/s2891/auto.c
+++ b/src/mainboard/tyan/s2891/auto.c
@@ -12,7 +12,6 @@
 #include "arch/i386/lib/console.c"
 #include "ram/ramtest.c"
 
-#include "northbridge/amd/amdk8/cpu_rev.c"
 #define K8_HT_FREQ_1G_SUPPORT 0
 #include "northbridge/amd/amdk8/incoherent_ht.c"
 #include "southbridge/nvidia/ck804/ck804_early_smbus.c"

diff --git a/src/mainboard/tyan/s2892/auto.c b/src/mainboard/tyan/s2892/auto.c
index d6553662205e56e7b60307127617fbb76d0baa47..917fb8414a7aed4bcac3689f2233ec84bea88e40 100644 (file)
--- a/src/mainboard/tyan/s2892/auto.c
+++ b/src/mainboard/tyan/s2892/auto.c
@@ -12,7 +12,6 @@
 #include "arch/i386/lib/console.c"
 #include "ram/ramtest.c"
 
-#include "northbridge/amd/amdk8/cpu_rev.c"
 #define K8_HT_FREQ_1G_SUPPORT 1
 #include "northbridge/amd/amdk8/incoherent_ht.c"
 #include "southbridge/nvidia/ck804/ck804_early_smbus.c"

diff --git a/src/mainboard/tyan/s2895/auto.c b/src/mainboard/tyan/s2895/auto.c
index c607b16005eb8a34b94d193f7699c3c42b67268f..2aa19115ab2deef8773815d42e6b5c41a8bb812c 100644 (file)
--- a/src/mainboard/tyan/s2895/auto.c
+++ b/src/mainboard/tyan/s2895/auto.c
@@ -13,7 +13,6 @@
 #include "arch/i386/lib/console.c"
 #include "ram/ramtest.c"
 
-#include "northbridge/amd/amdk8/cpu_rev.c"
 //#define K8_HT_FREQ_1G_SUPPORT 1
 #include "northbridge/amd/amdk8/incoherent_ht.c"
 #include "southbridge/nvidia/ck804/ck804_early_smbus.c"

diff --git a/src/northbridge/amd/amdk8/cpu_rev.c b/src/northbridge/amd/amdk8/cpu_rev.c
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/util/options/build_opt_tbl.c b/util/options/build_opt_tbl.c
index c5a4b7b777816bd0e48bdfe676522aa797cd6345..91906a967cc8e54ee19b490a57187c8cc834c7cf 100644 (file)
--- a/util/options/build_opt_tbl.c
+++ b/util/options/build_opt_tbl.c
@@ -462,7 +462,8 @@ int main(int argc, char **argv)
                        exit(1);
                }
                if ((cs->range_end/8) != LB_CKS_RANGE_END) {
-                       fprintf(stderr, "Error - Range end does not match define in line\n%s\n", line);
+                       fprintf(stderr, "Error - Range end (%d) does not match define (%d) in line\n%s\n", 
+                                       (cs->range_end/8), LB_CKS_RANGE_END, line);
                        exit(1);
                }
                if ((cs->location/8) != LB_CKS_LOC) {