2013-03-11 23:29:09

by Paul Bolle

[permalink] [raw]
Subject: [PATCH] decompressors: fix typo "POWERPC"

Commit 5dc49c75a26b99e86a18441e0b64c1f7c7c6a500 ("decompressors: make
the default XZ_DEC_* config match the selected architecture") added
default y if POWERPC

to lib/xz/Kconfig. But there is no Kconfig symbol POWERPC. The most
general Kconfig symbol for the powerpc architecture is PPC. So let's use
that.

Signed-off-by: Paul Bolle <[email protected]>
---
0) Tested with "make ARCH=powerpc oldconfig" (on some powerpc
defconfig).

1) By the way: why does the XZ related code use both the macro
CONFIG_XZ_DEC_POWERPC and the macro XZ_DEC_POWERPC? (Ditto for other
architectures.) That looks odd.

lib/xz/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/xz/Kconfig b/lib/xz/Kconfig
index 82a04d7..08837db 100644
--- a/lib/xz/Kconfig
+++ b/lib/xz/Kconfig
@@ -15,7 +15,7 @@ config XZ_DEC_X86

config XZ_DEC_POWERPC
bool "PowerPC BCJ filter decoder"
- default y if POWERPC
+ default y if PPC
select XZ_DEC_BCJ

config XZ_DEC_IA64
--
1.7.11.7


2013-03-13 11:40:58

by Lasse Collin

[permalink] [raw]
Subject: Re: [PATCH] decompressors: fix typo "POWERPC"

On 2013-03-12 Paul Bolle wrote:
> Commit 5dc49c75a26b99e86a18441e0b64c1f7c7c6a500 ("decompressors: make
> the default XZ_DEC_* config match the selected architecture") added
> default y if POWERPC
>
> to lib/xz/Kconfig. But there is no Kconfig symbol POWERPC. The most
> general Kconfig symbol for the powerpc architecture is PPC. So let's
> use that.

Thanks.

> 1) By the way: why does the XZ related code use both the macro
> CONFIG_XZ_DEC_POWERPC and the macro XZ_DEC_POWERPC? (Ditto for other
> architectures.) That looks odd.

In a preboot environment the options selected for the xz_dec module are
ignored. If XZ-compressed kernel is selected, lib/decompress_unxz.c
will enable a BCJ filter for that architecture. An alternative could be
to #undef the CONFIG_XZ_DEC_foo symbols in decompress_unxz.c and then
#define what is needed for the selected architecture, but I think the
current method is OK. See also lib/xz/xz_private.h.

--
Lasse Collin | IRC: Larhzu @ IRCnet & Freenode

2013-03-13 12:05:46

by Paul Bolle

[permalink] [raw]
Subject: Re: [PATCH] decompressors: fix typo "POWERPC"

On Wed, 2013-03-13 at 13:30 +0200, Lasse Collin wrote:
> On 2013-03-12 Paul Bolle wrote:
> > 1) By the way: why does the XZ related code use both the macro
> > CONFIG_XZ_DEC_POWERPC and the macro XZ_DEC_POWERPC? (Ditto for other
> > architectures.) That looks odd.
>
> In a preboot environment the options selected for the xz_dec module are
> ignored.

Naive question: what is a preboot environment?

> If XZ-compressed kernel is selected, lib/decompress_unxz.c
> will enable a BCJ filter for that architecture. An alternative could be
> to #undef the CONFIG_XZ_DEC_foo symbols in decompress_unxz.c and then
> #define what is needed for the selected architecture, but I think the
> current method is OK. See also lib/xz/xz_private.h.

Thanks,


Paul Bolle

2013-03-13 14:43:29

by Lasse Collin

[permalink] [raw]
Subject: Re: [PATCH] decompressors: fix typo "POWERPC"

On 2013-03-13 Paul Bolle wrote:
> Naive question: what is a preboot environment?

I'm not sure how official the term is. I have seen it mostly in
decompressors' files. It's the environment after a boot loader has
loaded the kernel but before the kernel has decompressed itself. On x86
the preboot environment has done its job once "Booting the kernel." has
been printed.

--
Lasse Collin | IRC: Larhzu @ IRCnet & Freenode