| Message ID | 20191023195652.7158-2-jagan@amarulasolutions.com |
|---|---|
| State | New |
| Headers | show |
| Series |
|
| Related | show |
On 2019/10/24 上午3:56, Jagan Teki wrote: > 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> Thanks, - Kever > --- > Makefile | 10 +++++++++- > 1 file changed, 9 insertions(+), 1 deletion(-) > > diff --git a/Makefile b/Makefile > index 6fda3268e7..3e05d3fcfe 100644 > --- a/Makefile > +++ b/Makefile > @@ -1334,7 +1334,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
diff --git a/Makefile b/Makefile index 6fda3268e7..3e05d3fcfe 100644 --- a/Makefile +++ b/Makefile @@ -1334,7 +1334,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
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> --- Makefile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)