[PATCH 3/3] ARM: start-pbl.c: unificate path to lib/decompress_*.c

Antony Pavlov antonynpavlov at gmail.com
Mon Nov 19 07:37:38 EST 2012


On 19 November 2012 16:07, Sascha Hauer <s.hauer at pengutronix.de> wrote:
> On Mon, Nov 19, 2012 at 03:34:02PM +0400, Antony Pavlov wrote:
>> On 19 November 2012 14:30, Sascha Hauer <s.hauer at pengutronix.de> wrote:
>> > On Sat, Nov 17, 2012 at 01:26:01PM +0400, Antony Pavlov wrote:
>> >> Signed-off-by: Antony Pavlov <antonynpavlov at gmail.com>
>> >> ---
>> >>  arch/arm/cpu/start-pbl.c |    2 +-
>> >>  1 file changed, 1 insertion(+), 1 deletion(-)
>> >>
>> >> diff --git a/arch/arm/cpu/start-pbl.c b/arch/arm/cpu/start-pbl.c
>> >> index 79a3cdd..c5f9705 100644
>> >> --- a/arch/arm/cpu/start-pbl.c
>> >> +++ b/arch/arm/cpu/start-pbl.c
>> >> @@ -66,7 +66,7 @@ extern void *input_data_end;
>> >>  #endif
>> >>
>> >>  #ifdef CONFIG_IMAGE_COMPRESSION_GZIP
>> >> -#include "../../../../lib/decompress_inflate.c"
>> >> +#include "../../../lib/decompress_inflate.c"
>> >
>> > This is strange. Why did this work beforehand?
>>
>> Look above in the arch/arm/cpu/start-pbl.c:
>>
>> #ifdef CONFIG_IMAGE_COMPRESSION_LZO
>> #include "../../../lib/decompress_unlzo.c"
>> #endif
>>
>> #ifdef CONFIG_IMAGE_COMPRESSION_GZIP
>> #include "../../../../lib/decompress_inflate.c"
>> #endif
>>
>> The files decompress_inflate.c and decompress_unlzo.c are in the same
>> directory. Why we use different prefixes to address them?
>
> I understand the patch and why it's correct. I just wondered why it
> works correctly without this patch.
>
> ls arch/arm/cpu/../../../../lib/decompress_inflate.c
> ls: cannot access arch/arm/cpu/../../../../lib/decompress_inflate.c: No such file or directory
>
> This is correct, we only have to go three directories up. Still it
> compiles fine.

IMHO we use very many '-I' options when running C compiler. Some of
them make possible to include the decompres-related files with the
'../../../../' prefix,
the other ones make possible to use '../../../'.

If you will ally the patch, please don't forget to change 'unificate'
to 'unify'.

-- 
Best regards,
  Antony Pavlov



More information about the barebox mailing list