diff options
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 |