* [PATCH v6 1/6] Makefile: Add rockchip image type
2020-01-04 8:38 [PATCH v6 0/6] rockchip: Add Binman support Jagan Teki
@ 2020-01-04 8:38 ` Jagan Teki
2020-01-04 8:38 ` [PATCH v6 2/6] Makefile: rockchip: Suffix platform type with tpl name Jagan Teki
` (5 subsequent siblings)
6 siblings, 0 replies; 19+ messages in thread
From: Jagan Teki @ 2020-01-04 8:38 UTC (permalink / raw)
To: u-boot
Add rockchip image type support. right now the image
type marked with rksd, So create image type variable
with required image type like rksd or rkspi.
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 | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index e20a206239..9998d238f3 100644
--- a/Makefile
+++ b/Makefile
@@ -1374,7 +1374,15 @@ u-boot-with-spl.bin: $(SPL_IMAGE) $(SPL_PAYLOAD) FORCE
$(call if_changed,pad_cat)
ifeq ($(CONFIG_ARCH_ROCKCHIP),y)
-MKIMAGEFLAGS_u-boot-tpl.img = -n $(CONFIG_SYS_SOC) -T rksd
+
+# rockchip image type
+ifeq ($(CONFIG_SPI_FLASH_SUPPORT),y)
+ROCKCHIP_IMG_TYPE := rkspi
+else
+ROCKCHIP_IMG_TYPE := rksd
+endif
+
+MKIMAGEFLAGS_u-boot-tpl.img = -n $(CONFIG_SYS_SOC) -T $(ROCKCHIP_IMG_TYPE)
tpl/u-boot-tpl.img: tpl/u-boot-tpl.bin FORCE
$(call if_changed,mkimage)
idbloader.img: tpl/u-boot-tpl.img spl/u-boot-spl.bin FORCE
--
2.18.0.321.gffc6fa0e3
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH v6 2/6] Makefile: rockchip: Suffix platform type with tpl name
2020-01-04 8:38 [PATCH v6 0/6] rockchip: Add Binman support Jagan Teki
2020-01-04 8:38 ` [PATCH v6 1/6] Makefile: Add rockchip image type Jagan Teki
@ 2020-01-04 8:38 ` Jagan Teki
2020-01-04 8:38 ` [PATCH v6 3/6] Makefile: rockchip: Support SPL-alone mkimage Jagan Teki
` (4 subsequent siblings)
6 siblings, 0 replies; 19+ messages in thread
From: Jagan Teki @ 2020-01-04 8:38 UTC (permalink / raw)
To: u-boot
Most of the platforms uses the platform type on their boot
stage image naming conventions in makefile like,
u-boot-x86-start16-tpl.bin - x86 start16 TPL bin
u-boot-spl-mtk.bin - Mediatek SPL bin
This would help to understand the users to what that
particular image belongs to? and less confused.
On that note, suffix platform type rockchip for existing
u-boot-tpl.img so now it become u-boot-tpl-rockchip.bin
Also, bin is more conventional way to include it on tools
like binman, pad_cat etc in future patches.
Note: usage of platform type doesn't follow consistent order
as of now.
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
---
Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 9998d238f3..e519103be4 100644
--- a/Makefile
+++ b/Makefile
@@ -1382,10 +1382,10 @@ else
ROCKCHIP_IMG_TYPE := rksd
endif
-MKIMAGEFLAGS_u-boot-tpl.img = -n $(CONFIG_SYS_SOC) -T $(ROCKCHIP_IMG_TYPE)
-tpl/u-boot-tpl.img: tpl/u-boot-tpl.bin FORCE
+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)
-idbloader.img: tpl/u-boot-tpl.img spl/u-boot-spl.bin FORCE
+idbloader.img: tpl/u-boot-tpl-rockchip.bin spl/u-boot-spl.bin FORCE
$(call if_changed,cat)
endif
--
2.18.0.321.gffc6fa0e3
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH v6 3/6] Makefile: rockchip: Support SPL-alone mkimage
2020-01-04 8:38 [PATCH v6 0/6] rockchip: Add Binman support Jagan Teki
2020-01-04 8:38 ` [PATCH v6 1/6] Makefile: Add rockchip image type Jagan Teki
2020-01-04 8:38 ` [PATCH v6 2/6] Makefile: rockchip: Suffix platform type with tpl name Jagan Teki
@ 2020-01-04 8:38 ` Jagan Teki
2020-01-04 8:38 ` [PATCH v6 4/6] arm: dts: rk3036: Add rk3036-u-boot.dtsi Jagan Teki
` (3 subsequent siblings)
6 siblings, 0 replies; 19+ messages in thread
From: Jagan Teki @ 2020-01-04 8:38 UTC (permalink / raw)
To: u-boot
Add SPL-alone mkimage tooling support via Makefile for
few platforms or boards used in rockchip family.
With this users would get rid of explicitly creating
mkimage tool for rockchip rksd or rkspi boot modes.
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
---
Makefile | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index e519103be4..d8a0f68883 100644
--- a/Makefile
+++ b/Makefile
@@ -908,7 +908,7 @@ ifeq ($(CONFIG_MPC85xx)$(CONFIG_OF_SEPARATE),yy)
ALL-y += u-boot-with-dtb.bin
endif
-ifeq ($(CONFIG_ARCH_ROCKCHIP)$(CONFIG_SPL)$(CONFIG_TPL),yyy)
+ifeq ($(CONFIG_ARCH_ROCKCHIP)$(CONFIG_SPL),yy)
ALL-y += idbloader.img
endif
@@ -1382,11 +1382,19 @@ else
ROCKCHIP_IMG_TYPE := rksd
endif
+# TPL + SPL
+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)
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 $(ROCKCHIP_IMG_TYPE)
+idbloader.img: spl/u-boot-spl.bin FORCE
+ $(call if_changed,mkimage)
+endif
+
endif
ifeq ($(CONFIG_ARCH_LPC32XX)$(CONFIG_SPL),yy)
--
2.18.0.321.gffc6fa0e3
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH v6 4/6] arm: dts: rk3036: Add rk3036-u-boot.dtsi
2020-01-04 8:38 [PATCH v6 0/6] rockchip: Add Binman support Jagan Teki
` (2 preceding siblings ...)
2020-01-04 8:38 ` [PATCH v6 3/6] Makefile: rockchip: Support SPL-alone mkimage Jagan Teki
@ 2020-01-04 8:38 ` Jagan Teki
2020-01-04 8:38 ` [PATCH v6 5/6] rockchip: Add Single boot image (with binman, pad_cat) Jagan Teki
` (2 subsequent siblings)
6 siblings, 0 replies; 19+ messages in thread
From: Jagan Teki @ 2020-01-04 8:38 UTC (permalink / raw)
To: u-boot
Add U-Boot specific dtsi file for rk3036 SoC. This
would help to add U-Boot specific dts nodes, properties
which are common across rk3036.
Right now, the file is empty, will add required changes
in future patches.
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
---
arch/arm/dts/rk3036-sdk-u-boot.dtsi | 2 ++
arch/arm/dts/rk3036-u-boot.dtsi | 4 ++++
2 files changed, 6 insertions(+)
create mode 100644 arch/arm/dts/rk3036-u-boot.dtsi
diff --git a/arch/arm/dts/rk3036-sdk-u-boot.dtsi b/arch/arm/dts/rk3036-sdk-u-boot.dtsi
index 6f15f4a8ec..754800c6e6 100644
--- a/arch/arm/dts/rk3036-sdk-u-boot.dtsi
+++ b/arch/arm/dts/rk3036-sdk-u-boot.dtsi
@@ -1,3 +1,5 @@
+#include "rk3036-u-boot.dtsi"
+
&uart2 {
u-boot,dm-pre-reloc;
};
diff --git a/arch/arm/dts/rk3036-u-boot.dtsi b/arch/arm/dts/rk3036-u-boot.dtsi
new file mode 100644
index 0000000000..1e7d079315
--- /dev/null
+++ b/arch/arm/dts/rk3036-u-boot.dtsi
@@ -0,0 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2019 Jagan Teki <jagan@amarulasolutions.com>
+ */
--
2.18.0.321.gffc6fa0e3
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH v6 5/6] rockchip: Add Single boot image (with binman, pad_cat)
2020-01-04 8:38 [PATCH v6 0/6] rockchip: Add Binman support Jagan Teki
` (3 preceding siblings ...)
2020-01-04 8:38 ` [PATCH v6 4/6] arm: dts: rk3036: Add rk3036-u-boot.dtsi Jagan Teki
@ 2020-01-04 8:38 ` Jagan Teki
2020-01-07 9:47 ` [PATCH v6 5/6] rockchip: Add Single boot image (with binman, pad_cat)【请注意，邮件由linux-rockchip-bounces+kever.yang=rock-chips.com@lists.infradead.org代发】 Kever Yang
` (2 more replies)
2020-01-04 8:38 ` [PATCH v6 6/6] doc: boards: Add rockchip documentation Jagan Teki
2020-01-07 9:59 ` [PATCH v6 0/6] rockchip: Add Binman support Kever Yang
6 siblings, 3 replies; 19+ messages in thread
From: Jagan Teki @ 2020-01-04 8:38 UTC (permalink / raw)
To: u-boot
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 | 14 ++++++++++++--
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 | 3 +++
6 files changed, 41 insertions(+), 2 deletions(-)
create mode 100644 arch/arm/dts/rockchip-u-boot.dtsi
diff --git a/Makefile b/Makefile
index d8a0f68883..cdd3eb4614 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 += idbloader.img
+ALL-y += u-boot-rockchip.bin
endif
LDFLAGS_u-boot += $(LDFLAGS_FINAL)
@@ -1395,7 +1395,17 @@ idbloader.img: spl/u-boot-spl.bin FORCE
$(call if_changed,mkimage)
endif
-endif
+ifeq ($(CONFIG_ARM64),)
+u-boot-rockchip.bin: idbloader.img 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: 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 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..a2559e2db0
--- /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 = "idbloader.img";
+ };
+
+ u-boot-img {
+ offset = <CONFIG_SPL_PAD_TO>;
+ };
+ };
+};
diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h
index 68e1105a4b..b55e09a9ca 100644
--- a/include/configs/rockchip-common.h
+++ b/include/configs/rockchip-common.h
@@ -9,6 +9,9 @@
#define CONFIG_SYS_NS16550_MEM32
+/* ((CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR - 64) * 512) */
+#define CONFIG_SPL_PAD_TO 8355840
+
#ifndef CONFIG_SPL_BUILD
/* First try to boot from SD (index 0), then eMMC (index 1) */
--
2.18.0.321.gffc6fa0e3
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: [PATCH v6 5/6] rockchip: Add Single boot image (with binman, pad_cat)【请注意，邮件由linux-rockchip-bounces+kever.yang=rock-chips.com@lists.infradead.org代发】
2020-01-04 8:38 ` [PATCH v6 5/6] rockchip: Add Single boot image (with binman, pad_cat) Jagan Teki
@ 2020-01-07 9:47 ` Kever Yang
2020-01-10 9:39 ` [PATCH v6 5/6] rockchip: Add Single boot image (with binman, pad_cat) Simon Glass
2020-01-30 2:17 ` Simon Glass
2 siblings, 0 replies; 19+ messages in thread
From: Kever Yang @ 2020-01-07 9:47 UTC (permalink / raw)
To: u-boot
Hi Jagan,
This patch seems like will cause error on rock_defconfig, could you take
a look:
binman: Device tree 'u-boot.dtb' does not have a 'binman' node
Makefile:1400: recipe for target 'u-boot-rockchip.bin' failed
Thanks,
- Kever
On 2020/1/4 下午4:38, Jagan Teki wrote:
> 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 | 14 ++++++++++++--
> 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 | 3 +++
> 6 files changed, 41 insertions(+), 2 deletions(-)
> create mode 100644 arch/arm/dts/rockchip-u-boot.dtsi
>
> diff --git a/Makefile b/Makefile
> index d8a0f68883..cdd3eb4614 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 += idbloader.img
> +ALL-y += u-boot-rockchip.bin
> endif
>
> LDFLAGS_u-boot += $(LDFLAGS_FINAL)
> @@ -1395,7 +1395,17 @@ idbloader.img: spl/u-boot-spl.bin FORCE
> $(call if_changed,mkimage)
> endif
>
> -endif
> +ifeq ($(CONFIG_ARM64),)
> +u-boot-rockchip.bin: idbloader.img 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: 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 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..a2559e2db0
> --- /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 = "idbloader.img";
> + };
> +
> + u-boot-img {
> + offset = <CONFIG_SPL_PAD_TO>;
> + };
> + };
> +};
> diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h
> index 68e1105a4b..b55e09a9ca 100644
> --- a/include/configs/rockchip-common.h
> +++ b/include/configs/rockchip-common.h
> @@ -9,6 +9,9 @@
>
> #define CONFIG_SYS_NS16550_MEM32
>
> +/* ((CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR - 64) * 512) */
> +#define CONFIG_SPL_PAD_TO 8355840
> +
> #ifndef CONFIG_SPL_BUILD
>
> /* First try to boot from SD (index 0), then eMMC (index 1) */
^ permalink raw reply [flat|nested] 19+ messages in thread* [PATCH v6 5/6] rockchip: Add Single boot image (with binman, pad_cat)
2020-01-04 8:38 ` [PATCH v6 5/6] rockchip: Add Single boot image (with binman, pad_cat) Jagan Teki
2020-01-07 9:47 ` [PATCH v6 5/6] rockchip: Add Single boot image (with binman, pad_cat)【请注意，邮件由linux-rockchip-bounces+kever.yang=rock-chips.com@lists.infradead.org代发】 Kever Yang
@ 2020-01-10 9:39 ` Simon Glass
2020-01-10 9:42 ` Matwey V. Kornilov
2020-01-30 2:17 ` Simon Glass
2 siblings, 1 reply; 19+ messages in thread
From: Simon Glass @ 2020-01-10 9:39 UTC (permalink / raw)
To: u-boot
Hi Jagan,
On Sat, 4 Jan 2020 at 21:38, Jagan Teki <jagan@amarulasolutions.com> wrote:
>
> 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
How about adding the initial 64 blocks into the image too, so the seek
isn't needed?
> 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 | 14 ++++++++++++--
> 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 | 3 +++
> 6 files changed, 41 insertions(+), 2 deletions(-)
> create mode 100644 arch/arm/dts/rockchip-u-boot.dtsi
Regards,
Simon
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH v6 5/6] rockchip: Add Single boot image (with binman, pad_cat)
2020-01-10 9:39 ` [PATCH v6 5/6] rockchip: Add Single boot image (with binman, pad_cat) Simon Glass
@ 2020-01-10 9:42 ` Matwey V. Kornilov
0 siblings, 0 replies; 19+ messages in thread
From: Matwey V. Kornilov @ 2020-01-10 9:42 UTC (permalink / raw)
To: u-boot
пт, 10 янв. 2020 г. в 12:39, Simon Glass <sjg@chromium.org>:
>
> Hi Jagan,
>
> On Sat, 4 Jan 2020 at 21:38, Jagan Teki <jagan@amarulasolutions.com> wrote:
> >
> > 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
>
> How about adding the initial 64 blocks into the image too, so the seek
> isn't needed?
>
It will break partition tables on the target device.
> > 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 | 14 ++++++++++++--
> > 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 | 3 +++
> > 6 files changed, 41 insertions(+), 2 deletions(-)
> > create mode 100644 arch/arm/dts/rockchip-u-boot.dtsi
>
> Regards,
> Simon
--
With best regards,
Matwey V. Kornilov
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH v6 5/6] rockchip: Add Single boot image (with binman, pad_cat)
2020-01-04 8:38 ` [PATCH v6 5/6] rockchip: Add Single boot image (with binman, pad_cat) Jagan Teki
2020-01-07 9:47 ` [PATCH v6 5/6] rockchip: Add Single boot image (with binman, pad_cat)【请注意，邮件由linux-rockchip-bounces+kever.yang=rock-chips.com@lists.infradead.org代发】 Kever Yang
2020-01-10 9:39 ` [PATCH v6 5/6] rockchip: Add Single boot image (with binman, pad_cat) Simon Glass
@ 2020-01-30 2:17 ` Simon Glass
2 siblings, 0 replies; 19+ messages in thread
From: Simon Glass @ 2020-01-30 2:17 UTC (permalink / raw)
To: u-boot
On Sat, 4 Jan 2020 at 01:38, Jagan Teki <jagan@amarulasolutions.com> wrote:
>
> 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 | 14 ++++++++++++--
> 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 | 3 +++
> 6 files changed, 41 insertions(+), 2 deletions(-)
> create mode 100644 arch/arm/dts/rockchip-u-boot.dtsi
Reviewed-by: Simon Glass <sjg@chromium.org>
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH v6 6/6] doc: boards: Add rockchip documentation
2020-01-04 8:38 [PATCH v6 0/6] rockchip: Add Binman support Jagan Teki
` (4 preceding siblings ...)
2020-01-04 8:38 ` [PATCH v6 5/6] rockchip: Add Single boot image (with binman, pad_cat) Jagan Teki
@ 2020-01-04 8:38 ` Jagan Teki
2020-01-07 8:40 ` Kever Yang
2020-01-07 9:59 ` [PATCH v6 0/6] rockchip: Add Binman support Kever Yang
6 siblings, 1 reply; 19+ messages in thread
From: Jagan Teki @ 2020-01-04 8:38 UTC (permalink / raw)
To: u-boot
Rockchip has documentation file, doc/README.rockchip but
which is not so readable to add or understand the existing
contents. Even the format that support is legacy readme
in U-Boot.
Add rockchip specific documentation file using new rst
format, which describes the information about Rockchip
supported boards and it's usage steps.
Added minimal information about rk3288, rk3328, rk3368
and rk3399 boards and usage. This would indeed updated
further based on the requirements and updates.
Cc: Kever Yang <kever.yang@rock-chips.com>
Cc: Matwey V. Kornilov <matwey.kornilov@gmail.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
doc/board/rockchip/index.rst | 10 +++
doc/board/rockchip/rockchip.rst | 130 ++++++++++++++++++++++++++++++++
2 files changed, 140 insertions(+)
create mode 100644 doc/board/rockchip/index.rst
create mode 100644 doc/board/rockchip/rockchip.rst
diff --git a/doc/board/rockchip/index.rst b/doc/board/rockchip/index.rst
new file mode 100644
index 0000000000..0c377e9bbb
--- /dev/null
+++ b/doc/board/rockchip/index.rst
@@ -0,0 +1,10 @@
+.. SPDX-License-Identifier: GPL-2.0+
+.. Copyright (C) 2019 Jagan Teki <jagan@amarulasolutions.com>
+
+Rockchip
+========
+
+.. toctree::
+ :maxdepth: 2
+
+ rockchip
diff --git a/doc/board/rockchip/rockchip.rst b/doc/board/rockchip/rockchip.rst
new file mode 100644
index 0000000000..6c34f1ab99
--- /dev/null
+++ b/doc/board/rockchip/rockchip.rst
@@ -0,0 +1,130 @@
+.. SPDX-License-Identifier: GPL-2.0+
+.. Copyright (C) 2019 Jagan Teki <jagan@amarulasolutions.com>
+
+ROCKCHIP
+========
+
+About this
+----------
+
+This document describes the information about Rockchip supported boards
+and it's usage steps.
+
+Rockchip boards
+---------------
+
+Rockchip is SoC solutions provider for tablets & PCs, streaming media
+TV boxes, AI audio & vision, IoT hardware.
+
+A wide range of Rockchip SoCs with associated boardsare supported in
+mainline U-Boot.
+
+List of mainline supported rockchip boards:
+
+* rk3288
+ - Evb-RK3288
+ - Firefly-RK3288
+ - mqmaker MiQi
+ - Phytec RK3288 PCM-947
+ - PopMetal-RK3288
+ - Radxa Rock 2 Square
+ - Tinker-RK3288
+ - Google Jerry
+ - Google Mickey
+ - Google Minnie
+ - Google Speedy
+ - Amarula Vyasa-RK3288
+* rk3328
+ - Rockchip RK3328 EVB
+ - Pine64 Rock64
+* rk3368
+ - GeekBox
+ - PX5 EVB
+ - Rockchip sheep board
+ - Theobroma Systems RK3368-uQ7 SoM
+* rk3399
+ - 96boards RK3399 Ficus
+ - 96boards Rock960
+ - Firefly-RK3399 Board
+ - Firefly ROC-RK3399-PC Board
+ - FriendlyElec NanoPC-T4
+ - FriendlyElec NanoPi M4
+ - FriendlyARM NanoPi NEO4
+ - Google Bob
+ - Khadas Edge
+ - Khadas Edge-Captain
+ - Khadas Edge-V
+ - Orange Pi RK3399 Board
+ - Pine64 RockPro64
+ - Radxa ROCK Pi 4
+ - Rockchip RK3399 Evaluation Board
+ - Theobroma Systems RK3399-Q7 SoM
+
+Building
+--------
+
+TF-A
+^^^^
+
+TF-A would require to build for ARM64 Rockchip SoCs platforms.
+
+To build TF-A::
+
+ git clone https://github.com/ARM-software/arm-trusted-firmware.git
+ cd arm-trusted-firmware
+ make realclean
+ make CROSS_COMPILE=aarch64-linux-gnu- PLAT=rk3399
+
+Specify the PLAT= with desired rockchip platform to build TF-A for.
+
+U-Boot
+^^^^^^
+
+To build rk3328 boards::
+
+ export BL31=/path/to/arm-trusted-firmware/to/bl31.elf
+ make evb-rk3328_defconfig
+ make
+
+To build rk3288 boards::
+
+ make evb-rk3288_defconfig
+ make
+
+To build rk3368 boards::
+
+ export BL31=/path/to/arm-trusted-firmware/to/bl31.elf
+ make evb-px5_defconfig
+ make
+
+To build rk3399 boards::
+
+ export BL31=/path/to/arm-trusted-firmware/to/bl31.elf
+ make evb-rk3399_defconfig
+ make
+
+Flashing
+--------
+
+SD Card
+^^^^^^^
+
+All rockchip platforms, except rk3128 (which doesn't use SPL) are now
+supporting single boot image using binman and pad_cat.
+
+To write an image that boots from an SD card (assumed to be /dev/sda)::
+
+ sudo dd if=u-boot-rockchip.bin of=/dev/sda seek=64
+ sync
+
+TODO
+----
+
+- Add rockchip idbloader image building
+- Add rockchip TPL image building
+- Document SPI flash boot
+- Describe steps for eMMC flashing
+- Add missing SoC's with it boards list
+
+.. Jagan Teki <jagan@amarulasolutions.com>
+.. Sat Jan 4 14:00:54 IST 2020
--
2.18.0.321.gffc6fa0e3
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH v6 6/6] doc: boards: Add rockchip documentation
2020-01-04 8:38 ` [PATCH v6 6/6] doc: boards: Add rockchip documentation Jagan Teki
@ 2020-01-07 8:40 ` Kever Yang
0 siblings, 0 replies; 19+ messages in thread
From: Kever Yang @ 2020-01-07 8:40 UTC (permalink / raw)
To: u-boot
On 2020/1/4 下午4:38, Jagan Teki wrote:
> Rockchip has documentation file, doc/README.rockchip but
> which is not so readable to add or understand the existing
> contents. Even the format that support is legacy readme
> in U-Boot.
>
> Add rockchip specific documentation file using new rst
> format, which describes the information about Rockchip
> supported boards and it's usage steps.
>
> Added minimal information about rk3288, rk3328, rk3368
> and rk3399 boards and usage. This would indeed updated
> further based on the requirements and updates.
>
> 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>
Thanks,
- Kever
> ---
> doc/board/rockchip/index.rst | 10 +++
> doc/board/rockchip/rockchip.rst | 130 ++++++++++++++++++++++++++++++++
> 2 files changed, 140 insertions(+)
> create mode 100644 doc/board/rockchip/index.rst
> create mode 100644 doc/board/rockchip/rockchip.rst
>
> diff --git a/doc/board/rockchip/index.rst b/doc/board/rockchip/index.rst
> new file mode 100644
> index 0000000000..0c377e9bbb
> --- /dev/null
> +++ b/doc/board/rockchip/index.rst
> @@ -0,0 +1,10 @@
> +.. SPDX-License-Identifier: GPL-2.0+
> +.. Copyright (C) 2019 Jagan Teki <jagan@amarulasolutions.com>
> +
> +Rockchip
> +========
> +
> +.. toctree::
> + :maxdepth: 2
> +
> + rockchip
> diff --git a/doc/board/rockchip/rockchip.rst b/doc/board/rockchip/rockchip.rst
> new file mode 100644
> index 0000000000..6c34f1ab99
> --- /dev/null
> +++ b/doc/board/rockchip/rockchip.rst
> @@ -0,0 +1,130 @@
> +.. SPDX-License-Identifier: GPL-2.0+
> +.. Copyright (C) 2019 Jagan Teki <jagan@amarulasolutions.com>
> +
> +ROCKCHIP
> +========
> +
> +About this
> +----------
> +
> +This document describes the information about Rockchip supported boards
> +and it's usage steps.
> +
> +Rockchip boards
> +---------------
> +
> +Rockchip is SoC solutions provider for tablets & PCs, streaming media
> +TV boxes, AI audio & vision, IoT hardware.
> +
> +A wide range of Rockchip SoCs with associated boardsare supported in
> +mainline U-Boot.
> +
> +List of mainline supported rockchip boards:
> +
> +* rk3288
> + - Evb-RK3288
> + - Firefly-RK3288
> + - mqmaker MiQi
> + - Phytec RK3288 PCM-947
> + - PopMetal-RK3288
> + - Radxa Rock 2 Square
> + - Tinker-RK3288
> + - Google Jerry
> + - Google Mickey
> + - Google Minnie
> + - Google Speedy
> + - Amarula Vyasa-RK3288
> +* rk3328
> + - Rockchip RK3328 EVB
> + - Pine64 Rock64
> +* rk3368
> + - GeekBox
> + - PX5 EVB
> + - Rockchip sheep board
> + - Theobroma Systems RK3368-uQ7 SoM
> +* rk3399
> + - 96boards RK3399 Ficus
> + - 96boards Rock960
> + - Firefly-RK3399 Board
> + - Firefly ROC-RK3399-PC Board
> + - FriendlyElec NanoPC-T4
> + - FriendlyElec NanoPi M4
> + - FriendlyARM NanoPi NEO4
> + - Google Bob
> + - Khadas Edge
> + - Khadas Edge-Captain
> + - Khadas Edge-V
> + - Orange Pi RK3399 Board
> + - Pine64 RockPro64
> + - Radxa ROCK Pi 4
> + - Rockchip RK3399 Evaluation Board
> + - Theobroma Systems RK3399-Q7 SoM
> +
> +Building
> +--------
> +
> +TF-A
> +^^^^
> +
> +TF-A would require to build for ARM64 Rockchip SoCs platforms.
> +
> +To build TF-A::
> +
> + git clone https://github.com/ARM-software/arm-trusted-firmware.git
> + cd arm-trusted-firmware
> + make realclean
> + make CROSS_COMPILE=aarch64-linux-gnu- PLAT=rk3399
> +
> +Specify the PLAT= with desired rockchip platform to build TF-A for.
> +
> +U-Boot
> +^^^^^^
> +
> +To build rk3328 boards::
> +
> + export BL31=/path/to/arm-trusted-firmware/to/bl31.elf
> + make evb-rk3328_defconfig
> + make
> +
> +To build rk3288 boards::
> +
> + make evb-rk3288_defconfig
> + make
> +
> +To build rk3368 boards::
> +
> + export BL31=/path/to/arm-trusted-firmware/to/bl31.elf
> + make evb-px5_defconfig
> + make
> +
> +To build rk3399 boards::
> +
> + export BL31=/path/to/arm-trusted-firmware/to/bl31.elf
> + make evb-rk3399_defconfig
> + make
> +
> +Flashing
> +--------
> +
> +SD Card
> +^^^^^^^
> +
> +All rockchip platforms, except rk3128 (which doesn't use SPL) are now
> +supporting single boot image using binman and pad_cat.
> +
> +To write an image that boots from an SD card (assumed to be /dev/sda)::
> +
> + sudo dd if=u-boot-rockchip.bin of=/dev/sda seek=64
> + sync
> +
> +TODO
> +----
> +
> +- Add rockchip idbloader image building
> +- Add rockchip TPL image building
> +- Document SPI flash boot
> +- Describe steps for eMMC flashing
> +- Add missing SoC's with it boards list
> +
> +.. Jagan Teki <jagan@amarulasolutions.com>
> +.. Sat Jan 4 14:00:54 IST 2020
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH v6 0/6] rockchip: Add Binman support
2020-01-04 8:38 [PATCH v6 0/6] rockchip: Add Binman support Jagan Teki
` (5 preceding siblings ...)
2020-01-04 8:38 ` [PATCH v6 6/6] doc: boards: Add rockchip documentation Jagan Teki
@ 2020-01-07 9:59 ` Kever Yang
2020-01-08 11:34 ` Wadim Egorov
2020-01-10 9:39 ` Simon Glass
6 siblings, 2 replies; 19+ messages in thread
From: Kever Yang @ 2020-01-07 9:59 UTC (permalink / raw)
To: u-boot
Add Wadim in cc,
Hi Jagan,
After this patch set apply, the phycore-rk3288 board's SPL size is overflow:
arm: + phycore-rk3288
+Error: SPL image is too large (size 0x9000 than 0x8000)
+Error: Bad parameters for image type
Maybe we need to enable the TPL for this board? @Wadim
Thanks,
- Kever
On 2020/1/4 下午4:38, Jagan Teki wrote:
> This is v6 set for Binman support in rockchip, [1] here is
> previous patchset.
>
> This series add single boot image with binman for arm32 and
> pad_cat for arm64 rockchip platforms both TPL + SPL and SPL-alone
> targets.
>
> Changes for v6:
> - drop idbloader.img filename change patch
> - update rockchip.rst to include, rockchip TPL, SPI boot as TODO
> Changes for v5:
> - collect kever review tag
> - drop idbloader.img from clean target
> Changes for v4:
> - support all rockchip platforms
> - add new patches for dtsi changes
> - update documentation
> - format proper commit message
> - rebase on master
> Changes for v3:
> - rebase on master
> - add binman for rk3288, rk3328, rk3368, rk3399
> - added rst documentation for rockchip
> Changes for v2:
> - Add few clean target patches
> - update bl31.elf env handling code, with logging
> - support puma itb, via BL31 and PMUM0 env
> - enable BUILD_TARGET for ROCKCHIP_RK3399
>
> [1] https://patchwork.ozlabs.org/cover/1216263/
>
> Any inputs?
> Jagan.
>
> Jagan Teki (6):
> Makefile: Add rockchip image type
> Makefile: rockchip: Suffix platform type with tpl name
> Makefile: rockchip: Support SPL-alone mkimage
> arm: dts: rk3036: Add rk3036-u-boot.dtsi
> rockchip: Add Single boot image (with binman, pad_cat)
> doc: boards: Add rockchip documentation
>
> Makefile | 36 ++++++--
> arch/arm/Kconfig | 1 +
> arch/arm/dts/rk3036-sdk-u-boot.dtsi | 2 +
> arch/arm/dts/rk3036-u-boot.dtsi | 6 ++
> arch/arm/dts/rk3288-u-boot.dtsi | 2 +
> arch/arm/dts/rockchip-u-boot.dtsi | 21 +++++
> doc/board/rockchip/index.rst | 10 +++
> doc/board/rockchip/rockchip.rst | 130 ++++++++++++++++++++++++++++
> include/configs/rockchip-common.h | 3 +
> 9 files changed, 206 insertions(+), 5 deletions(-)
> create mode 100644 arch/arm/dts/rk3036-u-boot.dtsi
> create mode 100644 arch/arm/dts/rockchip-u-boot.dtsi
> create mode 100644 doc/board/rockchip/index.rst
> create mode 100644 doc/board/rockchip/rockchip.rst
>
^ permalink raw reply [flat|nested] 19+ messages in thread* [PATCH v6 0/6] rockchip: Add Binman support
2020-01-07 9:59 ` [PATCH v6 0/6] rockchip: Add Binman support Kever Yang
@ 2020-01-08 11:34 ` Wadim Egorov
2020-01-08 11:55 ` Jagan Teki
2020-01-09 13:59 ` Jagan Teki
2020-01-10 9:39 ` Simon Glass
1 sibling, 2 replies; 19+ messages in thread
From: Wadim Egorov @ 2020-01-08 11:34 UTC (permalink / raw)
To: u-boot
Hi,
On 07.01.20 10:59, Kever Yang wrote:
> Add Wadim in cc,
>
> Hi Jagan,
>
> After this patch set apply, the phycore-rk3288 board's SPL size is
> overflow:
>
> arm: + phycore-rk3288
> +Error: SPL image is too large (size 0x9000 than 0x8000)
> +Error: Bad parameters for image type
>
> Maybe we need to enable the TPL for this board? @Wadim
I would like it to keep the SPL for the phyCORE board. In this thread
[1] I pointed out that you can drop the phycore_init() function that was
sometimes blowing up the size of the phyCORE SPL image. So if there is
no new other feature that increases the SPL size, we can just remove the
code and the SPL should fit again. If you like I can take a look at this
next week.
[1] https://lists.denx.de/pipermail/u-boot/2019-July/378112.html
Regards,
Wadim
>
>
> Thanks,
>
> - Kever
>
> On 2020/1/4 下午4:38, Jagan Teki wrote:
>> This is v6 set for Binman support in rockchip, [1] here is
>> previous patchset.
>>
>> This series add single boot image with binman for arm32 and
>> pad_cat for arm64 rockchip platforms both TPL + SPL and SPL-alone
>> targets.
>>
>> Changes for v6:
>> - drop idbloader.img filename change patch
>> - update rockchip.rst to include, rockchip TPL, SPI boot as TODO
>> Changes for v5:
>> - collect kever review tag
>> - drop idbloader.img from clean target
>> Changes for v4:
>> - support all rockchip platforms
>> - add new patches for dtsi changes
>> - update documentation
>> - format proper commit message
>> - rebase on master
>> Changes for v3:
>> - rebase on master
>> - add binman for rk3288, rk3328, rk3368, rk3399
>> - added rst documentation for rockchip
>> Changes for v2:
>> - Add few clean target patches
>> - update bl31.elf env handling code, with logging
>> - support puma itb, via BL31 and PMUM0 env
>> - enable BUILD_TARGET for ROCKCHIP_RK3399
>>
>> [1] https://patchwork.ozlabs.org/cover/1216263/
>>
>> Any inputs?
>> Jagan.
>>
>> Jagan Teki (6):
>> Makefile: Add rockchip image type
>> Makefile: rockchip: Suffix platform type with tpl name
>> Makefile: rockchip: Support SPL-alone mkimage
>> arm: dts: rk3036: Add rk3036-u-boot.dtsi
>> rockchip: Add Single boot image (with binman, pad_cat)
>> doc: boards: Add rockchip documentation
>>
>> Makefile | 36 ++++++--
>> arch/arm/Kconfig | 1 +
>> arch/arm/dts/rk3036-sdk-u-boot.dtsi | 2 +
>> arch/arm/dts/rk3036-u-boot.dtsi | 6 ++
>> arch/arm/dts/rk3288-u-boot.dtsi | 2 +
>> arch/arm/dts/rockchip-u-boot.dtsi | 21 +++++
>> doc/board/rockchip/index.rst | 10 +++
>> doc/board/rockchip/rockchip.rst | 130 ++++++++++++++++++++++++++++
>> include/configs/rockchip-common.h | 3 +
>> 9 files changed, 206 insertions(+), 5 deletions(-)
>> create mode 100644 arch/arm/dts/rk3036-u-boot.dtsi
>> create mode 100644 arch/arm/dts/rockchip-u-boot.dtsi
>> create mode 100644 doc/board/rockchip/index.rst
>> create mode 100644 doc/board/rockchip/rockchip.rst
>>
>
>
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH v6 0/6] rockchip: Add Binman support
2020-01-08 11:34 ` Wadim Egorov
@ 2020-01-08 11:55 ` Jagan Teki
2020-01-09 13:59 ` Jagan Teki
1 sibling, 0 replies; 19+ messages in thread
From: Jagan Teki @ 2020-01-08 11:55 UTC (permalink / raw)
To: u-boot
On Wed, Jan 8, 2020 at 5:04 PM Wadim Egorov <w.egorov@phytec.de> wrote:
>
> Hi,
>
> On 07.01.20 10:59, Kever Yang wrote:
> > Add Wadim in cc,
> >
> > Hi Jagan,
> >
> > After this patch set apply, the phycore-rk3288 board's SPL size is
> > overflow:
> >
> > arm: + phycore-rk3288
> > +Error: SPL image is too large (size 0x9000 than 0x8000)
> > +Error: Bad parameters for image type
> >
> > Maybe we need to enable the TPL for this board? @Wadim
>
> I would like it to keep the SPL for the phyCORE board. In this thread
> [1] I pointed out that you can drop the phycore_init() function that was
> sometimes blowing up the size of the phyCORE SPL image. So if there is
> no new other feature that increases the SPL size, we can just remove the
> code and the SPL should fit again. If you like I can take a look at this
> next week.
If not, maybe we can disable BINMAN for this board? I'm sure it can
revert since there would be a need to move TPL in future.
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH v6 0/6] rockchip: Add Binman support
2020-01-08 11:34 ` Wadim Egorov
2020-01-08 11:55 ` Jagan Teki
@ 2020-01-09 13:59 ` Jagan Teki
2020-01-09 15:28 ` Wadim Egorov
1 sibling, 1 reply; 19+ messages in thread
From: Jagan Teki @ 2020-01-09 13:59 UTC (permalink / raw)
To: u-boot
On Wed, Jan 8, 2020 at 5:04 PM Wadim Egorov <w.egorov@phytec.de> wrote:
>
> Hi,
>
> On 07.01.20 10:59, Kever Yang wrote:
> > Add Wadim in cc,
> >
> > Hi Jagan,
> >
> > After this patch set apply, the phycore-rk3288 board's SPL size is
> > overflow:
> >
> > arm: + phycore-rk3288
> > +Error: SPL image is too large (size 0x9000 than 0x8000)
> > +Error: Bad parameters for image type
> >
> > Maybe we need to enable the TPL for this board? @Wadim
>
> I would like it to keep the SPL for the phyCORE board. In this thread
> [1] I pointed out that you can drop the phycore_init() function that was
> sometimes blowing up the size of the phyCORE SPL image. So if there is
> no new other feature that increases the SPL size, we can just remove the
> code and the SPL should fit again. If you like I can take a look at this
> next week.
This won't help much, but one possibility is to use SPL_OF_PLATDATA
(I've verified). Can you help us to try as quickly as possible? or do
you want us to try?
Jagan.
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH v6 0/6] rockchip: Add Binman support
2020-01-09 13:59 ` Jagan Teki
@ 2020-01-09 15:28 ` Wadim Egorov
2020-01-09 18:47 ` Jagan Teki
0 siblings, 1 reply; 19+ messages in thread
From: Wadim Egorov @ 2020-01-09 15:28 UTC (permalink / raw)
To: u-boot
Hi Jagan,
On 09.01.20 14:59, Jagan Teki wrote:
> On Wed, Jan 8, 2020 at 5:04 PM Wadim Egorov <w.egorov@phytec.de> wrote:
>> Hi,
>>
>> On 07.01.20 10:59, Kever Yang wrote:
>>> Add Wadim in cc,
>>>
>>> Hi Jagan,
>>>
>>> After this patch set apply, the phycore-rk3288 board's SPL size is
>>> overflow:
>>>
>>> arm: + phycore-rk3288
>>> +Error: SPL image is too large (size 0x9000 than 0x8000)
>>> +Error: Bad parameters for image type
>>>
>>> Maybe we need to enable the TPL for this board? @Wadim
>> I would like it to keep the SPL for the phyCORE board. In this thread
>> [1] I pointed out that you can drop the phycore_init() function that was
>> sometimes blowing up the size of the phyCORE SPL image. So if there is
>> no new other feature that increases the SPL size, we can just remove the
>> code and the SPL should fit again. If you like I can take a look at this
>> next week.
> This won't help much, but one possibility is to use SPL_OF_PLATDATA
> (I've verified). Can you help us to try as quickly as possible? or do
> you want us to try?
Or we can simply disable CONFIG_SPL_I2C_SUPPORT and
CONFIG_SPL_POWER_SUPPORT in the phycore-rk3288_defconfig.
What do you want me to do now? Testing your patches with
SPL_OF_PLATDATA=y on our board? If so, I can help you next week with
testing.
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH v6 0/6] rockchip: Add Binman support
2020-01-09 15:28 ` Wadim Egorov
@ 2020-01-09 18:47 ` Jagan Teki
0 siblings, 0 replies; 19+ messages in thread
From: Jagan Teki @ 2020-01-09 18:47 UTC (permalink / raw)
To: u-boot
On Thu, Jan 9, 2020 at 8:58 PM Wadim Egorov <w.egorov@phytec.de> wrote:
>
> Hi Jagan,
>
> On 09.01.20 14:59, Jagan Teki wrote:
> > On Wed, Jan 8, 2020 at 5:04 PM Wadim Egorov <w.egorov@phytec.de> wrote:
> >> Hi,
> >>
> >> On 07.01.20 10:59, Kever Yang wrote:
> >>> Add Wadim in cc,
> >>>
> >>> Hi Jagan,
> >>>
> >>> After this patch set apply, the phycore-rk3288 board's SPL size is
> >>> overflow:
> >>>
> >>> arm: + phycore-rk3288
> >>> +Error: SPL image is too large (size 0x9000 than 0x8000)
> >>> +Error: Bad parameters for image type
> >>>
> >>> Maybe we need to enable the TPL for this board? @Wadim
> >> I would like it to keep the SPL for the phyCORE board. In this thread
> >> [1] I pointed out that you can drop the phycore_init() function that was
> >> sometimes blowing up the size of the phyCORE SPL image. So if there is
> >> no new other feature that increases the SPL size, we can just remove the
> >> code and the SPL should fit again. If you like I can take a look at this
> >> next week.
> > This won't help much, but one possibility is to use SPL_OF_PLATDATA
> > (I've verified). Can you help us to try as quickly as possible? or do
> > you want us to try?
>
> Or we can simply disable CONFIG_SPL_I2C_SUPPORT and
> CONFIG_SPL_POWER_SUPPORT in the phycore-rk3288_defconfig.
This seems fixed, sent the patches please test the same, thanks!
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH v6 0/6] rockchip: Add Binman support
2020-01-07 9:59 ` [PATCH v6 0/6] rockchip: Add Binman support Kever Yang
2020-01-08 11:34 ` Wadim Egorov
@ 2020-01-10 9:39 ` Simon Glass
1 sibling, 0 replies; 19+ messages in thread
From: Simon Glass @ 2020-01-10 9:39 UTC (permalink / raw)
To: u-boot
Hi,
On Tue, 7 Jan 2020 at 22:59, Kever Yang <kever.yang@rock-chips.com> wrote:
>
> Add Wadim in cc,
>
> Hi Jagan,
>
> After this patch set apply, the phycore-rk3288 board's SPL size is overflow:
>
> arm: + phycore-rk3288
> +Error: SPL image is too large (size 0x9000 than 0x8000)
> +Error: Bad parameters for image type
>
> Maybe we need to enable the TPL for this board? @Wadim
We should look at why it is too large. Enabling BINMAN should not
increase the code size of SPL, so perhaps there is a bug?
Regards,
Simon
^ permalink raw reply [flat|nested] 19+ messages in thread