[v2] r4315 - in trunk/coreboot-v2: src/arch/i386 src/arch/i386/init src/arch/i386/lib src/cpu/amd/car src/cpu/x86/car src/lib targets/kontron/986lcd-m util/newconfig
Author: oxygene Date: 2009-05-27 16:19:31 +0200 (Wed, 27 May 2009) New Revision: 4315
Added: trunk/coreboot-v2/src/arch/i386/init/ldscript_cbfs.lb trunk/coreboot-v2/src/arch/i386/init/ldscript_fallback_cbfs.lb trunk/coreboot-v2/src/arch/i386/lib/cbfs_and_run.c Modified: trunk/coreboot-v2/src/arch/i386/Config.lb trunk/coreboot-v2/src/arch/i386/init/crt0.S.lb trunk/coreboot-v2/src/arch/i386/lib/Config.lb trunk/coreboot-v2/src/cpu/amd/car/copy_and_run.c trunk/coreboot-v2/src/cpu/x86/car/copy_and_run.c trunk/coreboot-v2/src/lib/cbfs.c trunk/coreboot-v2/targets/kontron/986lcd-m/Config-abuild.lb trunk/coreboot-v2/util/newconfig/config.g Log: Move coreboot_ram and coreboot_apc to CBFS. This allows to reduce the size of the bootblock (done for kontron/986lcd-m)
Signed-off-by: Patrick Georgi patrick.georgi@coresystems.de Acked-by: Ronald G. Minnich rminnich@gmail.com
Modified: trunk/coreboot-v2/src/arch/i386/Config.lb =================================================================== --- trunk/coreboot-v2/src/arch/i386/Config.lb 2009-05-27 13:46:37 UTC (rev 4314) +++ trunk/coreboot-v2/src/arch/i386/Config.lb 2009-05-27 14:19:31 UTC (rev 4315) @@ -1,3 +1,4 @@ +uses CONFIG_CBFS uses CONFIG_SMP uses CONFIG_PRECOMPRESSED_PAYLOAD uses CONFIG_USE_INIT @@ -7,18 +8,39 @@
init init/crt0.S.lb
+if CONFIG_CBFS + if USE_FAILOVER_IMAGE + else + initobject /src/lib/cbfs.o + initobject /src/console/vsprintf.o + initobject /src/lib/lzma.o + end +end + if HAVE_FAILOVER_BOOT - if USE_FAILOVER_IMAGE - ldscript init/ldscript_failover.lb - else - ldscript init/ldscript.lb - end + if USE_FAILOVER_IMAGE + ldscript init/ldscript_failover.lb + else + if CONFIG_CBFS + ldscript init/ldscript_cbfs.lb + else + ldscript init/ldscript.lb + end + end else - if USE_FALLBACK_IMAGE - ldscript init/ldscript_fallback.lb - else - ldscript init/ldscript.lb - end + if CONFIG_CBFS + if USE_FALLBACK_IMAGE + ldscript init/ldscript_fallback_cbfs.lb + else + ldscript init/ldscript_cbfs.lb + end + else + if USE_FALLBACK_IMAGE + ldscript init/ldscript_fallback.lb + else + ldscript init/ldscript.lb + end + end end
makerule all
Modified: trunk/coreboot-v2/src/arch/i386/init/crt0.S.lb =================================================================== --- trunk/coreboot-v2/src/arch/i386/init/crt0.S.lb 2009-05-27 13:46:37 UTC (rev 4314) +++ trunk/coreboot-v2/src/arch/i386/init/crt0.S.lb 2009-05-27 14:19:31 UTC (rev 4315) @@ -73,6 +73,10 @@ movl $0x4000000, %esp movl %esp, %ebp pushl %esi +#ifdef CONFIG_CBFS + pushl $str_coreboot_ram_name + call cbfs_and_run_core +#else movl $_liseg, %esi movl $_iseg, %edi movl $_eiseg, %ecx @@ -81,6 +85,7 @@ pushl %edi pushl %esi call copy_and_run_core +#endif
.Lhlt: intel_chip_post_macro(0xee) /* post fe */ @@ -137,6 +142,13 @@ #else str_copying_to_ram: .string "Copying coreboot to RAM.\r\n" #endif +#if CONFIG_CBFS +# if USE_FALLBACK_IMAGE == 1 +str_coreboot_ram_name: .string "fallback/coreboot_ram" +# else +str_coreboot_ram_name: .string "normal/coreboot_ram" +# endif +#endif str_pre_main: .string "Jumping to coreboot.\r\n" .previous
Copied: trunk/coreboot-v2/src/arch/i386/init/ldscript_cbfs.lb (from rev 4311, trunk/coreboot-v2/src/arch/i386/init/ldscript.lb) =================================================================== --- trunk/coreboot-v2/src/arch/i386/init/ldscript_cbfs.lb (rev 0) +++ trunk/coreboot-v2/src/arch/i386/init/ldscript_cbfs.lb 2009-05-27 14:19:31 UTC (rev 4315) @@ -0,0 +1,59 @@ +/* + * Memory map: + * + * _RAMBASE + * : data segment + * : bss segment + * : heap + * : stack + * _ROMBASE + * : coreboot text + * : readonly text + */ +/* + * Bootstrap code for the STPC Consumer + * Copyright (c) 1999 by Net Insight AB. All Rights Reserved. + * + */ + +/* + * Written by Johan Rydberg, based on work by Daniel Kahlin. + * Rewritten by Eric Biederman + */ +/* + * We use ELF as output format. So that we can + * debug the code in some form. + */ +OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386") +OUTPUT_ARCH(i386) + +/* +ENTRY(_start) +*/ + +TARGET(binary) +SECTIONS +{ + . = _ROMBASE; + + /* This section might be better named .setup */ + .rom . : { + _rom = .; + *(.rom.text); + *(.rom.data); + *(.rodata.*); + *(.rom.data.*); + . = ALIGN(16); + _erom = .; + } + + _lrom = LOADADDR(.rom); + _elrom = LOADADDR(.rom) + SIZEOF(.rom); + + /DISCARD/ : { + *(.comment) + *(.comment.*) + *(.note) + *(.note.*) + } +}
Property changes on: trunk/coreboot-v2/src/arch/i386/init/ldscript_cbfs.lb ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:mergeinfo + Added: svn:eol-style + native
Copied: trunk/coreboot-v2/src/arch/i386/init/ldscript_fallback_cbfs.lb (from rev 4311, trunk/coreboot-v2/src/arch/i386/init/ldscript_fallback.lb) =================================================================== --- trunk/coreboot-v2/src/arch/i386/init/ldscript_fallback_cbfs.lb (rev 0) +++ trunk/coreboot-v2/src/arch/i386/init/ldscript_fallback_cbfs.lb 2009-05-27 14:19:31 UTC (rev 4315) @@ -0,0 +1,64 @@ +/* + * Memory map: + * + * _RAMBASE + * : data segment + * : bss segment + * : heap + * : stack + * _ROMBASE + * : coreboot text + * : readonly text + */ +/* + * Bootstrap code for the STPC Consumer + * Copyright (c) 1999 by Net Insight AB. All Rights Reserved. + * + */ + +/* + * Written by Johan Rydberg, based on work by Daniel Kahlin. + * Rewritten by Eric Biederman + */ +/* + * We use ELF as output format. So that we can + * debug the code in some form. + */ +OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386") +OUTPUT_ARCH(i386) + +/* +ENTRY(_start) +*/ + +TARGET(binary) +SECTIONS +{ + . = _ROMBASE; + + /* cut _start into last 64k*/ + _x = .; + . = (_x < (_ROMBASE - 0x10000 + ROM_IMAGE_SIZE)) ? (_ROMBASE - 0x10000 + ROM_IMAGE_SIZE) : _x; + + /* This section might be better named .setup */ + .rom . : { + _rom = .; + *(.rom.text); + *(.rom.data); + *(.init.rodata.*); + *(.rodata.*); + *(.rom.data.*); + . = ALIGN(16); + _erom = .; + } + + _lrom = LOADADDR(.rom); + _elrom = LOADADDR(.rom) + SIZEOF(.rom); + + /DISCARD/ : { + *(.comment) + *(.note) + *(.comment.*) + *(.note.*) + } +}
Property changes on: trunk/coreboot-v2/src/arch/i386/init/ldscript_fallback_cbfs.lb ___________________________________________________________________ Added: svn:mergeinfo +
Modified: trunk/coreboot-v2/src/arch/i386/lib/Config.lb =================================================================== --- trunk/coreboot-v2/src/arch/i386/lib/Config.lb 2009-05-27 13:46:37 UTC (rev 4314) +++ trunk/coreboot-v2/src/arch/i386/lib/Config.lb 2009-05-27 14:19:31 UTC (rev 4315) @@ -1,6 +1,7 @@ uses CONFIG_USE_INIT uses CONFIG_USE_PRINTK_IN_CAR uses USE_FAILOVER_IMAGE +uses CONFIG_CBFS
object c_start.S object cpu.c @@ -14,5 +15,9 @@
if USE_FAILOVER_IMAGE else - initobject copy_and_run.o + if CONFIG_CBFS + initobject cbfs_and_run.o + else + initobject copy_and_run.o + end end
Copied: trunk/coreboot-v2/src/arch/i386/lib/cbfs_and_run.c (from rev 4311, trunk/coreboot-v2/src/arch/i386/lib/copy_and_run.c) =================================================================== --- trunk/coreboot-v2/src/arch/i386/lib/cbfs_and_run.c (rev 0) +++ trunk/coreboot-v2/src/arch/i386/lib/cbfs_and_run.c 2009-05-27 14:19:31 UTC (rev 4315) @@ -0,0 +1,23 @@ +/* by yhlu 6.2005 + moved from nrv2v.c and some lines from crt0.S + 2006/05/02 - stepan: move nrv2b to an extra file. +*/ + +#include <console/console.h> +#include <cbfs.h> + +void cbfs_and_run_core(char *filename, unsigned ebp) +{ + u8 *dst; + print_debug("Jumping to image.\r\n"); + dst = cbfs_load_stage(filename); + print_debug("Jumping to image.\r\n"); + + __asm__ volatile ( + "movl %%eax, %%ebp\n\t" + "cli\n\t" + "jmp *%%edi\n\t" + :: "a"(ebp), "D"(dst) + ); + +}
Property changes on: trunk/coreboot-v2/src/arch/i386/lib/cbfs_and_run.c ___________________________________________________________________ Added: svn:mergeinfo +
Modified: trunk/coreboot-v2/src/cpu/amd/car/copy_and_run.c =================================================================== --- trunk/coreboot-v2/src/cpu/amd/car/copy_and_run.c 2009-05-27 13:46:37 UTC (rev 4314) +++ trunk/coreboot-v2/src/cpu/amd/car/copy_and_run.c 2009-05-27 14:19:31 UTC (rev 4315) @@ -3,6 +3,31 @@ 2006/05/02 - stepan: move nrv2b to an extra file. */
+#if CONFIG_CBFS == 1 +void cbfs_and_run_core(char*, unsigned ebp); + +static void copy_and_run(void) +{ +# if USE_FALLBACK_IMAGE == 1 + cbfs_and_run_core("fallback/coreboot_ram", 0); +# else + cbfs_and_run_core("normal/coreboot_ram", 0); +# endif +} + +#if CONFIG_AP_CODE_IN_CAR == 1 + +static void copy_and_run_ap_code_in_car(unsigned ret_addr) +{ +# if USE_FALLBACK_IMAGE == 1 + cbfs_and_run_core("fallback/coreboot_apc", ret_addr); +# else + cbfs_and_run_core("normal/coreboot_apc", ret_addr); +# endif +} +#endif + +#else void copy_and_run_core(u8 *src, u8 *dst, unsigned long ilen, unsigned ebp);
extern u8 _liseg, _iseg, _eiseg; @@ -35,3 +60,4 @@ copy_and_run_core(src, dst, ilen, ret_addr); } #endif +#endif
Modified: trunk/coreboot-v2/src/cpu/x86/car/copy_and_run.c =================================================================== --- trunk/coreboot-v2/src/cpu/x86/car/copy_and_run.c 2009-05-27 13:46:37 UTC (rev 4314) +++ trunk/coreboot-v2/src/cpu/x86/car/copy_and_run.c 2009-05-27 14:19:31 UTC (rev 4315) @@ -2,6 +2,22 @@ (Written by Patrick Georgi patrick.georgi@coresystems.de for coresystems GmbH */
+#if CONFIG_CBFS == 1 +void cbfs_and_run_core(char*, unsigned ebp); + +static void copy_and_run(unsigned cpu_reset) +{ + if (cpu_reset == 1) cpu_reset = -1; + else cpu_reset = 0; + +# if USE_FALLBACK_IMAGE == 1 + cbfs_and_run_core("fallback/coreboot_ram", cpu_reset); +# else + cbfs_and_run_core("normal/coreboot_ram", cpu_reset); +# endif +} + +#else void copy_and_run_core(u8 *src, u8 *dst, unsigned long ilen, unsigned ebp);
extern u8 _liseg, _iseg, _eiseg; @@ -21,3 +37,5 @@
copy_and_run_core(src, dst, ilen, cpu_reset); } +#endif +
Modified: trunk/coreboot-v2/src/lib/cbfs.c =================================================================== --- trunk/coreboot-v2/src/lib/cbfs.c 2009-05-27 13:46:37 UTC (rev 4314) +++ trunk/coreboot-v2/src/lib/cbfs.c 2009-05-27 14:19:31 UTC (rev 4315) @@ -38,14 +38,11 @@ memcpy(dst, src, len); return 0;
-#if CONFIG_COMPRESSED_PAYLOAD_LZMA==1 - case CBFS_COMPRESS_LZMA: { unsigned long ulzma(unsigned char *src, unsigned char *dst); ulzma(src, dst); } return 0; -#endif
#if CONFIG_COMPRESSED_PAYLOAD_NRV2B==1 case CBFS_COMPRESS_NRV2B: { @@ -186,16 +183,17 @@ return (void *) -1;
printk_info("Stage: load @ %d/%d bytes, enter @ %llx\n", - ntohl((u32) stage->load), ntohl(stage->memlen), + (u32) stage->load, stage->memlen, stage->entry); - memset((void *) ntohl((u32) stage->load), 0, ntohl(stage->memlen)); + memset((void *) (u32) stage->load, 0, stage->memlen);
- if (cbfs_decompress(ntohl(stage->compression), + if (cbfs_decompress(stage->compression, ((unsigned char *) stage) + sizeof(struct cbfs_stage), - (void *) ntohl((u32) stage->load), - ntohl(stage->len))) + (void *) (u32) stage->load, + stage->len)) return (void *) -1; + printk_info("Stage: done loading.\n");
entry = stage->entry; // return (void *) ntohl((u32) stage->entry);
Modified: trunk/coreboot-v2/targets/kontron/986lcd-m/Config-abuild.lb =================================================================== --- trunk/coreboot-v2/targets/kontron/986lcd-m/Config-abuild.lb 2009-05-27 13:46:37 UTC (rev 4314) +++ trunk/coreboot-v2/targets/kontron/986lcd-m/Config-abuild.lb 2009-05-27 14:19:31 UTC (rev 4315) @@ -11,18 +11,18 @@ __LOGLEVEL__
option ROM_SIZE=1024*1024 -option FALLBACK_SIZE=1024*512 +option FALLBACK_SIZE=1024*64
romimage "normal" option USE_FALLBACK_IMAGE=0 - option ROM_IMAGE_SIZE=0x24000 + option ROM_IMAGE_SIZE=0x10000 option COREBOOT_EXTRA_VERSION=".0-normal" payload __PAYLOAD__ end
romimage "fallback" option USE_FALLBACK_IMAGE=1 - option ROM_IMAGE_SIZE=0x24000 + option ROM_IMAGE_SIZE=0x10000 option COREBOOT_EXTRA_VERSION=".0-fallback" payload __PAYLOAD__ end
Modified: trunk/coreboot-v2/util/newconfig/config.g =================================================================== --- trunk/coreboot-v2/util/newconfig/config.g 2009-05-27 13:46:37 UTC (rev 4314) +++ trunk/coreboot-v2/util/newconfig/config.g 2009-05-27 14:19:31 UTC (rev 4315) @@ -2303,6 +2303,9 @@ #failover is a hack that will go away soon. if (j != "failover") and (rommapping[j] != "/dev/null"): file.write("\t./cbfstool %s add-payload %s %s/payload $(CBFS_COMPRESS_FLAG)\n" % (i.name, rommapping[j], j,)) + if (j != "failover"): + file.write("\t./cbfstool %s add-stage %s/coreboot_ram %s/coreboot_ram $(CBFS_COMPRESS_FLAG)\n" % (i.name, j, j,)) + file.write("\tif [ -f %s/coreboot_apc ]; then ./cbfstool %s add-stage %s/coreboot_apc %s/coreboot_apc $(CBFS_COMPRESS_FLAG); fi\n" % (j, i.name, j, j,)) file.write("\t./cbfstool %s print\n" % i.name) file.write("\n") file.write("else\n\n")
-
svn＠coreboot.org