| Message ID | 20191230082819.30191-7-jagan@amarulasolutions.com |
|---|---|
| State | New |
| Headers | show |
| Series |
|
| Related | show |
пн, 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? > + > #ifndef CONFIG_SPL_BUILD > > /* First try to boot from SD (index 0), then eMMC (index 1) */ > -- > 2.18.0.321.gffc6fa0e3 >
вт, 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) > > > + > > #ifndef CONFIG_SPL_BUILD > > > > /* First try to boot from SD (index 0), then eMMC (index 1) */ > > -- > > 2.18.0.321.gffc6fa0e3 > > > > > -- > With best regards, > Matwey V. Kornilov
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)
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 + #ifndef CONFIG_SPL_BUILD /* First try to boot from SD (index 0), then eMMC (index 1) */