From: Jagan Teki <jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>
To: "Matwey V. Kornilov"
<matwey.kornilov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: U-Boot Mailing List
<u-boot-0aAXYlwwYIKGBzrmiIFOJg@public.gmane.org>,
Simon Glass <sjg-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>,
Kever Yang <kever.yang-TNX95d0MmH7DzftRWevZcw@public.gmane.org>,
"open list:ARM/Rockchip SoC support"
<linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org>,
Akash Gajjar <akash-oRp2ZoJdM/RWk0Htik3J/w@public.gmane.org>,
Philipp Tomsich
<philipp.tomsich-SN7IsUiht6C/RdPyistoZJqQE7yCjDx5@public.gmane.org>,
linux-amarula
<linux-amarula-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>
Subject: Re: [PATCH v5 6/7] rockchip: Add Single boot image (with binman, pad_cat)
Date: Fri, 3 Jan 2020 23:05:05 +0530 [thread overview]
Message-ID: <CAMty3ZCGTSX7Y0TUDriOi1e6c3p=FK3V90DviYXMmqLbvNZjew@mail.gmail.com> (raw)
In-Reply-To: <CAJs94EZgpHmkHAfDQUH_mqW82Jw_QJWiJgx_8Uny1ru1WfbrHw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
On Tue, Dec 31, 2019 at 1:34 PM Matwey V. Kornilov
<matwey.kornilov@gmail.com> wrote:
>
> вт, 31 дек. 2019 г. в 10:54, Matwey V. Kornilov <matwey.kornilov@gmail.com>:
> >
> > пн, 30 дек. 2019 г. в 11:28, Jagan Teki <jagan@amarulasolutions.com>:
> > >
> > > All rockchip platforms support TPL or SPL-based bootloader
> > > in mainline with U-Boot proper as final stage. For each
> > > stage we need to burn the image on to flash with respective
> > > offsets.
> > >
> > > This patch creates a single boot image component using
> > > - binman, for arm32 rockchip platforms
> > > - pad_cat, for arm64 rockchip platforms.
> > >
> > > This would help users to get rid of burning different
> > > boot stage images.
> > >
> > > The new image called 'u-boot-rockchip.bin'
> > > which can burn into flash like:
> > >
> > > ₹ sudo dd if=u-boot-rockchip.bin of=/dev/sda seek=64
> > >
> > > This would support all rockchip platforms, except rk3128
> > > since it doesn't support for SPL yet.
> > >
> > > Cc: Kever Yang <kever.yang@rock-chips.com>
> > > Cc: Matwey V. Kornilov <matwey.kornilov@gmail.com>
> > > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
> > > Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
> > > ---
> > > Makefile | 18 ++++++++++++++----
> > > arch/arm/Kconfig | 1 +
> > > arch/arm/dts/rk3036-u-boot.dtsi | 2 ++
> > > arch/arm/dts/rk3288-u-boot.dtsi | 2 ++
> > > arch/arm/dts/rockchip-u-boot.dtsi | 21 +++++++++++++++++++++
> > > include/configs/rockchip-common.h | 2 ++
> > > 6 files changed, 42 insertions(+), 4 deletions(-)
> > > create mode 100644 arch/arm/dts/rockchip-u-boot.dtsi
> > >
> > > diff --git a/Makefile b/Makefile
> > > index b48693e560..d5b6c45c89 100644
> > > --- a/Makefile
> > > +++ b/Makefile
> > > @@ -909,7 +909,7 @@ ALL-y += u-boot-with-dtb.bin
> > > endif
> > >
> > > ifeq ($(CONFIG_ARCH_ROCKCHIP)$(CONFIG_SPL),yy)
> > > -ALL-y += u-boot-spl-rockchip.bin
> > > +ALL-y += u-boot-rockchip.bin
> > > endif
> > >
> > > LDFLAGS_u-boot += $(LDFLAGS_FINAL)
> > > @@ -1387,15 +1387,25 @@ ifeq ($(CONFIG_SPL)$(CONFIG_TPL),yy)
> > > MKIMAGEFLAGS_u-boot-tpl-rockchip.bin = -n $(CONFIG_SYS_SOC) -T $(ROCKCHIP_IMG_TYPE)
> > > tpl/u-boot-tpl-rockchip.bin: tpl/u-boot-tpl.bin FORCE
> > > $(call if_changed,mkimage)
> > > -u-boot-spl-rockchip.bin: tpl/u-boot-tpl-rockchip.bin spl/u-boot-spl.bin FORCE
> > > +spl/u-boot-spl-rockchip.bin: tpl/u-boot-tpl-rockchip.bin spl/u-boot-spl.bin FORCE
> > > $(call if_changed,cat)
> > > else
> > > MKIMAGEFLAGS_u-boot-spl-rockchip.bin = -n $(CONFIG_SYS_SOC) -T $(ROCKCHIP_IMG_TYPE)
> > > -u-boot-spl-rockchip.bin: spl/u-boot-spl.bin FORCE
> > > +spl/u-boot-spl-rockchip.bin: spl/u-boot-spl.bin FORCE
> > > $(call if_changed,mkimage)
> > > endif
> > >
> > > -endif
> > > +ifeq ($(CONFIG_ARM64),)
> > > +u-boot-rockchip.bin: spl/u-boot-spl-rockchip.bin u-boot.img FORCE
> > > + $(call if_changed,binman)
> > > +else
> > > +OBJCOPYFLAGS_u-boot-rockchip.bin = -I binary -O binary \
> > > + --pad-to=$(CONFIG_SPL_PAD_TO) --gap-fill=0xff
> > > +u-boot-rockchip.bin: spl/u-boot-spl-rockchip.bin 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 f9dab073ea..7bd99ba3bb 100644
> > > --- a/arch/arm/Kconfig
> > > +++ b/arch/arm/Kconfig
> > > @@ -1590,6 +1590,7 @@ config ARCH_STM32MP
> > > config ARCH_ROCKCHIP
> > > bool "Support Rockchip SoCs"
> > > select BLK
> > > + select BINMAN if !ARM64
> > > select DM
> > > select DM_GPIO
> > > select DM_I2C
> > > diff --git a/arch/arm/dts/rk3036-u-boot.dtsi b/arch/arm/dts/rk3036-u-boot.dtsi
> > > index 1e7d079315..41ac054b81 100644
> > > --- a/arch/arm/dts/rk3036-u-boot.dtsi
> > > +++ b/arch/arm/dts/rk3036-u-boot.dtsi
> > > @@ -2,3 +2,5 @@
> > > /*
> > > * Copyright (C) 2019 Jagan Teki <jagan@amarulasolutions.com>
> > > */
> > > +
> > > +#include "rockchip-u-boot.dtsi"
> > > diff --git a/arch/arm/dts/rk3288-u-boot.dtsi b/arch/arm/dts/rk3288-u-boot.dtsi
> > > index 3f00a3b6d3..6d31735362 100644
> > > --- a/arch/arm/dts/rk3288-u-boot.dtsi
> > > +++ b/arch/arm/dts/rk3288-u-boot.dtsi
> > > @@ -3,6 +3,8 @@
> > > * Copyright (C) 2019 Rockchip Electronics Co., Ltd
> > > */
> > >
> > > +#include "rockchip-u-boot.dtsi"
> > > +
> > > / {
> > > chosen {
> > > u-boot,spl-boot-order = \
> > > diff --git a/arch/arm/dts/rockchip-u-boot.dtsi b/arch/arm/dts/rockchip-u-boot.dtsi
> > > new file mode 100644
> > > index 0000000000..bc0b1412a2
> > > --- /dev/null
> > > +++ b/arch/arm/dts/rockchip-u-boot.dtsi
> > > @@ -0,0 +1,21 @@
> > > +// SPDX-License-Identifier: GPL-2.0+
> > > +/*
> > > + * Copyright (C) 2019 Jagan Teki <jagan@amarulasolutions.com>
> > > + */
> > > +
> > > +#include <config.h>
> > > +
> > > +/ {
> > > + binman {
> > > + filename = "u-boot-rockchip.bin";
> > > + pad-byte = <0xff>;
> > > +
> > > + blob {
> > > + filename = "spl/u-boot-spl-rockchip.bin";
> > > + };
> > > +
> > > + u-boot-img {
> > > + offset = <CONFIG_SPL_PAD_TO>;
> > > + };
> > > + };
> > > +};
> > > diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h
> > > index 68e1105a4b..d7f5ca9fa4 100644
> > > --- a/include/configs/rockchip-common.h
> > > +++ b/include/configs/rockchip-common.h
> > > @@ -9,6 +9,8 @@
> > >
> > > #define CONFIG_SYS_NS16550_MEM32
> > >
> > > +#define CONFIG_SPL_PAD_TO 8355840
> >
> > I may be wrong, but shouldn't CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR
> > be used here?
>
> I.e.
>
> #define CONFIG_SPL_PAD_TO ((CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR - 64) * 512)
Yes, I did try this logic. but arm64 compiler throwing warning during
build for this. (I'm using gcc 6.3.1)
CAT u-boot-rockchip.bin
aarch64-linux-gnu-objcopy: --pad-to: bad number:
((CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR - 64) * 512)
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
next prev parent reply other threads:[~2020-01-03 17:35 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-30 8:28 [PATCH v5 0/7] rockchip: Add Binman support Jagan Teki
[not found] ` <20191230082819.30191-1-jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>
2019-12-30 8:28 ` [PATCH v5 1/7] Makefile: Add rockchip image type Jagan Teki
2019-12-30 8:28 ` [PATCH v5 2/7] Makefile: rockchip: Suffix platform type with tpl name Jagan Teki
2019-12-30 8:28 ` [PATCH v5 3/7] Makefile: rockchip: Support SPL-alone mkimage Jagan Teki
2019-12-30 8:28 ` [PATCH v5 4/7] Makefile: rockchip: Use u-boot preferred spl name Jagan Teki
2019-12-30 8:28 ` [PATCH v5 5/7] arm: dts: rk3036: Add rk3036-u-boot.dtsi Jagan Teki
2019-12-30 8:28 ` [PATCH v5 6/7] rockchip: Add Single boot image (with binman, pad_cat) Jagan Teki
2019-12-31 7:54 ` Matwey V. Kornilov
2019-12-31 8:04 ` Matwey V. Kornilov
[not found] ` <CAJs94EZgpHmkHAfDQUH_mqW82Jw_QJWiJgx_8Uny1ru1WfbrHw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2020-01-03 17:35 ` Jagan Teki [this message]
2019-12-30 8:28 ` [PATCH v5 7/7] doc: boards: Add rockchip documentation Jagan Teki
2019-12-30 8:41 ` Matwey V. Kornilov
[not found] ` <CAJs94EYBrwf9Pt0R-_OypT-JHWGFpZYxRhKcUXWgXTFJi9O0HA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2019-12-30 8:59 ` Jagan Teki
2019-12-31 7:50 ` Matwey V. Kornilov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAMty3ZCGTSX7Y0TUDriOi1e6c3p=FK3V90DviYXMmqLbvNZjew@mail.gmail.com' \
--to=jagan-dyjbcgdgk7pe9whmmfpqlfatqe2ktcn/@public.gmane.org \
--cc=akash-oRp2ZoJdM/RWk0Htik3J/w@public.gmane.org \
--cc=kever.yang-TNX95d0MmH7DzftRWevZcw@public.gmane.org \
--cc=linux-amarula-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org \
--cc=linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=matwey.kornilov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=philipp.tomsich-SN7IsUiht6C/RdPyistoZJqQE7yCjDx5@public.gmane.org \
--cc=sjg-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org \
--cc=u-boot-0aAXYlwwYIKGBzrmiIFOJg@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).