diff options
| author | Stefan Reinauer <stepan@coresystems.de> | 2009-07-23 22:03:14 +0000 |
|---|---|---|
| committer | Patrick Georgi <patrick.georgi@coresystems.de> | 2009-07-23 22:03:14 +0000 |
| commit | f64893a94ffb2b7d79364736fc10aebe9bd9176e (patch) | |
| tree | 67bf3d26a9b2a6a7e82eb704b4e0e028e80ea844 /src/arch/i386 | |
| parent | aeb6c9870f0b1af8c0b55b2034f881da6757c4a4 (diff) | |
| download | coreboot-f64893a94ffb2b7d79364736fc10aebe9bd9176e.tar.xz | |
CBFS stuff:
- update, add, and improve comments
- whitespace here and there
- remove unused or write-only variables
- improve debug output
- only build payload.{nrv2b,lzma} for non-cbfs
- improved error checking in cbfstool
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Peter Stuge <peter@stuge.se>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4466 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/arch/i386')
| -rw-r--r-- | src/arch/i386/Config.lb | 4 | ||||
| -rw-r--r-- | src/arch/i386/init/crt0.S.lb | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/arch/i386/Config.lb b/src/arch/i386/Config.lb index 1691d29a79..4c6278acb5 100644 --- a/src/arch/i386/Config.lb +++ b/src/arch/i386/Config.lb @@ -5,6 +5,7 @@ uses CONFIG_USE_INIT uses CONFIG_HAVE_FAILOVER_BOOT uses CONFIG_USE_FAILOVER_IMAGE uses CONFIG_USE_FALLBACK_IMAGE +uses CONFIG_CBFS init init/crt0.S.lb @@ -82,9 +83,12 @@ end # catch the case where there is no compression makedefine PAYLOAD-1:=payload +if CONFIG_CBFS +else # match the case where a compression type is specified. makedefine PAYLOAD-$(CONFIG_COMPRESSED_PAYLOAD_NRV2B):=payload.nrv2b makedefine PAYLOAD-$(CONFIG_COMPRESSED_PAYLOAD_LZMA):=payload.lzma +end # catch the case where there is precompression. Yes, this bites. if CONFIG_PRECOMPRESSED_PAYLOAD diff --git a/src/arch/i386/init/crt0.S.lb b/src/arch/i386/init/crt0.S.lb index e60144840c..3865ba3c3f 100644 --- a/src/arch/i386/init/crt0.S.lb +++ b/src/arch/i386/init/crt0.S.lb @@ -142,7 +142,7 @@ str_copying_to_ram: .string "Uncompressing coreboot to RAM.\r\n" #else str_copying_to_ram: .string "Copying coreboot to RAM.\r\n" #endif -#if CONFIG_CBFS +#if CONFIG_CBFS == 1 # if CONFIG_USE_FALLBACK_IMAGE == 1 str_coreboot_ram_name: .string "fallback/coreboot_ram" # else |