[v2] r4494 - in trunk/coreboot-v2/src: arch/i386/init mainboard/digitallogic/msm586seg mainboard/technologic/ts5300

Author: oxygene
Date: 2009-08-05 12:48:43 +0200 (Wed, 05 Aug 2009)
New Revision: 4494

Modified:
   trunk/coreboot-v2/src/arch/i386/init/crt0.S.lb
   trunk/coreboot-v2/src/mainboard/digitallogic/msm586seg/mainboard.c
   trunk/coreboot-v2/src/mainboard/technologic/ts5300/mainboard.c
Log:
Fix the generic code for copying and running coreboot_ram in case
certain configuration options are disabled. The strings were just
at the wrong place.

Two boards fix up some variables for romstream. This isn't necessary (or
possible) when CBFS is active, as there is no romstream. It would be
nicer to have them depend on CONFIG_ROM_PAYLOAD, but there isn't any
invariant that forces that to be inactive if CBFS is active, and this
patch is supposed to be small, esp. as the stream loaders are on the way
out.

Signed-off-by: Patrick Georgi 
Acked-by: Ronald G. Minnich

Modified: trunk/coreboot-v2/src/arch/i386/init/crt0.S.lb
===================================================================
--- trunk/coreboot-v2/src/arch/i386/init/crt0.S.lb	2009-08-05 09:20:02 UTC (rev 4493)
+++ trunk/coreboot-v2/src/arch/i386/init/crt0.S.lb	2009-08-05 10:48:43 UTC (rev 4494)
@@ -70,6 +70,7 @@
     * Normally this is copying from FLASH ROM to RAM.
     */
    movl	%ebp, %esi
+	/* FIXME: look for a proper place for the stack */
    movl	$0x4000000, %esp
    movl	%esp, %ebp
    pushl %esi
@@ -142,6 +143,11 @@
 #else
 str_copying_to_ram:  .string "Copying coreboot to RAM.\r\n"
 #endif
+str_pre_main:        .string "Jumping to coreboot.\r\n"
+.previous
+
+#endif /* ASM_CONSOLE_LOGLEVEL > BIOS_DEBUG */
+
 #if CONFIG_CBFS == 1
 # if CONFIG_USE_FALLBACK_IMAGE == 1
 str_coreboot_ram_name:	.string "fallback/coreboot_ram"
@@ -149,9 +155,5 @@
 str_coreboot_ram_name:	.string "normal/coreboot_ram"
 # endif
 #endif
-str_pre_main:        .string "Jumping to coreboot.\r\n"
-.previous

-#endif /* ASM_CONSOLE_LOGLEVEL > BIOS_DEBUG */
-
 #endif /* CONFIG_USE_DCACHE_RAM */

Modified: trunk/coreboot-v2/src/mainboard/digitallogic/msm586seg/mainboard.c
===================================================================
--- trunk/coreboot-v2/src/mainboard/digitallogic/msm586seg/mainboard.c	2009-08-05 09:20:02 UTC (rev 4493)
+++ trunk/coreboot-v2/src/mainboard/digitallogic/msm586seg/mainboard.c	2009-08-05 10:48:43 UTC (rev 4494)
@@ -35,7 +35,9 @@
    - set ADDDECTL (now done in raminit.c in cpu/amd/sc520
 */
 static void enable_dev(struct device *dev) {
+#if !CONFIG_CBFS
    extern unsigned char *rom_start, *rom_end;
+#endif
    volatile struct mmcrpic *pic = MMCRPIC;
    volatile struct mmcr *mmcr = MMCRDEFAULT;

@@ -134,10 +136,12 @@
    /* follow fuctory here */
    mmcr->dmacontrol.extchanmapa = 0x3210;

+#if !CONFIG_CBFS
    /* hack for IDIOTIC need to fix rom_start */
    printk_err("Patching rom_start due to sc520 limits\n");
    rom_start = 0x2000000 + 0x40000;
    rom_end = rom_start + CONFIG_PAYLOAD_SIZE - 1;
+#endif

}

Modified: trunk/coreboot-v2/src/mainboard/technologic/ts5300/mainboard.c
===================================================================
--- trunk/coreboot-v2/src/mainboard/technologic/ts5300/mainboard.c	2009-08-05 09:20:02 UTC (rev 4493)
+++ trunk/coreboot-v2/src/mainboard/technologic/ts5300/mainboard.c	2009-08-05 10:48:43 UTC (rev 4494)
@@ -35,7 +35,9 @@
    - set ADDDECTL (now done in raminit.c in cpu/amd/sc520
 */
 static void enable_dev(struct device *dev) {
+#if !CONFIG_CBFS
    extern unsigned char *rom_start, *rom_end;
+#endif
    volatile struct mmcrpic *pic = MMCRPIC;
    volatile struct mmcr *mmcr = MMCRDEFAULT;

@@ -139,10 +141,12 @@
    mmcr->dmacontrol.extchanmapa = 0xf210;
    mmcr->dmacontrol.extchanmapb = 0xffff;

+#if !CONFIG_CBFS
    /* hack for IDIOTIC need to fix rom_start */
    printk_err("Patching rom_start due to sc520 limits\n");
    rom_start = 0x09400000 + 0xe0000;
    rom_end = rom_start + CONFIG_PAYLOAD_SIZE - 1;
+#endif

printk_err("TS5300 EXIT %s\n", __func__);