public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Andrew Abbott <andrew@mirx.dev>
To: u-boot@lists.denx.de
Cc: Andrew Abbott <andrew@mirx.dev>, Simon Glass <sjg@chromium.org>,
	Philipp Tomsich <philipp.tomsich@vrull.eu>,
	Kever Yang <kever.yang@rock-chips.com>,
	Peter Robinson <pbrobinson@gmail.com>,
	Akash Gajjar <akash@openedev.com>,
	Jagan Teki <jagan@amarulasolutions.com>,
	Samuel Dionne-Riel <samuel@dionne-riel.com>
Subject: [RFC PATCH 5/8] rockchip: Remove obsolete Makefile targets
Date: Mon, 25 Apr 2022 10:03:26 +1000	[thread overview]
Message-ID: <20220425000329.28124-6-andrew@mirx.dev> (raw)
In-Reply-To: <20220425000329.28124-1-andrew@mirx.dev>

These are obsoleted by a previous patch which added binman image
definitions for Rockchip SD/MMC and SPI images.

Signed-off-by: Andrew Abbott <andrew@mirx.dev>
---
 Makefile | 31 +++----------------------------
 1 file changed, 3 insertions(+), 28 deletions(-)

diff --git a/Makefile b/Makefile
index 7937a4cfd3..cf6ec63c34 100644
--- a/Makefile
+++ b/Makefile
@@ -984,16 +984,15 @@ 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_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)
-# Generate these inputs for binman which will create the output files
-INPUTS-y += idbloader.img u-boot.img
+# Generate this input for binman which will create the output files
+INPUTS-y += u-boot.img
 endif
 endif
 endif
@@ -1481,30 +1480,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)
 
-- 
2.35.3


  parent reply	other threads:[~2022-04-25  0:05 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-25  0:03 [RFC PATCH 0/8] Build Rockchip final images using binman Andrew Abbott
2022-04-25  0:03 ` [RFC PATCH 1/8] binman: mkimage: Support ':'-separated inputs Andrew Abbott
2022-04-25  0:03 ` [RFC PATCH 2/8] rockchip: Add binman definitions for final images Andrew Abbott
2022-04-27  9:22   ` Johan Jonker
2022-05-04  9:52     ` Andrew Abbott
2022-05-19 11:35     ` Alper Nebi Yasak
2022-04-25  0:03 ` [RFC PATCH 3/8] soc: rockchip: Include common U-Boot dtsi file Andrew Abbott
2022-04-25  0:03 ` [RFC PATCH 4/8] board: rockchip: Move SPI U-Boot offset to config Andrew Abbott
2022-04-25  0:03 ` Andrew Abbott [this message]
2022-04-25  0:03 ` [RFC PATCH 6/8] rockchip: Enable binman for ARM64 Andrew Abbott
2022-04-25  0:03 ` [RFC PATCH 7/8] doc: rockchip: Update for new binman image generation Andrew Abbott
2022-04-25  0:03 ` [RFC PATCH 8/8] board: rockpro64: Enable building SPI image Andrew Abbott

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=20220425000329.28124-6-andrew@mirx.dev \
    --to=andrew@mirx.dev \
    --cc=akash@openedev.com \
    --cc=jagan@amarulasolutions.com \
    --cc=kever.yang@rock-chips.com \
    --cc=pbrobinson@gmail.com \
    --cc=philipp.tomsich@vrull.eu \
    --cc=samuel@dionne-riel.com \
    --cc=sjg@chromium.org \
    --cc=u-boot@lists.denx.de \
    /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