[LinuxBIOS] r2586 - in trunk/LinuxBIOSv2: src/arch/i386/boot src/mainboard/tyan/s2881 src/mainboard/tyan/s2885 src/mainboard/tyan/s2891 src/mainboard/tyan/s2892 src/mainboard/tyan/s2895 src/northbridge/amd/amdk8 util/options

Author: stepan
Date: 2007-04-06 14:14:51 +0200 (Fri, 06 Apr 2007)
New Revision: 2586

Removed:
   trunk/LinuxBIOSv2/src/northbridge/amd/amdk8/cpu_rev.c
Modified:
   trunk/LinuxBIOSv2/src/arch/i386/boot/linuxbios_table.c
   trunk/LinuxBIOSv2/src/mainboard/tyan/s2881/auto.c
   trunk/LinuxBIOSv2/src/mainboard/tyan/s2885/auto.c
   trunk/LinuxBIOSv2/src/mainboard/tyan/s2891/auto.c
   trunk/LinuxBIOSv2/src/mainboard/tyan/s2892/auto.c
   trunk/LinuxBIOSv2/src/mainboard/tyan/s2895/auto.c
   trunk/LinuxBIOSv2/util/options/build_opt_tbl.c
Log:
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 
Acked-by: Stefan Reinauer

Modified: trunk/LinuxBIOSv2/src/arch/i386/boot/linuxbios_table.c
===================================================================
--- trunk/LinuxBIOSv2/src/arch/i386/boot/linuxbios_table.c	2007-04-06 11:58:03 UTC (rev 2585)
+++ trunk/LinuxBIOSv2/src/arch/i386/boot/linuxbios_table.c	2007-04-06 12:14:51 UTC (rev 2586)
@@ -365,7 +365,8 @@
    	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 @@
    	/* Create cmos checksum entry in linuxbios table */
    	lb_cmos_checksum(head);
    }
+#endif
    /* Record where RAM is located */
    mem = build_lb_mem(head);

Modified: trunk/LinuxBIOSv2/src/mainboard/tyan/s2881/auto.c
===================================================================
--- trunk/LinuxBIOSv2/src/mainboard/tyan/s2881/auto.c	2007-04-06 11:58:03 UTC (rev 2585)
+++ trunk/LinuxBIOSv2/src/mainboard/tyan/s2881/auto.c	2007-04-06 12:14:51 UTC (rev 2586)
@@ -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"

Modified: trunk/LinuxBIOSv2/src/mainboard/tyan/s2885/auto.c
===================================================================
--- trunk/LinuxBIOSv2/src/mainboard/tyan/s2885/auto.c	2007-04-06 11:58:03 UTC (rev 2585)
+++ trunk/LinuxBIOSv2/src/mainboard/tyan/s2885/auto.c	2007-04-06 12:14:51 UTC (rev 2586)
@@ -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"

Modified: trunk/LinuxBIOSv2/src/mainboard/tyan/s2891/auto.c
===================================================================
--- trunk/LinuxBIOSv2/src/mainboard/tyan/s2891/auto.c	2007-04-06 11:58:03 UTC (rev 2585)
+++ trunk/LinuxBIOSv2/src/mainboard/tyan/s2891/auto.c	2007-04-06 12:14:51 UTC (rev 2586)
@@ -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"

Modified: trunk/LinuxBIOSv2/src/mainboard/tyan/s2892/auto.c
===================================================================
--- trunk/LinuxBIOSv2/src/mainboard/tyan/s2892/auto.c	2007-04-06 11:58:03 UTC (rev 2585)
+++ trunk/LinuxBIOSv2/src/mainboard/tyan/s2892/auto.c	2007-04-06 12:14:51 UTC (rev 2586)
@@ -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"

Modified: trunk/LinuxBIOSv2/src/mainboard/tyan/s2895/auto.c
===================================================================
--- trunk/LinuxBIOSv2/src/mainboard/tyan/s2895/auto.c	2007-04-06 11:58:03 UTC (rev 2585)
+++ trunk/LinuxBIOSv2/src/mainboard/tyan/s2895/auto.c	2007-04-06 12:14:51 UTC (rev 2586)
@@ -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"

Deleted: trunk/LinuxBIOSv2/src/northbridge/amd/amdk8/cpu_rev.c
===================================================================

Modified: trunk/LinuxBIOSv2/util/options/build_opt_tbl.c
===================================================================
--- trunk/LinuxBIOSv2/util/options/build_opt_tbl.c	2007-04-06 11:58:03 UTC (rev 2585)
+++ trunk/LinuxBIOSv2/util/options/build_opt_tbl.c	2007-04-06 12:14:51 UTC (rev 2586)
@@ -462,7 +462,8 @@
    		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) {