* [PATCH v3 1/8] binman: add support for skipping file concatenation for mkimage
2022-08-01 16:06 [PATCH v3 0/8] migrate u-boot-rockchip.bin to binman and generate an image for SPI Quentin Schulz
@ 2022-08-01 16:06 ` Quentin Schulz
2022-08-01 16:06 ` [PATCH v3 2/8] binman: allow user-defined filenames for mkimage entry Quentin Schulz
` (6 subsequent siblings)
7 siblings, 0 replies; 15+ messages in thread
From: Quentin Schulz @ 2022-08-01 16:06 UTC (permalink / raw)
Cc: bharat.gooty, rayagonda.kokatanur, sjg, philipp.tomsich,
kever.yang, jagan, alpernebiyasak, xypron.glpk, heiko.thiery,
u-boot, Quentin Schulz, Quentin Schulz
From: Quentin Schulz <quentin.schulz@theobroma-systems.com>
Some image types handled by mkimage require the datafiles to be passed
independently (-d data1:data2) for specific handling of each. A
concatenation of datafiles prior to passing them to mkimage wouldn't
work.
That is the case for rkspi for example which requires page alignment
and only writing 2KB every 4KB.
This adds the ability to tell binman to pass the datafiles without
prior concatenation to mkimage, by adding the multiple-data-files
boolean property to the mkimage node.
Cc: Quentin Schulz <foss+uboot@0leil.net>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
---
tools/binman/entries.rst | 22 +++++++++++++++++++
tools/binman/etype/mkimage.py | 41 +++++++++++++++++++++++++++++++----
2 files changed, 59 insertions(+), 4 deletions(-)
diff --git a/tools/binman/entries.rst b/tools/binman/entries.rst
index ae4305c99e..60c89aec59 100644
--- a/tools/binman/entries.rst
+++ b/tools/binman/entries.rst
@@ -1101,6 +1101,9 @@ Entry: mkimage: Binary produced by mkimage
Properties / Entry arguments:
- datafile: Filename for -d argument
+ - multiple-data-files: boolean to tell binman to pass all files as
+ datafiles to mkimage instead of creating a temporary file the result
+ of datafiles concatenation
- args: Other arguments to pass
The data passed to mkimage is collected from subnodes of the mkimage node,
@@ -1117,6 +1120,25 @@ This calls mkimage to create an imximage with u-boot-spl.bin as the input
file. The output from mkimage then becomes part of the image produced by
binman.
+To pass all datafiles untouched to mkimage::
+
+ mkimage {
+ args = "-n rk3399 -T rkspi";
+ multiple-data-files;
+
+ u-boot-tpl {
+ };
+
+ u-boot-spl {
+ };
+ };
+
+This calls mkimage to create a Rockchip RK3399-specific first stage
+bootloader, made of TPL+SPL. Since this first stage bootloader requires to
+align the TPL and SPL but also some weird hacks that is handled by mkimage
+directly, binman is told to not perform the concatenation of datafiles prior
+to passing the data to mkimage.
+
To use CONFIG options in the arguments, use a string list instead, as in
this example which also produces four arguments::
diff --git a/tools/binman/etype/mkimage.py b/tools/binman/etype/mkimage.py
index 5f6def2287..52297c23ea 100644
--- a/tools/binman/etype/mkimage.py
+++ b/tools/binman/etype/mkimage.py
@@ -16,6 +16,9 @@ class Entry_mkimage(Entry):
Properties / Entry arguments:
- datafile: Filename for -d argument
+ - multiple-data-files: boolean to tell binman to pass all files as
+ datafiles to mkimage instead of creating a temporary file the result
+ of datafiles concatenation
- args: Other arguments to pass
The data passed to mkimage is collected from subnodes of the mkimage node,
@@ -32,6 +35,25 @@ class Entry_mkimage(Entry):
file. The output from mkimage then becomes part of the image produced by
binman.
+ To pass all datafiles untouched to mkimage::
+
+ mkimage {
+ args = "-n rk3399 -T rkspi";
+ multiple-data-files;
+
+ u-boot-tpl {
+ };
+
+ u-boot-spl {
+ };
+ };
+
+ This calls mkimage to create a Rockchip RK3399-specific first stage
+ bootloader, made of TPL+SPL. Since this first stage bootloader requires to
+ align the TPL and SPL but also some weird hacks that is handled by mkimage
+ directly, binman is told to not perform the concatenation of datafiles prior
+ to passing the data to mkimage.
+
To use CONFIG options in the arguments, use a string list instead, as in
this example which also produces four arguments::
@@ -46,16 +68,27 @@ class Entry_mkimage(Entry):
def __init__(self, section, etype, node):
super().__init__(section, etype, node)
self._args = fdt_util.GetArgs(self._node, 'args')
+ self._multiple_data_files = fdt_util.GetBool(self._node, 'multiple-data-files')
self._mkimage_entries = OrderedDict()
self.align_default = None
self.ReadEntries()
def ObtainContents(self):
# Use a non-zero size for any fake files to keep mkimage happy
- data, input_fname, uniq = self.collect_contents_to_file(
- self._mkimage_entries.values(), 'mkimage', 1024)
- if data is None:
- return False
+ fake_size = 1024
+ if self._multiple_data_files:
+ fnames = []
+ uniq = self.GetUniqueName()
+ for entry in self._mkimage_entries.values():
+ if not entry.ObtainContents(fake_size=fake_size):
+ return False
+ fnames.append(entry.GetDefaultFilename())
+ input_fname = ":".join(fnames)
+ else:
+ data, input_fname, uniq = self.collect_contents_to_file(
+ self._mkimage_entries.values(), 'mkimage', fake_size)
+ if data is None:
+ return False
output_fname = tools.get_output_filename('mkimage-out.%s' % uniq)
if self.mkimage.run_cmd('-d', input_fname, *self._args,
output_fname) is not None:
--
2.37.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH v3 2/8] binman: allow user-defined filenames for mkimage entry
2022-08-01 16:06 [PATCH v3 0/8] migrate u-boot-rockchip.bin to binman and generate an image for SPI Quentin Schulz
2022-08-01 16:06 ` [PATCH v3 1/8] binman: add support for skipping file concatenation for mkimage Quentin Schulz
@ 2022-08-01 16:06 ` Quentin Schulz
2022-08-01 19:13 ` Simon Glass
2022-08-01 16:06 ` [PATCH v3 3/8] rockchip: remove binman temporary files when cleaning Quentin Schulz
` (5 subsequent siblings)
7 siblings, 1 reply; 15+ messages in thread
From: Quentin Schulz @ 2022-08-01 16:06 UTC (permalink / raw)
Cc: bharat.gooty, rayagonda.kokatanur, sjg, philipp.tomsich,
kever.yang, jagan, alpernebiyasak, xypron.glpk, heiko.thiery,
u-boot, Quentin Schulz, Quentin Schulz
From: Quentin Schulz <quentin.schulz@theobroma-systems.com>
mkimage entry currently creates a file whose name is derived from the
section name containing said entry.
Let's allow the user to define a filename for the mkimage-generated
binary by using the 'filename' DT property.
Cc: Quentin Schulz <foss+uboot@0leil.net>
Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
---
added in v3
tools/binman/etype/mkimage.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/tools/binman/etype/mkimage.py b/tools/binman/etype/mkimage.py
index 52297c23ea..902c254425 100644
--- a/tools/binman/etype/mkimage.py
+++ b/tools/binman/etype/mkimage.py
@@ -20,11 +20,13 @@ class Entry_mkimage(Entry):
datafiles to mkimage instead of creating a temporary file the result
of datafiles concatenation
- args: Other arguments to pass
+ - filename: filename of output binary generated by mkimage
The data passed to mkimage is collected from subnodes of the mkimage node,
e.g.::
mkimage {
+ filename = "imximage.bin";
args = "-n test -T imximage";
u-boot-spl {
@@ -33,7 +35,7 @@ class Entry_mkimage(Entry):
This calls mkimage to create an imximage with u-boot-spl.bin as the input
file. The output from mkimage then becomes part of the image produced by
- binman.
+ binman but also is written into imximage.bin file.
To pass all datafiles untouched to mkimage::
@@ -70,6 +72,7 @@ class Entry_mkimage(Entry):
self._args = fdt_util.GetArgs(self._node, 'args')
self._multiple_data_files = fdt_util.GetBool(self._node, 'multiple-data-files')
self._mkimage_entries = OrderedDict()
+ self._filename = fdt_util.GetString(self._node, 'filename')
self.align_default = None
self.ReadEntries()
@@ -89,7 +92,7 @@ class Entry_mkimage(Entry):
self._mkimage_entries.values(), 'mkimage', fake_size)
if data is None:
return False
- output_fname = tools.get_output_filename('mkimage-out.%s' % uniq)
+ output_fname = tools.get_output_filename(self._filename if self._filename else 'mkimage-out.%s' % uniq)
if self.mkimage.run_cmd('-d', input_fname, *self._args,
output_fname) is not None:
self.SetContents(tools.read_file(output_fname))
--
2.37.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH v3 2/8] binman: allow user-defined filenames for mkimage entry
2022-08-01 16:06 ` [PATCH v3 2/8] binman: allow user-defined filenames for mkimage entry Quentin Schulz
@ 2022-08-01 19:13 ` Simon Glass
0 siblings, 0 replies; 15+ messages in thread
From: Simon Glass @ 2022-08-01 19:13 UTC (permalink / raw)
To: Quentin Schulz
Cc: Bharat Gooty, Rayagonda Kokatanur, Philipp Tomsich, Kever Yang,
Jagan Teki, Alper Nebi Yasak, Heinrich Schuchardt, Heiko Thiery,
U-Boot Mailing List, Quentin Schulz
Hi Quentin,
On Mon, 1 Aug 2022 at 10:06, Quentin Schulz <foss+uboot@0leil.net> wrote:
>
> From: Quentin Schulz <quentin.schulz@theobroma-systems.com>
>
> mkimage entry currently creates a file whose name is derived from the
> section name containing said entry.
>
> Let's allow the user to define a filename for the mkimage-generated
> binary by using the 'filename' DT property.
>
> Cc: Quentin Schulz <foss+uboot@0leil.net>
> Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
> ---
>
> added in v3
>
> tools/binman/etype/mkimage.py | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
This does need a test (should be able to update the mkimage one).
>
> diff --git a/tools/binman/etype/mkimage.py b/tools/binman/etype/mkimage.py
> index 52297c23ea..902c254425 100644
> --- a/tools/binman/etype/mkimage.py
> +++ b/tools/binman/etype/mkimage.py
> @@ -20,11 +20,13 @@ class Entry_mkimage(Entry):
> datafiles to mkimage instead of creating a temporary file the result
> of datafiles concatenation
> - args: Other arguments to pass
> + - filename: filename of output binary generated by mkimage
>
> The data passed to mkimage is collected from subnodes of the mkimage node,
> e.g.::
>
> mkimage {
> + filename = "imximage.bin";
> args = "-n test -T imximage";
>
> u-boot-spl {
> @@ -33,7 +35,7 @@ class Entry_mkimage(Entry):
>
> This calls mkimage to create an imximage with u-boot-spl.bin as the input
> file. The output from mkimage then becomes part of the image produced by
> - binman.
> + binman but also is written into imximage.bin file.
>
> To pass all datafiles untouched to mkimage::
>
> @@ -70,6 +72,7 @@ class Entry_mkimage(Entry):
> self._args = fdt_util.GetArgs(self._node, 'args')
> self._multiple_data_files = fdt_util.GetBool(self._node, 'multiple-data-files')
> self._mkimage_entries = OrderedDict()
> + self._filename = fdt_util.GetString(self._node, 'filename')
> self.align_default = None
> self.ReadEntries()
>
> @@ -89,7 +92,7 @@ class Entry_mkimage(Entry):
> self._mkimage_entries.values(), 'mkimage', fake_size)
> if data is None:
> return False
> - output_fname = tools.get_output_filename('mkimage-out.%s' % uniq)
> + output_fname = tools.get_output_filename(self._filename if self._filename else 'mkimage-out.%s' % uniq)
Check <80cols?
> if self.mkimage.run_cmd('-d', input_fname, *self._args,
> output_fname) is not None:
> self.SetContents(tools.read_file(output_fname))
> --
> 2.37.1
>
Regards,
SImon
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v3 3/8] rockchip: remove binman temporary files when cleaning
2022-08-01 16:06 [PATCH v3 0/8] migrate u-boot-rockchip.bin to binman and generate an image for SPI Quentin Schulz
2022-08-01 16:06 ` [PATCH v3 1/8] binman: add support for skipping file concatenation for mkimage Quentin Schulz
2022-08-01 16:06 ` [PATCH v3 2/8] binman: allow user-defined filenames for mkimage entry Quentin Schulz
@ 2022-08-01 16:06 ` Quentin Schulz
2022-08-01 18:59 ` Johan Jonker
2022-08-01 16:06 ` [PATCH v3 4/8] rockchip: generate idbloader.img content for u-boot-rockchip.bin with binman for ARM Quentin Schulz
` (4 subsequent siblings)
7 siblings, 1 reply; 15+ messages in thread
From: Quentin Schulz @ 2022-08-01 16:06 UTC (permalink / raw)
Cc: bharat.gooty, rayagonda.kokatanur, sjg, philipp.tomsich,
kever.yang, jagan, alpernebiyasak, xypron.glpk, heiko.thiery,
u-boot, Quentin Schulz, Quentin Schulz, Johan Jonker
From: Quentin Schulz <quentin.schulz@theobroma-systems.com>
Binman mkimage entry generates temporary files so let's remove them
when calling `make clean`.
Fixes: 9b312e26fc77 ("rockchip: Enable building a SPI ROM image on jerry")
Cc: Quentin Schulz <foss+uboot@0leil.net>
Reported-by: Johan Jonker <jbx6244@gmail.com>
Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
---
added in v3
Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index ff25f92974..bbb2a4c088 100644
--- a/Makefile
+++ b/Makefile
@@ -2220,7 +2220,8 @@ CLEAN_FILES += include/bmp_logo.h include/bmp_logo_data.h \
lpc32xx-* bl31.c bl31.elf bl31_*.bin image.map tispl.bin* \
idbloader.img flash.bin flash.log defconfig keep-syms-lto.c \
mkimage-out.spl.mkimage mkimage.spl.mkimage imx-boot.map \
- itb.fit.fit itb.fit.itb itb.map spl.map
+ itb.fit.fit itb.fit.itb itb.map spl.map mkimage-out.rom.mkimage \
+ mkimage.rom.mkimage rom.map simple-bin.map
# Directories & files removed with 'make mrproper'
MRPROPER_DIRS += include/config include/generated spl tpl \
--
2.37.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH v3 3/8] rockchip: remove binman temporary files when cleaning
2022-08-01 16:06 ` [PATCH v3 3/8] rockchip: remove binman temporary files when cleaning Quentin Schulz
@ 2022-08-01 18:59 ` Johan Jonker
2022-08-01 19:13 ` Simon Glass
0 siblings, 1 reply; 15+ messages in thread
From: Johan Jonker @ 2022-08-01 18:59 UTC (permalink / raw)
To: Quentin Schulz
Cc: bharat.gooty, rayagonda.kokatanur, sjg, philipp.tomsich,
kever.yang, jagan, alpernebiyasak, xypron.glpk, heiko.thiery,
u-boot, Quentin Schulz
Hi Quentin,
Beside removing the "real" annoyance is that these files popup when adding with "git add ." and are blocking branch changing with "git branch ...".
Maybe add to ".gitignore" as well or delete immediately. What's the use to keep them around?
Johan
On 8/1/22 18:06, Quentin Schulz wrote:
> From: Quentin Schulz <quentin.schulz@theobroma-systems.com>
>
> Binman mkimage entry generates temporary files so let's remove them
> when calling `make clean`.
>
> Fixes: 9b312e26fc77 ("rockchip: Enable building a SPI ROM image on jerry")
> Cc: Quentin Schulz <foss+uboot@0leil.net>
> Reported-by: Johan Jonker <jbx6244@gmail.com>
> Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
> ---
>
> added in v3
>
> Makefile | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/Makefile b/Makefile
> index ff25f92974..bbb2a4c088 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -2220,7 +2220,8 @@ CLEAN_FILES += include/bmp_logo.h include/bmp_logo_data.h \
> lpc32xx-* bl31.c bl31.elf bl31_*.bin image.map tispl.bin* \
> idbloader.img flash.bin flash.log defconfig keep-syms-lto.c \
> mkimage-out.spl.mkimage mkimage.spl.mkimage imx-boot.map \
> - itb.fit.fit itb.fit.itb itb.map spl.map
> + itb.fit.fit itb.fit.itb itb.map spl.map mkimage-out.rom.mkimage \
> + mkimage.rom.mkimage rom.map simple-bin.map
>
> # Directories & files removed with 'make mrproper'
> MRPROPER_DIRS += include/config include/generated spl tpl \
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v3 3/8] rockchip: remove binman temporary files when cleaning
2022-08-01 18:59 ` Johan Jonker
@ 2022-08-01 19:13 ` Simon Glass
0 siblings, 0 replies; 15+ messages in thread
From: Simon Glass @ 2022-08-01 19:13 UTC (permalink / raw)
To: Johan Jonker
Cc: Quentin Schulz, Bharat Gooty, Rayagonda Kokatanur,
Philipp Tomsich, Kever Yang, Jagan Teki, Alper Nebi Yasak,
Heinrich Schuchardt, Heiko Thiery, U-Boot Mailing List,
Quentin Schulz
Hi Johan,
On Mon, 1 Aug 2022 at 12:59, Johan Jonker <jbx6244@gmail.com> wrote:
>
> Hi Quentin,
>
> Beside removing the "real" annoyance is that these files popup when adding with "git add ." and are blocking branch changing with "git branch ...".
> Maybe add to ".gitignore" as well or delete immediately. What's the use to keep them around?
At this point I have to remind people to consider moving to
out-of-tree builds (make O=...)
Regards,
Simon
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v3 4/8] rockchip: generate idbloader.img content for u-boot-rockchip.bin with binman for ARM
2022-08-01 16:06 [PATCH v3 0/8] migrate u-boot-rockchip.bin to binman and generate an image for SPI Quentin Schulz
` (2 preceding siblings ...)
2022-08-01 16:06 ` [PATCH v3 3/8] rockchip: remove binman temporary files when cleaning Quentin Schulz
@ 2022-08-01 16:06 ` Quentin Schulz
2022-08-01 19:13 ` Simon Glass
2022-08-01 16:06 ` [PATCH v3 5/8] rockchip: generate u-boot-rockchip.bin with binman for ARM64 boards Quentin Schulz
` (3 subsequent siblings)
7 siblings, 1 reply; 15+ messages in thread
From: Quentin Schulz @ 2022-08-01 16:06 UTC (permalink / raw)
Cc: bharat.gooty, rayagonda.kokatanur, sjg, philipp.tomsich,
kever.yang, jagan, alpernebiyasak, xypron.glpk, heiko.thiery,
u-boot, Quentin Schulz, Quentin Schulz
From: Quentin Schulz <quentin.schulz@theobroma-systems.com>
idbloader.img content - currently created by way of Makefile - can be
created by binman directly.
So let's do that for Rockchip ARM platforms.
Cc: Quentin Schulz <foss+uboot@0leil.net>
Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
---
v3:
- moved spl back into mkimage section,
- added filename property so that the idbloader.img binary is still
generated,
Makefile | 2 +-
arch/arm/dts/rockchip-u-boot.dtsi | 11 ++++++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index bbb2a4c088..ceb5b5e0d9 100644
--- a/Makefile
+++ b/Makefile
@@ -1005,7 +1005,7 @@ endif
else
ifeq ($(CONFIG_SPL),y)
# Generate these inputs for binman which will create the output files
-INPUTS-y += idbloader.img u-boot.img
+INPUTS-y += u-boot.img
endif
endif
endif
diff --git a/arch/arm/dts/rockchip-u-boot.dtsi b/arch/arm/dts/rockchip-u-boot.dtsi
index eae3ee715d..ad72ca9700 100644
--- a/arch/arm/dts/rockchip-u-boot.dtsi
+++ b/arch/arm/dts/rockchip-u-boot.dtsi
@@ -17,8 +17,17 @@
filename = "u-boot-rockchip.bin";
pad-byte = <0xff>;
- blob {
+ mkimage {
filename = "idbloader.img";
+ args = "-n", CONFIG_SYS_SOC, "-T", "rksd";
+#ifdef CONFIG_TPL
+ multiple-data-files;
+
+ u-boot-tpl {
+ };
+#endif
+ u-boot-spl {
+ };
};
u-boot-img {
--
2.37.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH v3 4/8] rockchip: generate idbloader.img content for u-boot-rockchip.bin with binman for ARM
2022-08-01 16:06 ` [PATCH v3 4/8] rockchip: generate idbloader.img content for u-boot-rockchip.bin with binman for ARM Quentin Schulz
@ 2022-08-01 19:13 ` Simon Glass
0 siblings, 0 replies; 15+ messages in thread
From: Simon Glass @ 2022-08-01 19:13 UTC (permalink / raw)
To: Quentin Schulz
Cc: Bharat Gooty, Rayagonda Kokatanur, Philipp Tomsich, Kever Yang,
Jagan Teki, Alper Nebi Yasak, Heinrich Schuchardt, Heiko Thiery,
U-Boot Mailing List, Quentin Schulz
On Mon, 1 Aug 2022 at 10:06, Quentin Schulz <foss+uboot@0leil.net> wrote:
>
> From: Quentin Schulz <quentin.schulz@theobroma-systems.com>
>
> idbloader.img content - currently created by way of Makefile - can be
> created by binman directly.
>
> So let's do that for Rockchip ARM platforms.
>
> Cc: Quentin Schulz <foss+uboot@0leil.net>
> Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
> ---
>
> v3:
> - moved spl back into mkimage section,
> - added filename property so that the idbloader.img binary is still
> generated,
>
> Makefile | 2 +-
> arch/arm/dts/rockchip-u-boot.dtsi | 11 ++++++++++-
> 2 files changed, 11 insertions(+), 2 deletions(-)
Reviewed-by: Simon Glass <sjg@chromium.org>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v3 5/8] rockchip: generate u-boot-rockchip.bin with binman for ARM64 boards
2022-08-01 16:06 [PATCH v3 0/8] migrate u-boot-rockchip.bin to binman and generate an image for SPI Quentin Schulz
` (3 preceding siblings ...)
2022-08-01 16:06 ` [PATCH v3 4/8] rockchip: generate idbloader.img content for u-boot-rockchip.bin with binman for ARM Quentin Schulz
@ 2022-08-01 16:06 ` Quentin Schulz
2022-08-01 19:13 ` Simon Glass
2022-08-01 16:06 ` [PATCH v3 6/8] rockchip: simplify binman image dependencies addition to INPUTS Quentin Schulz
` (2 subsequent siblings)
7 siblings, 1 reply; 15+ messages in thread
From: Quentin Schulz @ 2022-08-01 16:06 UTC (permalink / raw)
Cc: bharat.gooty, rayagonda.kokatanur, sjg, philipp.tomsich,
kever.yang, jagan, alpernebiyasak, xypron.glpk, heiko.thiery,
u-boot, Quentin Schulz, Quentin Schulz
From: Quentin Schulz <quentin.schulz@theobroma-systems.com>
This allows to build u-boot-rockchip.bin binary with binman for Rockchip
ARM64 boards instead of the legacy Makefile way.
Cc: Quentin Schulz <foss+uboot@0leil.net>
Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
---
Makefile | 26 +-------------------------
arch/arm/Kconfig | 2 +-
arch/arm/dts/rockchip-u-boot.dtsi | 5 +++++
3 files changed, 7 insertions(+), 26 deletions(-)
diff --git a/Makefile b/Makefile
index ceb5b5e0d9..f8e919e136 100644
--- a/Makefile
+++ b/Makefile
@@ -999,8 +999,7 @@ ifeq ($(CONFIG_ARCH_ROCKCHIP),y)
# On ARM64 this target is produced by binman so we don't need this dep
ifeq ($(CONFIG_ARM64),y)
ifeq ($(CONFIG_SPL),y)
-# TODO: Get binman to generate this too
-INPUTS-y += u-boot-rockchip.bin
+INPUTS-y += u-boot.itb
endif
else
ifeq ($(CONFIG_SPL),y)
@@ -1493,29 +1492,6 @@ OBJCOPYFLAGS_u-boot-with-spl.bin = -I binary -O binary \
u-boot-with-spl.bin: $(SPL_IMAGE) $(SPL_PAYLOAD) FORCE
$(call if_changed,pad_cat)
-ifeq ($(CONFIG_ARCH_ROCKCHIP),y)
-
-# TPL + SPL
-ifeq ($(CONFIG_SPL)$(CONFIG_TPL),yy)
-MKIMAGEFLAGS_u-boot-tpl-rockchip.bin = -n $(CONFIG_SYS_SOC) -T rksd
-tpl/u-boot-tpl-rockchip.bin: tpl/u-boot-tpl.bin FORCE
- $(call if_changed,mkimage)
-idbloader.img: tpl/u-boot-tpl-rockchip.bin spl/u-boot-spl.bin FORCE
- $(call if_changed,cat)
-else
-MKIMAGEFLAGS_idbloader.img = -n $(CONFIG_SYS_SOC) -T rksd
-idbloader.img: spl/u-boot-spl.bin FORCE
- $(call if_changed,mkimage)
-endif
-
-ifeq ($(CONFIG_ARM64),y)
-OBJCOPYFLAGS_u-boot-rockchip.bin = -I binary -O binary \
- --pad-to=$(CONFIG_SPL_PAD_TO) --gap-fill=0xff
-u-boot-rockchip.bin: idbloader.img u-boot.itb FORCE
- $(call if_changed,pad_cat)
-endif # CONFIG_ARM64
-
-endif # CONFIG_ARCH_ROCKCHIP
ifeq ($(CONFIG_ARCH_LPC32XX)$(CONFIG_SPL),yy)
MKIMAGEFLAGS_lpc32xx-spl.img = -T lpc32xximage -a $(CONFIG_SPL_TEXT_BASE)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 949ebb46ba..c973146f8d 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1974,7 +1974,7 @@ config ARCH_STM32MP
config ARCH_ROCKCHIP
bool "Support Rockchip SoCs"
select BLK
- select BINMAN if SPL_OPTEE || (SPL && !ARM64)
+ select BINMAN if SPL_OPTEE || SPL
select DM
select DM_GPIO
select DM_I2C
diff --git a/arch/arm/dts/rockchip-u-boot.dtsi b/arch/arm/dts/rockchip-u-boot.dtsi
index ad72ca9700..f90a8bf085 100644
--- a/arch/arm/dts/rockchip-u-boot.dtsi
+++ b/arch/arm/dts/rockchip-u-boot.dtsi
@@ -30,7 +30,12 @@
};
};
+#ifdef CONFIG_ARM64
+ blob {
+ filename = "u-boot.itb";
+#else
u-boot-img {
+#endif
offset = <CONFIG_SPL_PAD_TO>;
};
};
--
2.37.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH v3 5/8] rockchip: generate u-boot-rockchip.bin with binman for ARM64 boards
2022-08-01 16:06 ` [PATCH v3 5/8] rockchip: generate u-boot-rockchip.bin with binman for ARM64 boards Quentin Schulz
@ 2022-08-01 19:13 ` Simon Glass
0 siblings, 0 replies; 15+ messages in thread
From: Simon Glass @ 2022-08-01 19:13 UTC (permalink / raw)
To: Quentin Schulz
Cc: Bharat Gooty, Rayagonda Kokatanur, Philipp Tomsich, Kever Yang,
Jagan Teki, Alper Nebi Yasak, Heinrich Schuchardt, Heiko Thiery,
U-Boot Mailing List, Quentin Schulz
On Mon, 1 Aug 2022 at 10:06, Quentin Schulz <foss+uboot@0leil.net> wrote:
>
> From: Quentin Schulz <quentin.schulz@theobroma-systems.com>
>
> This allows to build u-boot-rockchip.bin binary with binman for Rockchip
> ARM64 boards instead of the legacy Makefile way.
>
> Cc: Quentin Schulz <foss+uboot@0leil.net>
> Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
> ---
> Makefile | 26 +-------------------------
> arch/arm/Kconfig | 2 +-
> arch/arm/dts/rockchip-u-boot.dtsi | 5 +++++
> 3 files changed, 7 insertions(+), 26 deletions(-)
Nice!
Reviewed-by: Simon Glass <sjg@chromium.org>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v3 6/8] rockchip: simplify binman image dependencies addition to INPUTS
2022-08-01 16:06 [PATCH v3 0/8] migrate u-boot-rockchip.bin to binman and generate an image for SPI Quentin Schulz
` (4 preceding siblings ...)
2022-08-01 16:06 ` [PATCH v3 5/8] rockchip: generate u-boot-rockchip.bin with binman for ARM64 boards Quentin Schulz
@ 2022-08-01 16:06 ` Quentin Schulz
2022-08-01 16:24 ` Quentin Schulz
2022-08-01 16:06 ` [PATCH v3 7/8] rockchip: allow to build SPI images even without HAS_ROM option Quentin Schulz
2022-08-01 16:06 ` [PATCH v3 8/8] rockchip: add u-boot-rockchip-spi.bin image for booting from SPI-NOR flash Quentin Schulz
7 siblings, 1 reply; 15+ messages in thread
From: Quentin Schulz @ 2022-08-01 16:06 UTC (permalink / raw)
Cc: bharat.gooty, rayagonda.kokatanur, sjg, philipp.tomsich,
kever.yang, jagan, alpernebiyasak, xypron.glpk, heiko.thiery,
u-boot, Quentin Schulz, Quentin Schulz
From: Quentin Schulz <quentin.schulz@theobroma-systems.com>
By factoring SPL check in the first condition, this makes the checks a
bit less convoluted and more readable.
Cc: Quentin Schulz <foss+uboot@0leil.net>
Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
---
Makefile | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
index f8e919e136..640d4b8f65 100644
--- a/Makefile
+++ b/Makefile
@@ -995,19 +995,14 @@ ifeq ($(CONFIG_MPC85xx)$(CONFIG_OF_SEPARATE),yy)
INPUTS-y += u-boot-with-dtb.bin
endif
-ifeq ($(CONFIG_ARCH_ROCKCHIP),y)
-# On ARM64 this target is produced by binman so we don't need this dep
+ifeq ($(CONFIG_ARCH_ROCKCHIP)$(CONFIG_SPL),yy)
+# Binman image dependencies
ifeq ($(CONFIG_ARM64),y)
-ifeq ($(CONFIG_SPL),y)
INPUTS-y += u-boot.itb
endif
else
-ifeq ($(CONFIG_SPL),y)
-# Generate these inputs for binman which will create the output files
INPUTS-y += u-boot.img
endif
-endif
-endif
INPUTS-$(CONFIG_X86) += u-boot-x86-start16.bin u-boot-x86-reset16.bin \
$(if $(CONFIG_SPL_X86_16BIT_INIT),spl/u-boot-spl.bin) \
--
2.37.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH v3 6/8] rockchip: simplify binman image dependencies addition to INPUTS
2022-08-01 16:06 ` [PATCH v3 6/8] rockchip: simplify binman image dependencies addition to INPUTS Quentin Schulz
@ 2022-08-01 16:24 ` Quentin Schulz
0 siblings, 0 replies; 15+ messages in thread
From: Quentin Schulz @ 2022-08-01 16:24 UTC (permalink / raw)
To: Quentin Schulz
Cc: bharat.gooty, rayagonda.kokatanur, sjg, philipp.tomsich,
kever.yang, jagan, alpernebiyasak, xypron.glpk, heiko.thiery,
u-boot
HI all,
On 8/1/22 18:06, Quentin Schulz wrote:
> From: Quentin Schulz <quentin.schulz@theobroma-systems.com>
>
> By factoring SPL check in the first condition, this makes the checks a
> bit less convoluted and more readable.
>
> Cc: Quentin Schulz <foss+uboot@0leil.net>
> Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
> ---
> Makefile | 9 ++-------
> 1 file changed, 2 insertions(+), 7 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index f8e919e136..640d4b8f65 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -995,19 +995,14 @@ ifeq ($(CONFIG_MPC85xx)$(CONFIG_OF_SEPARATE),yy)
> INPUTS-y += u-boot-with-dtb.bin
> endif
>
> -ifeq ($(CONFIG_ARCH_ROCKCHIP),y)
> -# On ARM64 this target is produced by binman so we don't need this dep
> +ifeq ($(CONFIG_ARCH_ROCKCHIP)$(CONFIG_SPL),yy)
> +# Binman image dependencies
> ifeq ($(CONFIG_ARM64),y)
> -ifeq ($(CONFIG_SPL),y)
> INPUTS-y += u-boot.itb
> endif
This one should be moved....
> else
> -ifeq ($(CONFIG_SPL),y)
> -# Generate these inputs for binman which will create the output files
> INPUTS-y += u-boot.img
> endif
....down here to keep the same behavior. Will update for v4.
Cheers,
Quentin
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v3 7/8] rockchip: allow to build SPI images even without HAS_ROM option
2022-08-01 16:06 [PATCH v3 0/8] migrate u-boot-rockchip.bin to binman and generate an image for SPI Quentin Schulz
` (5 preceding siblings ...)
2022-08-01 16:06 ` [PATCH v3 6/8] rockchip: simplify binman image dependencies addition to INPUTS Quentin Schulz
@ 2022-08-01 16:06 ` Quentin Schulz
2022-08-01 16:06 ` [PATCH v3 8/8] rockchip: add u-boot-rockchip-spi.bin image for booting from SPI-NOR flash Quentin Schulz
7 siblings, 0 replies; 15+ messages in thread
From: Quentin Schulz @ 2022-08-01 16:06 UTC (permalink / raw)
Cc: bharat.gooty, rayagonda.kokatanur, sjg, philipp.tomsich,
kever.yang, jagan, alpernebiyasak, xypron.glpk, heiko.thiery,
u-boot, Quentin Schulz, Quentin Schulz
From: Quentin Schulz <quentin.schulz@theobroma-systems.com>
This prepares for the creation of a u-boot-rockchip-spi.bin image
similar to u-boot-rockchip.bin to the exception it's destined for
SPI-NOR flashes instead of MMC storage medium.
Cc: Quentin Schulz <foss+uboot@0leil.net>
Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
---
arch/arm/dts/rk3288-u-boot.dtsi | 2 +-
arch/arm/dts/rk3399-u-boot.dtsi | 2 +-
arch/arm/mach-rockchip/Kconfig | 6 ++----
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/arch/arm/dts/rk3288-u-boot.dtsi b/arch/arm/dts/rk3288-u-boot.dtsi
index 9eb696b141..e411445ed6 100644
--- a/arch/arm/dts/rk3288-u-boot.dtsi
+++ b/arch/arm/dts/rk3288-u-boot.dtsi
@@ -56,7 +56,7 @@
};
};
-#ifdef CONFIG_ROCKCHIP_SPI_IMAGE
+#if defined(CONFIG_ROCKCHIP_SPI_IMAGE) && defined(CONFIG_HAS_ROM)
&binman {
rom {
filename = "u-boot.rom";
diff --git a/arch/arm/dts/rk3399-u-boot.dtsi b/arch/arm/dts/rk3399-u-boot.dtsi
index 716b9a433a..3c1a15fe51 100644
--- a/arch/arm/dts/rk3399-u-boot.dtsi
+++ b/arch/arm/dts/rk3399-u-boot.dtsi
@@ -60,7 +60,7 @@
};
-#ifdef CONFIG_ROCKCHIP_SPI_IMAGE
+#if defined(CONFIG_ROCKCHIP_SPI_IMAGE) && defined(CONFIG_HAS_ROM)
&binman {
rom {
filename = "u-boot.rom";
diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
index c561a77e6a..b46cea2f91 100644
--- a/arch/arm/mach-rockchip/Kconfig
+++ b/arch/arm/mach-rockchip/Kconfig
@@ -425,12 +425,10 @@ config SPL_MMC
config ROCKCHIP_SPI_IMAGE
bool "Build a SPI image for rockchip"
- depends on HAS_ROM
help
Some Rockchip SoCs support booting from SPI flash. Enable this
- option to produce a 4MB SPI-flash image (called u-boot.rom)
- containing U-Boot. The image is built by binman. U-Boot sits near
- the start of the image.
+ option to produce a SPI-flash image containing U-Boot. The image
+ is built by binman. U-Boot sits near the start of the image.
config LNX_KRNL_IMG_TEXT_OFFSET_BASE
default SYS_TEXT_BASE
--
2.37.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH v3 8/8] rockchip: add u-boot-rockchip-spi.bin image for booting from SPI-NOR flash
2022-08-01 16:06 [PATCH v3 0/8] migrate u-boot-rockchip.bin to binman and generate an image for SPI Quentin Schulz
` (6 preceding siblings ...)
2022-08-01 16:06 ` [PATCH v3 7/8] rockchip: allow to build SPI images even without HAS_ROM option Quentin Schulz
@ 2022-08-01 16:06 ` Quentin Schulz
7 siblings, 0 replies; 15+ messages in thread
From: Quentin Schulz @ 2022-08-01 16:06 UTC (permalink / raw)
Cc: bharat.gooty, rayagonda.kokatanur, sjg, philipp.tomsich,
kever.yang, jagan, alpernebiyasak, xypron.glpk, heiko.thiery,
u-boot, Quentin Schulz, Quentin Schulz
From: Quentin Schulz <quentin.schulz@theobroma-systems.com>
This new image is similar to u-boot-rockchip.bin except that it's
destined to be flashed on SPI-NOR flashes.
Cc: Quentin Schulz <foss+uboot@0leil.net>
Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
---
v3:
- added filename property so that idblaoder-spi.img binary is generated
by binman, as per community request,
- added new temporary files to the list of files to clean up on `make
clean`,
Makefile | 3 ++-
arch/arm/dts/rockchip-u-boot.dtsi | 30 ++++++++++++++++++++++++++++++
2 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 640d4b8f65..6979dfb28d 100644
--- a/Makefile
+++ b/Makefile
@@ -2192,7 +2192,8 @@ CLEAN_FILES += include/bmp_logo.h include/bmp_logo_data.h \
idbloader.img flash.bin flash.log defconfig keep-syms-lto.c \
mkimage-out.spl.mkimage mkimage.spl.mkimage imx-boot.map \
itb.fit.fit itb.fit.itb itb.map spl.map mkimage-out.rom.mkimage \
- mkimage.rom.mkimage rom.map simple-bin.map
+ mkimage.rom.mkimage rom.map simple-bin.map simple-bin-spi.map \
+ idbloader-spi.img
# Directories & files removed with 'make mrproper'
MRPROPER_DIRS += include/config include/generated spl tpl \
diff --git a/arch/arm/dts/rockchip-u-boot.dtsi b/arch/arm/dts/rockchip-u-boot.dtsi
index f90a8bf085..584f21eb5b 100644
--- a/arch/arm/dts/rockchip-u-boot.dtsi
+++ b/arch/arm/dts/rockchip-u-boot.dtsi
@@ -39,5 +39,35 @@
offset = <CONFIG_SPL_PAD_TO>;
};
};
+
+#ifdef CONFIG_ROCKCHIP_SPI_IMAGE
+ simple-bin-spi {
+ filename = "u-boot-rockchip-spi.bin";
+ pad-byte = <0xff>;
+
+ mkimage {
+ filename = "idbloader-spi.img";
+ args = "-n", CONFIG_SYS_SOC, "-T", "rkspi";
+#ifdef CONFIG_TPL
+ multiple-data-files;
+
+ u-boot-tpl {
+ };
+#endif
+ u-boot-spl {
+ };
+ };
+
+#ifdef CONFIG_ARM64
+ blob {
+ filename = "u-boot.itb";
+#else
+ u-boot-img {
+#endif
+ /* Sync with u-boot,spl-payload-offset if present */
+ offset = <CONFIG_SYS_SPI_U_BOOT_OFFS>;
+ };
+ };
+#endif
};
#endif
--
2.37.1
^ permalink raw reply related [flat|nested] 15+ messages in thread