(no subject)

[Sascha Hauer]

Here are some patches that fix mvebu for out of tree builds. These
currently do not work because the kwbimage tools searches the files
given to the BINARY option in the config file relative to the current
directory rather than relative to the config file.

Sascha

----------------------------------------------------------------
Sascha Hauer (3):
      scripts/kwbimage: Move configfile opening to the function that reads it
      scripts/kwbimage: Make BINARY files relative to config file
      ARM: mvebu: Lenovo IX4 300D: Fix pblb generation

 arch/arm/boards/globalscale-mirabox/kwbimage.cfg   |  2 +-
 arch/arm/boards/lenovo-ix4-300d/kwbimage.cfg       |  2 +-
 arch/arm/boards/marvell-armada-xp-gp/kwbimage.cfg  |  2 +-
 .../boards/plathome-openblocks-ax3/kwbimage.cfg    |  2 +-
 images/Makefile.mvebu                              |  2 +-
 scripts/kwbimage.c                                 | 51 +++++++++++++---------
 6 files changed, 36 insertions(+), 25 deletions(-)

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 1/3] scripts/kwbimage: Move configfile opening to the function that reads it

[Sascha Hauer]

The configfile is read in image_create_config_parse(), so move opening
the file to there aswell and pass the configfile as filename instead of
FILE *.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 scripts/kwbimage.c | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/scripts/kwbimage.c b/scripts/kwbimage.c
index 5b8e738..16be2dd 100644
--- a/scripts/kwbimage.c
+++ b/scripts/kwbimage.c
@@ -1098,12 +1098,20 @@ static int image_create_config_parse_oneline(char *line,
  * elements 'image_cfg', and return the number of configuration
  * elements in 'cfgn'.
  */
-static int image_create_config_parse(FILE *fcfg,
+static int image_create_config_parse(const char *input,
 				     struct image_cfg_element *image_cfg,
 				     int *cfgn)
 {
 	int ret;
 	int cfgi = 0;
+	FILE *fcfg;
+
+	fcfg = fopen(input, "r");
+	if (!fcfg) {
+		fprintf(stderr, "Could not open input file %s\n",
+			input);
+		return -1;
+	}
 
 	/* Parse the configuration file */
 	while (!feof(fcfg)) {
@@ -1128,18 +1136,22 @@ static int image_create_config_parse(FILE *fcfg,
 		ret = image_create_config_parse_oneline(line,
 							&image_cfg[cfgi]);
 		if (ret)
-			return ret;
+			goto out;
 
 		cfgi++;
 
 		if (cfgi >= IMAGE_CFG_ELEMENT_MAX) {
 			fprintf(stderr, "Too many configuration elements in .cfg file\n");
-			return -1;
+			ret = -1;
+			goto out;
 		}
 	}
 
+	ret = 0;
 	*cfgn = cfgi;
-	return 0;
+out:
+	fclose(fcfg);
+	return ret;
 }
 
 static int image_override_payload(struct image_cfg_element *image_cfg,
@@ -1316,34 +1328,24 @@ static int image_create(const char *input, const char *output,
 			int verbose)
 {
 	struct image_cfg_element *image_cfg;
-	FILE *fcfg, *outputimg;
+	FILE *outputimg;
 	void *image = NULL;
 	int version;
 	size_t imagesz;
 	int cfgn;
 	int ret;
 
-	fcfg = fopen(input, "r");
-	if (!fcfg) {
-		fprintf(stderr, "Could not open input file %s\n",
-			input);
-		return -1;
-	}
-
 	image_cfg = malloc(IMAGE_CFG_ELEMENT_MAX *
 			   sizeof(struct image_cfg_element));
 	if (!image_cfg) {
 		fprintf(stderr, "Cannot allocate memory\n");
-		fclose(fcfg);
 		return -1;
 	}
 
 	memset(image_cfg, 0,
 	       IMAGE_CFG_ELEMENT_MAX * sizeof(struct image_cfg_element));
-	rewind(fcfg);
 
-	ret = image_create_config_parse(fcfg, image_cfg, &cfgn);
-	fclose(fcfg);
+	ret = image_create_config_parse(input, image_cfg, &cfgn);
 	if (ret) {
 		free(image_cfg);
 		return -1;
-- 
2.6.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 2/3] scripts/kwbimage: Make BINARY files relative to config file

[Sascha Hauer]

The BINARY files given in the config files are expected to be relative
to the place kwbimage is called from. This is bad since it breaks where
kwbimage is called from the build directory and not the source
directory.
It makes more sense to make the paths in the config files relative
to the config files which works with out of tree builds and is also
more what a user normally expects.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/boards/globalscale-mirabox/kwbimage.cfg     |  2 +-
 arch/arm/boards/lenovo-ix4-300d/kwbimage.cfg         |  2 +-
 arch/arm/boards/marvell-armada-xp-gp/kwbimage.cfg    |  2 +-
 arch/arm/boards/plathome-openblocks-ax3/kwbimage.cfg |  2 +-
 scripts/kwbimage.c                                   | 17 +++++++++++++----
 5 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/arch/arm/boards/globalscale-mirabox/kwbimage.cfg b/arch/arm/boards/globalscale-mirabox/kwbimage.cfg
index 16fb77c..3e20502 100644
--- a/arch/arm/boards/globalscale-mirabox/kwbimage.cfg
+++ b/arch/arm/boards/globalscale-mirabox/kwbimage.cfg
@@ -2,4 +2,4 @@ VERSION 1
 BOOT_FROM nand
 NAND_BLKSZ 00020000
 NAND_BADBLK_LOCATION 01
-BINARY arch/arm/boards/globalscale-mirabox/binary.0 0000005b 00000068
+BINARY binary.0 0000005b 00000068
diff --git a/arch/arm/boards/lenovo-ix4-300d/kwbimage.cfg b/arch/arm/boards/lenovo-ix4-300d/kwbimage.cfg
index 713efb0..15b7fdd 100644
--- a/arch/arm/boards/lenovo-ix4-300d/kwbimage.cfg
+++ b/arch/arm/boards/lenovo-ix4-300d/kwbimage.cfg
@@ -2,4 +2,4 @@ VERSION 1
 BOOT_FROM nand
 NAND_BLKSZ 00020000
 NAND_BADBLK_LOCATION 00
-BINARY arch/arm/boards/lenovo-ix4-300d/binary.0 0000005b 00000068
+BINARY binary.0 0000005b 00000068
diff --git a/arch/arm/boards/marvell-armada-xp-gp/kwbimage.cfg b/arch/arm/boards/marvell-armada-xp-gp/kwbimage.cfg
index 3f66aa0..05d398c 100644
--- a/arch/arm/boards/marvell-armada-xp-gp/kwbimage.cfg
+++ b/arch/arm/boards/marvell-armada-xp-gp/kwbimage.cfg
@@ -1,3 +1,3 @@
 VERSION 1
 BOOT_FROM spi
-BINARY arch/arm/boards/marvell-armada-xp-gp/binary.0 0000005b 00000068
+BINARY binary.0 0000005b 00000068
diff --git a/arch/arm/boards/plathome-openblocks-ax3/kwbimage.cfg b/arch/arm/boards/plathome-openblocks-ax3/kwbimage.cfg
index 1d05715..05d398c 100644
--- a/arch/arm/boards/plathome-openblocks-ax3/kwbimage.cfg
+++ b/arch/arm/boards/plathome-openblocks-ax3/kwbimage.cfg
@@ -1,3 +1,3 @@
 VERSION 1
 BOOT_FROM spi
-BINARY arch/arm/boards/plathome-openblocks-ax3/binary.0 0000005b 00000068
+BINARY binary.0 0000005b 00000068
diff --git a/scripts/kwbimage.c b/scripts/kwbimage.c
index 16be2dd..448ac2a 100644
--- a/scripts/kwbimage.c
+++ b/scripts/kwbimage.c
@@ -51,6 +51,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
+#include <libgen.h>
 
 #define ALIGN_SUP(x, a) (((x) + (a - 1)) & ~(a - 1))
 
@@ -187,7 +188,7 @@ struct image_cfg_element {
 		unsigned int version;
 		unsigned int bootfrom;
 		struct {
-			const char *file;
+			char *file;
 			unsigned int args[BINARY_MAX_ARGS];
 			unsigned int nargs;
 		} binary;
@@ -1003,7 +1004,8 @@ static void *image_create_v1(struct image_cfg_element *image_cfg,
 }
 
 static int image_create_config_parse_oneline(char *line,
-					     struct image_cfg_element *el)
+					     struct image_cfg_element *el,
+					     char *configpath)
 {
 	char *keyword, *saveptr;
 
@@ -1056,7 +1058,10 @@ static int image_create_config_parse_oneline(char *line,
 		int argi = 0;
 
 		el->type = IMAGE_CFG_BINARY;
-		el->binary.file = strdup(value);
+		if (*value == '/')
+			el->binary.file = strdup(value);
+		else
+			asprintf(&el->binary.file, "%s/%s", configpath, value);
 		while (1) {
 			value = strtok_r(NULL, " ", &saveptr);
 			if (!value)
@@ -1105,11 +1110,13 @@ static int image_create_config_parse(const char *input,
 	int ret;
 	int cfgi = 0;
 	FILE *fcfg;
+	char *configpath = dirname(strdup(input));
 
 	fcfg = fopen(input, "r");
 	if (!fcfg) {
 		fprintf(stderr, "Could not open input file %s\n",
 			input);
+		free(configpath);
 		return -1;
 	}
 
@@ -1134,7 +1141,8 @@ static int image_create_config_parse(const char *input,
 
 		/* Parse the current line */
 		ret = image_create_config_parse_oneline(line,
-							&image_cfg[cfgi]);
+							&image_cfg[cfgi],
+							configpath);
 		if (ret)
 			goto out;
 
@@ -1151,6 +1159,7 @@ static int image_create_config_parse(const char *input,
 	*cfgn = cfgi;
 out:
 	fclose(fcfg);
+	free(configpath);
 	return ret;
 }
 
-- 
2.6.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 3/3] ARM: mvebu: Lenovo IX4 300D: Fix pblb generation

[Sascha Hauer]

pblx-y must be passed the entry point function without any extension.
Otherwise the pblb file is not added to $targets and is removed by
make as an intermediate file.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 images/Makefile.mvebu | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/images/Makefile.mvebu b/images/Makefile.mvebu
index dcf2235..0325f99 100644
--- a/images/Makefile.mvebu
+++ b/images/Makefile.mvebu
@@ -30,7 +30,7 @@ OPTS_start_lenovo_ix4_300d.pblx.kwbuartimg = -m uart $(LENOVO_IX4_300D_KWBOPTS)
 FILE_barebox-lenovo-ix4-300d.img   = start_lenovo_ix4_300d.pblx.kwbimg
 FILE_barebox-lenovo-ix4-300d-uart.img = start_lenovo_ix4_300d.pblx.kwbuartimg
 FILE_barebox-lenovo-ix4-300d-2nd.img = start_lenovo_ix4_300d.pblx
-pblx-$(CONFIG_MACH_LENOVO_IX4_300D) += start_lenovo_ix4_300d.pblx
+pblx-$(CONFIG_MACH_LENOVO_IX4_300D) += start_lenovo_ix4_300d
 image-$(CONFIG_MACH_LENOVO_IX4_300D) += barebox-lenovo-ix4-300d.img
 image-$(CONFIG_MACH_LENOVO_IX4_300D) += barebox-lenovo-ix4-300d-uart.img
 image-$(CONFIG_MACH_LENOVO_IX4_300D) += barebox-lenovo-ix4-300d-2nd.img
-- 
2.6.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 2/3] scripts/kwbimage: Make BINARY files relative to config file

[Thomas Petazzoni]

Sascha,

On Thu, 15 Oct 2015 10:18:55 +0200, Sascha Hauer wrote:
> The BINARY files given in the config files are expected to be relative
> to the place kwbimage is called from. This is bad since it breaks where
> kwbimage is called from the build directory and not the source
> directory.
> It makes more sense to make the paths in the config files relative
> to the config files which works with out of tree builds and is also
> more what a user normally expects.
> 
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

In practice those binary.0 files are not really part of the Barebox
source code. The binary.0 file has to be extracted from a vendor U-Boot
binary prior to doing the Barebox build, so it isn't exactly part of
the "source tree".

Though I agree it is probably easier to extract them once and keep them
around in the source tree (not checked-in, of course).

Note that U-Boot now has a fully open-source implementation of this
binary.0 thing, at least for Armada XP and Armada 38x. However, it's
basically copy/pasted from the vendor U-Boot, so it's not very pretty
to look at:

 - http://git.denx.de/?p=u-boot.git;a=tree;f=drivers/ddr/marvell
   for the DDR initialization code.

 - http://git.denx.de/?p=u-boot.git;a=tree;f=arch/arm/mach-mvebu/serdes
   for the SERDES lane initialization

Best regards,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 2/3] scripts/kwbimage: Make BINARY files relative to config file

[Sebastian Hesselbarth]

On 15.10.2015 11:00, Thomas Petazzoni wrote:
> On Thu, 15 Oct 2015 10:18:55 +0200, Sascha Hauer wrote:
>> The BINARY files given in the config files are expected to be relative
>> to the place kwbimage is called from. This is bad since it breaks where
>> kwbimage is called from the build directory and not the source
>> directory.
>> It makes more sense to make the paths in the config files relative
>> to the config files which works with out of tree builds and is also
>> more what a user normally expects.
>>
>> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
>
> In practice those binary.0 files are not really part of the Barebox
> source code. The binary.0 file has to be extracted from a vendor U-Boot
> binary prior to doing the Barebox build, so it isn't exactly part of
> the "source tree".
>
> Though I agree it is probably easier to extract them once and keep them
> around in the source tree (not checked-in, of course).

Sascha,

I am fine with making the path relative to kwbimage.cfg, although I'd
make it even more explicit by putting a './' in from of the binary.0
in each kwbimage.cfg.

> Note that U-Boot now has a fully open-source implementation of this
> binary.0 thing, at least for Armada XP and Armada 38x. However, it's
> basically copy/pasted from the vendor U-Boot, so it's not very pretty
> to look at:

Interesting, thanks for the links.

>   - http://git.denx.de/?p=u-boot.git;a=tree;f=drivers/ddr/marvell
>     for the DDR initialization code.

I think it would be nice to have the DDR init code in barebox, however..

>   - http://git.denx.de/?p=u-boot.git;a=tree;f=arch/arm/mach-mvebu/serdes
>     for the SERDES lane initialization

... I don't see why SERDES init is important that early (for production
use). I think SERDES init should be/stay part of the PHY init code we
already have.

Sebastian


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 2/3] scripts/kwbimage: Make BINARY files relative to config file

[Thomas Petazzoni]

Hello,

On Thu, 15 Oct 2015 11:29:54 +0200, Sebastian Hesselbarth wrote:

> >   - http://git.denx.de/?p=u-boot.git;a=tree;f=arch/arm/mach-mvebu/serdes
> >     for the SERDES lane initialization
> 
> ... I don't see why SERDES init is important that early (for production
> use). I think SERDES init should be/stay part of the PHY init code we
> already have.

Agreed. It's done this way in U-Boot because it was done this way in
the vendor U-Boot. But it is obviously not the best/proper way of doing
things.

Note I'm also working on making the kernel SERDES/PHY aware, so that
we can turn on/off the unused SERDES lanes (and save power).

Best regards,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 2/3] scripts/kwbimage: Make BINARY files relative to config file

[Sascha Hauer]

On Thu, Oct 15, 2015 at 11:00:37AM +0200, Thomas Petazzoni wrote:
> Sascha,
> 
> On Thu, 15 Oct 2015 10:18:55 +0200, Sascha Hauer wrote:
> > The BINARY files given in the config files are expected to be relative
> > to the place kwbimage is called from. This is bad since it breaks where
> > kwbimage is called from the build directory and not the source
> > directory.
> > It makes more sense to make the paths in the config files relative
> > to the config files which works with out of tree builds and is also
> > more what a user normally expects.
> > 
> > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> 
> In practice those binary.0 files are not really part of the Barebox
> source code. The binary.0 file has to be extracted from a vendor U-Boot
> binary prior to doing the Barebox build, so it isn't exactly part of
> the "source tree".

Yes, right.

> 
> Though I agree it is probably easier to extract them once and keep them
> around in the source tree (not checked-in, of course).

I think this aswell. The build tree often is deleted, but then the
binary.0 images should still be available.

> 
> Note that U-Boot now has a fully open-source implementation of this
> binary.0 thing, at least for Armada XP and Armada 38x. However, it's
> basically copy/pasted from the vendor U-Boot, so it's not very pretty
> to look at:
> 
>  - http://git.denx.de/?p=u-boot.git;a=tree;f=drivers/ddr/marvell
>    for the DDR initialization code.

Nice to have, indeed not nice to look at. This code is huge...

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

Re: [PATCH 2/3] scripts/kwbimage: Make BINARY files relative to config file

[Sascha Hauer]

On Thu, Oct 15, 2015 at 11:29:54AM +0200, Sebastian Hesselbarth wrote:
> On 15.10.2015 11:00, Thomas Petazzoni wrote:
> >On Thu, 15 Oct 2015 10:18:55 +0200, Sascha Hauer wrote:
> >>The BINARY files given in the config files are expected to be relative
> >>to the place kwbimage is called from. This is bad since it breaks where
> >>kwbimage is called from the build directory and not the source
> >>directory.
> >>It makes more sense to make the paths in the config files relative
> >>to the config files which works with out of tree builds and is also
> >>more what a user normally expects.
> >>
> >>Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> >
> >In practice those binary.0 files are not really part of the Barebox
> >source code. The binary.0 file has to be extracted from a vendor U-Boot
> >binary prior to doing the Barebox build, so it isn't exactly part of
> >the "source tree".
> >
> >Though I agree it is probably easier to extract them once and keep them
> >around in the source tree (not checked-in, of course).
> 
> Sascha,
> 
> I am fine with making the path relative to kwbimage.cfg, although I'd
> make it even more explicit by putting a './' in from of the binary.0
> in each kwbimage.cfg.

I added the './' and applied the series to next.

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