[patch] Fixed the LZMA compression flag in Kbuild

[Cristi Magherusan]

Please check the attached trivial patch.

It properly checks for the LZMA compression variable, and fixes a print
message for the VGA ROM that would print a useless NULL string.

Thanks,
Cristi

The patch is 
Signed-off by: Cristi Magherusan

[ron minnich]

This is not quite complete.

For example,
src/boot/selfboot.c:#if CONFIG_COMPRESSED_PAYLOAD_LZMA==1

We're going to need to rationalize the uses of this variable across
old and new config tools and code.

I'll try to look more later or you can look too. This is not the only
problem of this type we can expect to have.

ron

[ron minnich]

Here are all uses I could fine.
Defaults to 0 in old config tool.
Set to 1 if used in new config tool.

If src/Kconfig it is:
config COMPRESSED_PAYLOAD_LZMA
        bool
        default y

So we have a problem. Here are the usages I could find.

src/mainboard/intel/eagleheights/Options.lb:default
CONFIG_COMPRESSED_PAYLOAD_LZMA=1
src/lib/Config.lb:if CONFIG_COMPRESSED_PAYLOAD_LZMA
src/lib/Makefile.inc:obj-$(CONFIG_COMPRESSED_PAYLOAD_LZMA)  +=  lzma.o
src/arch/i386/Config.lb:makedefine
PAYLOAD-$(CONFIG_COMPRESSED_PAYLOAD_LZMA):=payload.lzma
src/arch/i386/Config.lb:		action "if [
$(CONFIG_COMPRESSED_PAYLOAD_LZMA) -eq 1 -a $(CONFIG_CBFS) -eq 1 ];
then echo l > cbfs-support; fi"
src/stream/rom_stream.c:#if CONFIG_PRECOMPRESSED_PAYLOAD &&
((!CONFIG_COMPRESSED_PAYLOAD_NRV2B) &&
(!CONFIG_COMPRESSED_PAYLOAD_LZMA))
src/stream/rom_stream.c:#error "You set CONFIG_PRECOMPRESSED_PAYLOAD
but need to set CONFIG_COMPRESSED_PAYLOAD_NRV2B or
CONFIG_COMPRESSED_PAYLOAD_LZMA"
src/stream/rom_stream.c:#if ((CONFIG_COMPRESSED_PAYLOAD_NRV2B) ||
(CONFIG_COMPRESSED_PAYLOAD_LZMA))
src/stream/rom_stream.c:#if (CONFIG_COMPRESSED_PAYLOAD_LZMA)
src/stream/rom_stream.c:#if (CONFIG_COMPRESSED_PAYLOAD_LZMA)
src/stream/serial_stream.c:#if CONFIG_PRECOMPRESSED_PAYLOAD &&
((!CONFIG_COMPRESSED_PAYLOAD_NRV2B) &&
(!CONFIG_COMPRESSED_PAYLOAD_LZMA))
src/stream/serial_stream.c:#error "You set
CONFIG_PRECOMPRESSED_PAYLOAD but need to set
CONFIG_COMPRESSED_PAYLOAD_NRV2B or CONFIG_COMPRESSED_PAYLOAD_LZMA"
src/stream/serial_stream.c:#if (CONFIG_COMPRESSED_PAYLOAD_LZMA)
src/stream/serial_stream.c:#if (CONFIG_COMPRESSED_PAYLOAD_LZMA)
src/boot/selfboot.c:#if CONFIG_COMPRESSED_PAYLOAD_LZMA==1

It needs to be 'y' for Kconfig but it will have to be fixed in all the
old usages. This is not a big deal to fix. We should change it
so old config tool uses 'y', since old config tool is on its way out anyway.

But the patch is not complete. If it were committed it would break all
the old config builds.

ron

[Patrick Georgi]

Am 22.08.2009 23:25, schrieb ron minnich:
> It needs to be 'y' for Kconfig but it will have to be fixed in all the
> old usages. This is not a big deal to fix. We should change it

See build/config.h: "y" is "1" there.

Patrick

[ron minnich]

On Sat, Aug 22, 2009 at 2:41 PM, Patrick Georgi wrote:
> Am 22.08.2009 23:25, schrieb ron minnich:
> > It needs to be 'y' for Kconfig but it will have to be fixed in all the
> > old usages. This is not a big deal to fix. We should change it

sounds good, sorry for my confusion ... forgot about that.

OK, so, is Cristi's fix solid? If you and cristi agree, maybe you can
ack and commit.

ron