From 798ef2893c44ce3194c539c8c5db33d11e8edbac Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Mon, 29 Mar 2010 22:08:01 +0000 Subject: This drops the ASSEMBLY define from romstage.c, too (since it's not assembly code, this was a dirty hack anyways) Also run awk 1 RS= ORS="\n\n" < $FILE > $FILE.nonewlines mv $FILE.nonewlines $FILE on romstage.c because my perl -pi -e 's,#define ASSEMBLY 1,,g' */*/romstage.c cut some holes into the source. Signed-off-by: Stefan Reinauer Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5320 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/mainboard/technexion/tim5690/romstage.c | 5 +---- src/mainboard/technexion/tim8690/romstage.c | 6 +----- 2 files changed, 2 insertions(+), 9 deletions(-) (limited to 'src/mainboard/technexion') diff --git a/src/mainboard/technexion/tim5690/romstage.c b/src/mainboard/technexion/tim5690/romstage.c index a222a1a243..309016e787 100644 --- a/src/mainboard/technexion/tim5690/romstage.c +++ b/src/mainboard/technexion/tim5690/romstage.c @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#define ASSEMBLY 1 - - #define RAMINIT_SYSINFO 1 #define K8_SET_FIDVID 1 #define QRANK_DIMM_SUPPORT 1 @@ -186,7 +183,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) rs690_htinit(); printk(BIOS_DEBUG, "needs_reset=0x%x\n", needs_reset); - if (needs_reset) { print_info("ht reset -\r\n"); soft_reset(); @@ -214,3 +210,4 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) post_cache_as_ram(); } + diff --git a/src/mainboard/technexion/tim8690/romstage.c b/src/mainboard/technexion/tim8690/romstage.c index 1abb97c775..769f674a91 100644 --- a/src/mainboard/technexion/tim8690/romstage.c +++ b/src/mainboard/technexion/tim8690/romstage.c @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#define ASSEMBLY 1 - - #define RAMINIT_SYSINFO 1 #define K8_SET_FIDVID 1 #define QRANK_DIMM_SUPPORT 1 @@ -111,7 +108,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) struct cpuid_result cpuid1; struct sys_info *sysinfo = (struct sys_info *)(CONFIG_DCACHE_RAM_BASE + CONFIG_DCACHE_RAM_SIZE - CONFIG_DCACHE_RAM_GLOBAL_VAR_SIZE); - if (!cpu_init_detectedx && boot_cpu()) { /* Nothing special needs to be done to find bus 0 */ /* Allow the HT devices to be found */ @@ -181,7 +177,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) rs690_htinit(); printk(BIOS_DEBUG, "needs_reset=0x%x\n", needs_reset); - if (needs_reset) { print_info("ht reset -\r\n"); soft_reset(); @@ -200,3 +195,4 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) post_cache_as_ram(); } + -- cgit v1.2.3