* ARM: pbl: short patches
@ 2012-11-17 9:25 Antony Pavlov
2012-11-17 9:25 ` [PATCH 1/3] ARM: pbl: remove zbarebox.map during 'make clean' Antony Pavlov
` (2 more replies)
0 siblings, 3 replies; 10+ messages in thread
From: Antony Pavlov @ 2012-11-17 9:25 UTC (permalink / raw)
To: barebox
[PATCH 1/3] ARM: pbl: remove zbarebox.map during 'make clean'
[PATCH 2/3] ARM: start-pbl.c: make errorfn() static
[PATCH 3/3] ARM: start-pbl.c: unificate path to lib/decompress_*.c
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 1/3] ARM: pbl: remove zbarebox.map during 'make clean' 2012-11-17 9:25 ARM: pbl: short patches Antony Pavlov @ 2012-11-17 9:25 ` Antony Pavlov 2012-11-17 9:26 ` [PATCH 2/3] ARM: start-pbl.c: make errorfn() static Antony Pavlov 2012-11-17 9:26 ` [PATCH 3/3] ARM: start-pbl.c: unificate path to lib/decompress_*.c Antony Pavlov 2 siblings, 0 replies; 10+ messages in thread From: Antony Pavlov @ 2012-11-17 9:25 UTC (permalink / raw) To: barebox Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> --- arch/arm/pbl/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/pbl/Makefile b/arch/arm/pbl/Makefile index 286f8b5..7faa51a 100644 --- a/arch/arm/pbl/Makefile +++ b/arch/arm/pbl/Makefile @@ -9,7 +9,7 @@ targets := zbarebox.lds zbarebox zbarebox.bin zbarebox.S \ $(piggy_o) piggy.$(suffix_y) # Make sure files are removed during clean -extra-y += piggy.gzip piggy.lzo piggy.lzma piggy.xzkern +extra-y += piggy.gzip piggy.lzo piggy.lzma piggy.xzkern zbarebox.map $(obj)/zbarebox.bin: $(obj)/zbarebox FORCE $(call if_changed,objcopy) -- 1.7.10.4 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 2/3] ARM: start-pbl.c: make errorfn() static 2012-11-17 9:25 ARM: pbl: short patches Antony Pavlov 2012-11-17 9:25 ` [PATCH 1/3] ARM: pbl: remove zbarebox.map during 'make clean' Antony Pavlov @ 2012-11-17 9:26 ` Antony Pavlov 2012-11-17 9:26 ` [PATCH 3/3] ARM: start-pbl.c: unificate path to lib/decompress_*.c Antony Pavlov 2 siblings, 0 replies; 10+ messages in thread From: Antony Pavlov @ 2012-11-17 9:26 UTC (permalink / raw) To: barebox Signed-off-by: Antony Pavlov <antonynpavlov@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 609aedb..79a3cdd 100644 --- a/arch/arm/cpu/start-pbl.c +++ b/arch/arm/cpu/start-pbl.c @@ -127,7 +127,7 @@ static void mmu_disable(void) __mmu_cache_off(); } -void noinline errorfn(char *error) +static void noinline errorfn(char *error) { while (1); } -- 1.7.10.4 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 3/3] ARM: start-pbl.c: unificate path to lib/decompress_*.c 2012-11-17 9:25 ARM: pbl: short patches Antony Pavlov 2012-11-17 9:25 ` [PATCH 1/3] ARM: pbl: remove zbarebox.map during 'make clean' Antony Pavlov 2012-11-17 9:26 ` [PATCH 2/3] ARM: start-pbl.c: make errorfn() static Antony Pavlov @ 2012-11-17 9:26 ` Antony Pavlov 2012-11-18 15:29 ` Antony Pavlov 2012-11-19 10:30 ` Sascha Hauer 2 siblings, 2 replies; 10+ messages in thread From: Antony Pavlov @ 2012-11-17 9:26 UTC (permalink / raw) To: barebox Signed-off-by: Antony Pavlov <antonynpavlov@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" #endif static unsigned long *ttb; -- 1.7.10.4 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 3/3] ARM: start-pbl.c: unificate path to lib/decompress_*.c 2012-11-17 9:26 ` [PATCH 3/3] ARM: start-pbl.c: unificate path to lib/decompress_*.c Antony Pavlov @ 2012-11-18 15:29 ` Antony Pavlov 2012-11-19 10:30 ` Sascha Hauer 1 sibling, 0 replies; 10+ messages in thread From: Antony Pavlov @ 2012-11-18 15:29 UTC (permalink / raw) To: barebox Sorry, not "unificate" but "unify" of course. On 17 November 2012 13:26, Antony Pavlov <antonynpavlov@gmail.com> wrote: > Signed-off-by: Antony Pavlov <antonynpavlov@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" > #endif > > static unsigned long *ttb; > -- > 1.7.10.4 > -- Best regards, Antony Pavlov _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 3/3] ARM: start-pbl.c: unificate path to lib/decompress_*.c 2012-11-17 9:26 ` [PATCH 3/3] ARM: start-pbl.c: unificate path to lib/decompress_*.c Antony Pavlov 2012-11-18 15:29 ` Antony Pavlov @ 2012-11-19 10:30 ` Sascha Hauer 2012-11-19 11:34 ` Antony Pavlov 1 sibling, 1 reply; 10+ messages in thread From: Sascha Hauer @ 2012-11-19 10:30 UTC (permalink / raw) To: Antony Pavlov; +Cc: barebox On Sat, Nov 17, 2012 at 01:26:01PM +0400, Antony Pavlov wrote: > Signed-off-by: Antony Pavlov <antonynpavlov@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? Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 3/3] ARM: start-pbl.c: unificate path to lib/decompress_*.c 2012-11-19 10:30 ` Sascha Hauer @ 2012-11-19 11:34 ` Antony Pavlov 2012-11-19 12:07 ` Sascha Hauer 0 siblings, 1 reply; 10+ messages in thread From: Antony Pavlov @ 2012-11-19 11:34 UTC (permalink / raw) To: Sascha Hauer; +Cc: barebox On 19 November 2012 14:30, Sascha Hauer <s.hauer@pengutronix.de> wrote: > On Sat, Nov 17, 2012 at 01:26:01PM +0400, Antony Pavlov wrote: >> Signed-off-by: Antony Pavlov <antonynpavlov@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? -- Best regards, Antony Pavlov _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 3/3] ARM: start-pbl.c: unificate path to lib/decompress_*.c 2012-11-19 11:34 ` Antony Pavlov @ 2012-11-19 12:07 ` Sascha Hauer 2012-11-19 12:37 ` Antony Pavlov 0 siblings, 1 reply; 10+ messages in thread From: Sascha Hauer @ 2012-11-19 12:07 UTC (permalink / raw) To: Antony Pavlov; +Cc: barebox On Mon, Nov 19, 2012 at 03:34:02PM +0400, Antony Pavlov wrote: > On 19 November 2012 14:30, Sascha Hauer <s.hauer@pengutronix.de> wrote: > > On Sat, Nov 17, 2012 at 01:26:01PM +0400, Antony Pavlov wrote: > >> Signed-off-by: Antony Pavlov <antonynpavlov@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. Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 3/3] ARM: start-pbl.c: unificate path to lib/decompress_*.c 2012-11-19 12:07 ` Sascha Hauer @ 2012-11-19 12:37 ` Antony Pavlov 2012-11-20 7:24 ` Sascha Hauer 0 siblings, 1 reply; 10+ messages in thread From: Antony Pavlov @ 2012-11-19 12:37 UTC (permalink / raw) To: Sascha Hauer; +Cc: barebox On 19 November 2012 16:07, Sascha Hauer <s.hauer@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@pengutronix.de> wrote: >> > On Sat, Nov 17, 2012 at 01:26:01PM +0400, Antony Pavlov wrote: >> >> Signed-off-by: Antony Pavlov <antonynpavlov@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 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 3/3] ARM: start-pbl.c: unificate path to lib/decompress_*.c 2012-11-19 12:37 ` Antony Pavlov @ 2012-11-20 7:24 ` Sascha Hauer 0 siblings, 0 replies; 10+ messages in thread From: Sascha Hauer @ 2012-11-20 7:24 UTC (permalink / raw) To: Antony Pavlov; +Cc: barebox On Mon, Nov 19, 2012 at 04:37:38PM +0400, Antony Pavlov wrote: > >> 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 '../../../'. I wasn't aware that files included with "" also evaluate the -i options. Applied, thanks. Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2012-11-20 7:24 UTC | newest] Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2012-11-17 9:25 ARM: pbl: short patches Antony Pavlov 2012-11-17 9:25 ` [PATCH 1/3] ARM: pbl: remove zbarebox.map during 'make clean' Antony Pavlov 2012-11-17 9:26 ` [PATCH 2/3] ARM: start-pbl.c: make errorfn() static Antony Pavlov 2012-11-17 9:26 ` [PATCH 3/3] ARM: start-pbl.c: unificate path to lib/decompress_*.c Antony Pavlov 2012-11-18 15:29 ` Antony Pavlov 2012-11-19 10:30 ` Sascha Hauer 2012-11-19 11:34 ` Antony Pavlov 2012-11-19 12:07 ` Sascha Hauer 2012-11-19 12:37 ` Antony Pavlov 2012-11-20 7:24 ` Sascha Hauer
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox