[coreboot] patch

[Myles Watson]

On Thu, Apr 23, 2009 at 10:20 AM, ron minnich <rminnich at gmail.com> wrote:
> On Thu, Apr 23, 2009 at 8:51 AM, Myles Watson <mylesgw at gmail.com> wrote:
>>  (and, for the record: no more #ifdef in coreboot. We're not going to have
>> this happen again.If we do have it in v2, let's remove it.)
>>
>> -#ifdef CONFIG_COMPRESSION_LZMA
>> +#ifdef CONFIG_COMPRESSED_PAYLOAD_LZMA==1
>>
>>        case CBFS_COMPRESS_LZMA: {
>>                unsigned long ulzma(unsigned char *src, unsigned char *dst);
>>
>> I think you missed one.
>>
>> Myles
>>
>
> Never do things in a hurry, my mom always told me.
>
> Here we go again.
>
> Signed-off-by: Ronald G. Minnich <rminnich at gmail.com>
> Index: src/lib/cbfs.c
> ===================================================================
> --- src/lib/cbfs.c      (revision 4195)
> +++ src/lib/cbfs.c      (working copy)
> @@ -39,7 +39,7 @@
>                memcpy(dst, src, len);
>                return 0;
>
> -#ifdef CONFIG_COMPRESSION_LZMA
> +#if CONFIG_COMPRESSED_PAYLOAD_LZMA==1
>
>        case CBFS_COMPRESS_LZMA: {
>                unsigned long ulzma(unsigned char *src, unsigned char *dst);
> @@ -48,7 +48,7 @@
>                return 0;
>  #endif
>
> -#ifdef CONFIG_COMPRESSION_NRV2B
> +#if CONFIG_COMPRESSED_PAYLOAD_NRV2B==1
>        case CBFS_COMPRESS_NRV2B: {
>                unsigned long unrv2b(u8 *src, u8 *dst, unsigned long *ilen_p);
>                unsigned long tmp;
> Index: src/boot/selfboot.c
> ===================================================================
> --- src/boot/selfboot.c (revision 4195)
> +++ src/boot/selfboot.c (working copy)
> @@ -94,6 +94,7 @@
>        case CBFS_COMPRESS_LZMA: {
>                unsigned long ulzma(unsigned char *src, unsigned char *dst);
>                ulzma(src, dst);
> +               break;
>        }
>  #endif

I would have thought these breaks should go after the braces.  It
compiles either way for me.

> @@ -102,6 +103,7 @@
>                unsigned long unrv2b(u8 *src, u8 *dst, unsigned long *ilen_p);
>                unsigned long tmp;
>                unrv2b(src, dst, &tmp);
> +               break;
>        }
>  #endif
>        default:
>

Acked-by: Myles Watson <mylesgw at gmail.com>

Thanks,
Myles