From patchwork Mon Dec 30 08:28:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 965 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pg1-f198.google.com (mail-pg1-f198.google.com [209.85.215.198]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 0160E3F076 for ; Mon, 30 Dec 2019 09:28:34 +0100 (CET) Received: by mail-pg1-f198.google.com with SMTP id i8sf22520694pgs.3 for ; Mon, 30 Dec 2019 00:28:33 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1577694512; cv=pass; d=google.com; s=arc-20160816; b=fzVvpx70lArZLXXcI/z1vvHwF7fDS0U2UvNriIxG8c8C7YUwicPJju4PkqDNk0sAgb fyfiOAvTfo6YU0fywHhQZRMce6gWnuDBuc8uEAzBCh4YGRyJm73js10tcS7I4LzzqVje 8zd30CVdybW9L6t8V4dMeD1lk4DPAeWftmVTamx1DsD+U26lGs8uMaKjb0/e2cRKIkD7 +ONIr3sAHu2MYSONtH/VKDxTZPNWTefn8ojzH4a0Y1OT0tAa2vz8SAPmGL4OVPVeMAjk 0cHM6U6DUHKc7x8s5ECKOAp/2+wsESIA5xzlEfVJxQXv8ERw65GTDnxwPD8NhNCdjHnE KWQg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=f43Lag/RiNcEXyHoRh1IMB+vskdNufSNGx27XV3qABs=; b=gHSMM9ySOxycVUcsEVNEJQeMZZRMZnOmBmLuBfQCeplqYCQyFV8xc2RYk0USD0uqRp cWCNGrE9T1Si//eYBq4ybVkwP/wUaCzSCZ4zLgwn+0jNCmeJ33wiAAkT4+sTjJLeyZKn ulrmlD9JIviLGJpmLXKGHNj/4jSsuRvtnc06Kx6LmmXc9F1v9B2iFvYBqNG886kF4TCI ircW/Ols+LfaHeBOqcO77eJgHuVAABLqxmIWdGScmWHRsfBY1+qyyD6ZHGQktsehMx+A ZeSAdN348gX+7V7nT+pUVHJAc+3eE7NUchw2jJIL4NRty/O66wXSzAs4nPVHx4vBsHFX a7gA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=pZVHLKmh; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=f43Lag/RiNcEXyHoRh1IMB+vskdNufSNGx27XV3qABs=; b=mQIe3clU8v2l7oIhMGUconGdSPgg8utk/r+ndFaUDxH1KzDhzTI5G3/mbmhhtABTeN NWA5wQZFtLqOI6eoD9jIl5tCJR53LlxpmVUzV9lc2UHXifvzJZUcDswyx25phxlVJBAu Qw15SNb82hMBuaJPJsqK0B9H3P6bNSR2HKHu0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=f43Lag/RiNcEXyHoRh1IMB+vskdNufSNGx27XV3qABs=; b=W5RTUIFJV2UYwV90qODFtR9I9BNWEJ0pTSN3DSbuo/RkJ0ZdVXdxtjmLBYfjfXvVTW LboiXoSAs5ftcsUruP3AHLT/8QrzRDa9o3OVm008zgJqOl4gBQpwSW1fFxDE12B3c6hA dqYAPMt7DDsZBhSIgRF/LYi88Y1i36Av0DnZmjBXcFKBfCDBvNMNVfhjyxvxtChBWdCE +ey8uSEbuvVvh6yOeyFqSSZPRFI0a0A6yLLpAk8aLIHTbYfTYu+il6J0xtTdRKy/Qn2U YGhdLQr9ZpyjwJyd+hQj7p5UUPBrnFuDtkJ6Av5J3mjBV13AzxG51um6LFJe9BeG4Rws d6mw== X-Gm-Message-State: APjAAAW5ix1I0aeOj47N2UICzfDvNz/EE4AMEKN76W7BLjB8HlyLP8qp C4ZX2sc0Bz2XJwQyHYmNrMyWUDaR X-Google-Smtp-Source: APXvYqw6kZR8/jdLTLY6qUqNiERzJy8AF49niSu8eFTJSvttQMkG+SEIfPtoF0DE4fsSDHKC0Xqkwg== X-Received: by 2002:a17:902:59c9:: with SMTP id d9mr66066184plj.184.1577694512288; Mon, 30 Dec 2019 00:28:32 -0800 (PST) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:902:ac97:: with SMTP id h23ls9139545plr.14.gmail; Mon, 30 Dec 2019 00:28:32 -0800 (PST) X-Received: by 2002:a17:902:9a8d:: with SMTP id w13mr46581228plp.40.1577694511768; Mon, 30 Dec 2019 00:28:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577694511; cv=none; d=google.com; s=arc-20160816; b=fTc2qFE2ef9lGMzpu0cTOX2OFGaSvW53bzOUpFQrdsASDXUIwlPQMlzOxuCHbxS7LL CEt/miVjamojc6xDEbdtWXBArDk5bvwS0BsoEngmarfvsX38j4LiNSptI7Ilu08tQbbk 1ojUi6LWys1Vnm/fpFwj0y+iSR+sMTo/7A0vtrIj6YtHbdKG4DpR3NhdjVwk96IYMBsf T8l8sLOl2jBAChM7MC67n5q7GPcRIsdSvDXmnv7oaDzJ/SdJQ8uwPNyMUwUgfCZHS25x 1OLz+hsLA34E1mme8a0z9X6OMfg7+XuKKrpqjXPyIHGrnQZdWBgbIpQ5omxHCGOLCYPy kQxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=uFc+KeHVvPb55BWADcWbagsPR+XJZj6DCQVbpAY2/9o=; b=zpyWcK87ayx1778GJ//KarpyrAFE9cUHlvuNwIJizVjhMke0xuJA+C4gkacbU5d677 ImoW7eg1XtO7AvKuCtpEbKRfQOYsVzNF78mmDV1lfb4L5ZgJ+gbuzIoldAfMBW6WM2Tw 8nZUJT69X4JQ9hC57hyKoKSSn6DNKQxnhDBfYCOwReNvIX2Rmmu0vDX1B9hwl5PwoErg gGWkXVqHWOwGmJmFuJQ2ATzBPyCJMoPVap02TZ8s2fvyTxYWfo7DA82Iw8JCqV8TyMQK X8ERlFGxZww1UNS6tsMGEjLUfiWU0dbytUcUADxP8Pg7gCRsoFAXi+u0PTpgOwhYcAzm ppYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=pZVHLKmh; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id e5sor22896604pjg.10.2019.12.30.00.28.31 for (Google Transport Security); Mon, 30 Dec 2019 00:28:31 -0800 (PST) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:a17:90a:3763:: with SMTP id u90mr45074959pjb.107.1577694511520; Mon, 30 Dec 2019 00:28:31 -0800 (PST) Received: from localhost.localdomain ([49.206.202.131]) by smtp.gmail.com with ESMTPSA id s1sm46240652pgv.87.2019.12.30.00.28.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Dec 2019 00:28:30 -0800 (PST) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Cc: Akash Gajjar , u-boot@lists.denx.de, linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, Jagan Teki , "Matwey V . Kornilov" Subject: [PATCH v5 1/7] Makefile: Add rockchip image type Date: Mon, 30 Dec 2019 13:58:13 +0530 Message-Id: <20191230082819.30191-2-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20191230082819.30191-1-jagan@amarulasolutions.com> References: <20191230082819.30191-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=pZVHLKmh; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 Cc: Matwey V. Kornilov Signed-off-by: Jagan Teki Reviewed-by: Kever Yang --- 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 From patchwork Mon Dec 30 08:28:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 966 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id E22CE3F076 for ; Mon, 30 Dec 2019 09:28:36 +0100 (CET) Received: by mail-pj1-f71.google.com with SMTP id 14sf13017787pjo.3 for ; Mon, 30 Dec 2019 00:28:36 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1577694515; cv=pass; d=google.com; s=arc-20160816; b=nAEaJaKwt1bwtu7ONZLUtC3nWnvgtRMvimhhzJ9LlI6c5VdraGgnsV2CGJjQsOE6Pt bLkqj2YFmX0qIcL6iiHW+FvH4dAbsDutVGsnhkq0/bXQ25ghHr7A4uHVDmleGJyxTuvw dQQRf2soFV2Fklv290HE8nb65fsb4v62Db3b0WCBmwT0mrfeDq2KbgcnFzU64l9KSfVu guFshfJJgfLJh7CZsM+5rDvSsVuqOmoLlV6vpibg9XB103iFVv5NWn2g8bDM9wK9LqtA M6vA+LrnXiHR4ZAnZy7/3B1XJyy540jToWEP0E7pcTrxv56hRapycnzF2pLH9OBn02n9 886g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=2mvOWhg5lxne4mNYl3tdSlnPSrKJSpr4ZpeRe5mCA7I=; b=mW5f2DAqwdVBGC/OV1BRfME7TcPMYzL6WoPLqNOQzwDznOFq13mQwXpRXl+LW7UMRP dSSZkL36im+2Hgu5/7BLPhhmjyWxJozv/JpK9FHEY7neAS/slP/nvD4ezntSRPRA8G+n RW8GGD6MWtDeorE5iqj3/dBdC5WOUd8bNLu9xAXOZ3fh1pq3KipMbwrsBTfALyxyLPD1 ovc9bs/zS4yW/dmiefPuiy4N7gBFPDj+OC0OtVVmboNnY+63QGnpTW7TQ3wQM/y8iFWV o/jjwfQ662Gex3HF9wzVSEPDUghAY6OyMz/ncC0LzGGi5LFMIp8LNtLeDSfX5hXYjk60 1uGA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=MlZE2DM0; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=2mvOWhg5lxne4mNYl3tdSlnPSrKJSpr4ZpeRe5mCA7I=; b=g366ZHZXvX1ownw8JbZBl2ySVPHy1jurq+4HSIMxDIHyKDuJ0BUws7exWV0Q04gjxM aL82wWKNxPsknjJnmo2OU08X1wXFGlJED283sSLg0xqXJhe3aaDQNxXTGPEtYzpbO7eg kvyJj1NNRDtN8xVj8SsemtjYAMUxYYj0hMalk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=2mvOWhg5lxne4mNYl3tdSlnPSrKJSpr4ZpeRe5mCA7I=; b=Qoq9+FHot7LTM1TZJtxY7jnEoei7z+EFIRBG5f3mzJaiiVf8xl868YC5TJpGC6BWeu cE8i8qA0o1/nBBWj1klaDDQoB5C3lGAQiFhOlO7VjeDyB9Dcje2bZU/K4A8nNgYaNcZF pCi47LEieIh2kL0pb/H4oTIFXeU8stP5vWILbinz+f09267Eh/1vkmoP4vUJLEkfWqTD Si+5u7jjCcG/vDB6JPIdg2bhMb/gisQfNRbNoTrkiZCUkKb997ZPww5h4Vd80rRQJwkw CjFzJeW9ghuJRSNVHc8GcSSg/Dc8OHKN67943yxaMNOeT0hQksS3BzVaiyoYO3J1oKhg dnhw== X-Gm-Message-State: APjAAAXMc6Rj8mtfGiA4WVZLJZSqfNXIQ/q0WWitlmmXUz3CpUvnCRfG YXALTw9mt9IxswJOs5Hx/JOv8RMH X-Google-Smtp-Source: APXvYqzWE6MkSWc1LpnUVKYaMId0VzJ8SQLPvLRzGCbzkPeVYbetwntuNBcL1A5wqPIc2AYHdjhNAw== X-Received: by 2002:a17:90a:22e7:: with SMTP id s94mr45999487pjc.12.1577694515342; Mon, 30 Dec 2019 00:28:35 -0800 (PST) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:902:9f95:: with SMTP id g21ls5898905plq.5.gmail; Mon, 30 Dec 2019 00:28:35 -0800 (PST) X-Received: by 2002:a17:902:6b8c:: with SMTP id p12mr52123374plk.290.1577694514820; Mon, 30 Dec 2019 00:28:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577694514; cv=none; d=google.com; s=arc-20160816; b=tVdsk+q5KpHwTNMs8Rds3DJIUvFBOfnepnpa9VNtx6w2nx0Z93Di1DkZ/p04hz9YcC m5UqFvW6eL/EgyEBUomUxlPM7NrsMtm8Q/C8h4MP+NLbe8fvSDVVo7rx+7qABj2KqSsi Qk1M+XPr4Lgt2Bt4B7+m05fTi1Hdo7MGb/EJUR7u85fyW+DE2s+pMfU/mbxM2plO9ClO /PY2N6iyUfip4Ek+u7O4A8PsRK7oWdNJ0vik2jQAupRVnsq7gOYFaJvDSqOkkih/ofQO M3cBKb0Ywa2bG8iv/Jav0tgVhWmKBhDYx6h+T2N+dL/N+1+ffkh2xO/9RiMZHBWGUEJJ w2PA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=MdVD38WP8mrB9cxL9ngtMTtlvhd/lrRFS5qqLyy/3UM=; b=ePgUSVXQfXA5nE9BNWkw3VTSnheQ4bRR2qV3iphTjCsFuMd2fFO7Bv3ObIJDyyTDpv jgC5q7vfS+PTrS5EYwd5X1+E+4P67YJcoM6IGIoxiqh1pXGOeUMzP6DfdUM2g839CYFf NQxkPzbsWu1zzLFCO1sOAFfw3ar2IonN2c1/jj1STxXl6s4k0m5X7tx56nqfLYRlsBmy OxpveMVfhXCXJi2QU4xWb3uDCl3kjmqiFjbn2emp7BrRrWoZFimFTVuhHXw8xunMlmET 3p4CzzsQ+ITuKGfyTxxCTb88FA6ZRjSLT2xXPUeR8QVmO/YziLlQl2Bfv+YI9i5RsrG5 IO1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=MlZE2DM0; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id t39sor23592900pjb.6.2019.12.30.00.28.34 for (Google Transport Security); Mon, 30 Dec 2019 00:28:34 -0800 (PST) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:a17:90a:8a98:: with SMTP id x24mr46130229pjn.113.1577694514556; Mon, 30 Dec 2019 00:28:34 -0800 (PST) Received: from localhost.localdomain ([49.206.202.131]) by smtp.gmail.com with ESMTPSA id s1sm46240652pgv.87.2019.12.30.00.28.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Dec 2019 00:28:33 -0800 (PST) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Cc: Akash Gajjar , u-boot@lists.denx.de, linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, Jagan Teki Subject: [PATCH v5 2/7] Makefile: rockchip: Suffix platform type with tpl name Date: Mon, 30 Dec 2019 13:58:14 +0530 Message-Id: <20191230082819.30191-3-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20191230082819.30191-1-jagan@amarulasolutions.com> References: <20191230082819.30191-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=MlZE2DM0; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 Reviewed-by: Kever Yang --- 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 From patchwork Mon Dec 30 08:28:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 967 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 54B083F076 for ; Mon, 30 Dec 2019 09:28:39 +0100 (CET) Received: by mail-pf1-f200.google.com with SMTP id p126sf18465142pfb.9 for ; Mon, 30 Dec 2019 00:28:39 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1577694518; cv=pass; d=google.com; s=arc-20160816; b=JRdwQCgNVk53CknLo6+LdISbCMBm+2tVzRWXGwxOICb9wUnUvdcy1h2LCqOaKrjLPS xDj1hiF2hpDF2NPa1gCZxUMUpJoymrqXCvgG2sc0O9ldEo9OMXVZY6WYauTqQwRKlT1B l/1ohrUR/uxSuipOJLOaY4wSuK+xJynr7VCAS/AcfXaZjPndyOs+NsldD8qdwe9IrJop FNk56FC+MF78LSgcDm0M1b1NajBTuBdNHAnfuKQAu7gLmvzUBj60rMhHaSa4v52fwDKv S5UOj/vElx8sGDmTqgtSuAl0wOD8h6VxteZPjl+itudAVAo8b8dTELa+4k9jjf4nh1un YQOg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=fboZPpyeSckHukf6E8iZq/ccZEILpWoAt4BR+OpAyKY=; b=tiqwN7fKPgGGhiRYA5zHVucN6Dx92c47gzcm0T1hobY2P3K9yPrFoj2qTbwkh+3PJZ A7ujj/M6gQ66qAjWpJu/QTdJwlyqbSRqe8qEcKOGIoKju6JbZDAnaNVZX24dJSsnI+Qp XAwwXRrcO5jxuqmhGANtRlkgjN/0FXR49dHhw1cIj/gvd7niI4Uk5YGIJEqqi1Qgl/A2 NjKGGyPK62n4YG9JvYTGP0t74+Xkd9Awdq7ETORPOIh6o2eSzD/c9yTu608oW7yYoVlH Ksz/Dq61IvPrzyLs+IH0iaKgSAtTCFJaw9NxbBp/Ultzd2rATKPDbagC1geIT0xviyn2 zipw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=izcUzUke; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=fboZPpyeSckHukf6E8iZq/ccZEILpWoAt4BR+OpAyKY=; b=K/TjfDsrYObRp9WquQu+mcHdtmc76Ffx1Tb4NHok2/Iv5ZNVy1N4SLUW7VUn49oki8 RxTY/8O+D4U1wvm5J/7+Fmy6mHRAM7aBN8JuaXihqvaFb4cIKGQCk9G+zwjq1cT/L5D0 rcR4Cnz6tRRFwDjpDzX3GAFxBzMz+pTgppQ1s= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=fboZPpyeSckHukf6E8iZq/ccZEILpWoAt4BR+OpAyKY=; b=lbieuKfwDVYvmsx3JPMdtSo4Zk15oi0t7BoFUuGi08MEtAqCkeNnBus34bHT6N4Edn JoSMtoHNX1ApZJ0KUfI7RRJyRmwgelH4X9NdtDKpqlo0qMAJOuHaSUnYgV36LgdU9wC7 VckwkB2BjVc3X8TaY7+jLR7rk8eeK/A9NZbBiSMN1J1A37d353FoFIGyeaXJwLTi+zWo vmioBypiRjsf2eu4CKImSSgLhYDtJv74tPGwgUJUKAfbjLEYMB4g/zKdEUUEF7ZupIQo 0AktS35m7G2gkAKcKyExO5ZZYH2yVSZ/b5GFLR55GOrvbuV7p+LYxPNOnwfLe5k0W17B yB1Q== X-Gm-Message-State: APjAAAX1ikJrGcuPorjK+snFc4tvARa0qLFC3JP2+u7Y32URt7n3gcgX gXPojFZyOZ88oHVSUpUZVZfQzxgj X-Google-Smtp-Source: APXvYqw4yfO/VDoX0O/tMZYGp3h21qc3cqFsMoRPrElYxIEV+JwsjZo5eVK9BWamca7MvEH36OI3Yg== X-Received: by 2002:a63:504f:: with SMTP id q15mr69625509pgl.8.1577694518044; Mon, 30 Dec 2019 00:28:38 -0800 (PST) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:902:8303:: with SMTP id bd3ls9145156plb.3.gmail; Mon, 30 Dec 2019 00:28:37 -0800 (PST) X-Received: by 2002:a17:902:ac88:: with SMTP id h8mr66519389plr.131.1577694517519; Mon, 30 Dec 2019 00:28:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577694517; cv=none; d=google.com; s=arc-20160816; b=FtZvwyIgVZ3paCOc+ffKh32wYYtrBdLyxlk+7tMdw5kZb7z2GtYmyGd3K4gi+SfxbW UI9bnb9JMahhoJq4OhBR1FqIysywcXmJBZsYAeGtQ661UYn/9v/TUWEUcUkwgstoeA47 9lQTrNWvyXwJ+3jjUqGFUxMi4FI4YRx3MEkZwncM0G9tWQpCEAFZpaWGrtqK75SUhY6y IUu7yA37o+tvDYFx8Ggaldw7p2C+PMhr3pMgd6Jlgmr2R4dZT1n5qIjxdFnOcflzS3I8 ZJMLBuP6YAlIshj25RN/9+P2ABjwS5XLM2HRrS5Cb1zbgUmj1/vOO23N82XNZ9sO+Yer 4jHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=fCEJAVTeFVKCDScEQscaeQ9cpdN3+DTMCdxgai1STTg=; b=NZ7NY/Pqj5481VWu483o8/ulolAlm4OJwPT9gIJ7rzH7VYeHvBYoJGc/N3XaOeZSiw xLz8Pu009UNE1tCpb0CQm8lY336uhG1tLS9e9OVJFB2hLZMpMiajRHFes3woASBTLrFQ +o5vY2rRucBaShG7woFwwCuiYaIHCyfcFtLtsyyO+Ptoy1T05DtgyCrW/uyRGAHcIhR2 W46gQPqwxFnRBH/9UDWv/uTzr+21gI7omLXsGvFlRM1LlbJAp+pKxWrD1LvED9arJxBM G4Nr1/w+82rxE1g+zIw91dNyfSqqShZRQEi5rgBYU0f+7OKidP5OAseuYWups2N95KIw xE8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=izcUzUke; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id r6sor44620115plo.34.2019.12.30.00.28.37 for (Google Transport Security); Mon, 30 Dec 2019 00:28:37 -0800 (PST) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:a17:90a:d985:: with SMTP id d5mr46209111pjv.73.1577694517271; Mon, 30 Dec 2019 00:28:37 -0800 (PST) Received: from localhost.localdomain ([49.206.202.131]) by smtp.gmail.com with ESMTPSA id s1sm46240652pgv.87.2019.12.30.00.28.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Dec 2019 00:28:36 -0800 (PST) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Cc: Akash Gajjar , u-boot@lists.denx.de, linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, Jagan Teki Subject: [PATCH v5 3/7] Makefile: rockchip: Support SPL-alone mkimage Date: Mon, 30 Dec 2019 13:58:15 +0530 Message-Id: <20191230082819.30191-4-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20191230082819.30191-1-jagan@amarulasolutions.com> References: <20191230082819.30191-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=izcUzUke; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 Reviewed-by: Kever Yang --- 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) From patchwork Mon Dec 30 08:28:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 968 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pj1-f72.google.com (mail-pj1-f72.google.com [209.85.216.72]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 17FD23F076 for ; Mon, 30 Dec 2019 09:28:42 +0100 (CET) Received: by mail-pj1-f72.google.com with SMTP id q88sf13040183pjb.2 for ; Mon, 30 Dec 2019 00:28:42 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1577694521; cv=pass; d=google.com; s=arc-20160816; b=RsTcwdirUeR58f3jraIKMY3s9VEQdzwwMHivlP85kk9c+KnxYvQsQu+aLcPs4GG/z7 tq281oSRmS8bbzflpePWAHqqcI7CNfeODkzsxAR3rN+h+eDz/euXQvzqT1lNlG3Hmkhr gvVxUjdGr3qbOeXkbTY59waL3FrlUmY2hczijUPf2akHGnh/Kl/ao47DRAjNr/SkCeef A2XS2/advQuL4/GLnDQq6jjVAhA/gS6HWSvXshqFIJtRoEmLSM3uo7nJ7gFFC9nPbXpk 1oknynvwUmLp//o7lra9woSqojNSpINPqW/BobP0sR7IA9cV0XnaMDTPWIrHeGRzxvQd O4aQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=4nvL8e1dT3FsiRAvlY8jIMXQXBk//UWgYisAjG5A0dM=; b=T2xEYm8WyoPRaJSx8MofYkz1kaZxx9Xjtl1umKlLopOiTShrAxTLjl5HdmmhlAJ4zU T+9asP4I3UVCkD+Vby6wtTIfQWNRmS1PznTW/7ifhwToLMeEt+boxvw2zh6dEMdSP2rj nX88x9zDXJ5Z3F5BrAube8f1OTjSmTKPkEobVx8pmNHllAtDeNDerjG51n2cfN7SWDT4 OkmwgP2KXbl0nAub8VKbKK9Ru8OeTf+50o5CRa+gGI37gaqV1UVMEiHlYLqryDwzsWi8 rYUQTKUQufn/1zI7wyL8x94QWjWbzmLiwKq6r0Qc4BMm9DBViftFmMcEEw4mUTpSu4u8 SAsQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=V3RTxdvC; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=4nvL8e1dT3FsiRAvlY8jIMXQXBk//UWgYisAjG5A0dM=; b=TAf3g/J2dVe4jNGKaEwH9WZVJjbPpcDUKSrZz6dXcjKiJkNsEwGeJQE52Cv/DoF0KP MoVZd/fKqF3MBIVuDrYVwWk11pL1stI7/pfJL80klAzCTuyhvSXG95xkQk+v+Rj/UsmZ rz6oxOAyDBzZfwj7V45Y1RzxABuJZbE4dv8VE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=4nvL8e1dT3FsiRAvlY8jIMXQXBk//UWgYisAjG5A0dM=; b=lsp8j+iuxhPYGpSStOvej5iN3zDxIrXMsn+pk7NqHiZBduOHafBGMvBFn0sgd2yMGI ahQHYIsnBs0sMD6+5nZDnedurOQzKfFpuHcbrntWwGXbeZPJu5mt5cmxvs7udGBBRyr3 HHutTtJGeMlTshaI2Sm/nkgCE06wn/FDSaNRC9wT6vGZj+voNdrvMdU2o7eU+oucR03Z TAIMBcYp7XAxHvx/0hiNBsxlRY4jXACd3vGxrq5j1VD9phHjrsJQzvf2K04ny14Z1xoC XBjtgwzZppEmU13ubpbmXnyt9B+LaK3ejp87Gpg2f5dedMl5L23GXtU0Awkk/MvrPfhm w9nQ== X-Gm-Message-State: APjAAAXFRMLA4eflsUXliGOZpvPdL2BoiZnzVZnsAefB3zmvNYk+MvLF BdMsTU21G/yGWvTm505pMHur1H0J X-Google-Smtp-Source: APXvYqwMmItsRjYrX3wfSwKyFdCsFXSVnw6+0Y9oGZi1Amrj5iNnheY0dZ2nNdJwvoCsW+XydGmmIg== X-Received: by 2002:a17:90a:660b:: with SMTP id l11mr44249853pjj.47.1577694520927; Mon, 30 Dec 2019 00:28:40 -0800 (PST) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a62:8744:: with SMTP id i65ls9767386pfe.11.gmail; Mon, 30 Dec 2019 00:28:40 -0800 (PST) X-Received: by 2002:a63:2355:: with SMTP id u21mr69091595pgm.179.1577694520348; Mon, 30 Dec 2019 00:28:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577694520; cv=none; d=google.com; s=arc-20160816; b=DPPj/jhhCZbCxQkUpJOviKp8n4dX5FB/l7++Wlp/tb38e1tf+1Owz8FynwQI4olhPE bdXaAvp2zsfiepfpIdU4pFk3cZuPWV7bASSq9zPM4Qu/xooNZUQodZ313NwTX4XbNpnY i8B410mM+xxY96G3P8KID5unv9c4pAntg/apsNwZ0cwEonDfX5RGXZXJoL+NhUrbI8Ga /LZtKaojRkoKdxXxVTQQR8YRTlpSfj2LeYjo1+bT4Evzcoh53sZYJDAcQSYI6u3UE3tL i1KsIvk9qM7ww7EsLp0QnwGD5wRdMy3OWER8C9zL4vDibXa8h4s+E8xB6mfv1ONdylL3 0aYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=JtUK6y5W/bJkr2xE34zoKJTJmMmJpC6RCrAHlI8mB6k=; b=MA0OUlTEUGv9rR5GXj+ecyyivpCqq1cTBGIop2xpx8gl2dTaouGrrOl9DYbivwjg+o EoBpTGqojyyVWt8Q85k1WxsbJNb/k04imMJYynAEd78U7A90fBbg1kE/u22an8tEMkrT 7IwylU1so7Ge8UeqgBF7zusDCsJ4wtE6SgbID/YoMFfm7PhVJzK8fsKsFkFa9gxobFRW tWDf01MPfXanT8dMs57Ambztis4dniHypbJJrS9Vv0mqcokts1ajnOSrYes9WYV44Uxp vTeoBa9SNwcpnkOSHN38vQlfzrw3L8DpBPcF3JITjDdhdAyg7sS+i9hhd5TrQiHhc2aA zTsg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=V3RTxdvC; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id gi9sor23007173pjb.2.2019.12.30.00.28.40 for (Google Transport Security); Mon, 30 Dec 2019 00:28:40 -0800 (PST) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:a17:90a:3ae5:: with SMTP id b92mr43210339pjc.26.1577694520063; Mon, 30 Dec 2019 00:28:40 -0800 (PST) Received: from localhost.localdomain ([49.206.202.131]) by smtp.gmail.com with ESMTPSA id s1sm46240652pgv.87.2019.12.30.00.28.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Dec 2019 00:28:39 -0800 (PST) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Cc: Akash Gajjar , u-boot@lists.denx.de, linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, Jagan Teki Subject: [PATCH v5 4/7] Makefile: rockchip: Use u-boot preferred spl name Date: Mon, 30 Dec 2019 13:58:16 +0530 Message-Id: <20191230082819.30191-5-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20191230082819.30191-1-jagan@amarulasolutions.com> References: <20191230082819.30191-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=V3RTxdvC; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Most of the platforms uses the platform type and particular boot stage on their image naming conventions in makefile like, u-boot-sunxi-with-spl.bin - Allwinner U-Boot with SPL 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, use u-boot-spl-rockchip.bin instead of idbloader.img. idbloader.img is still a proper naming for rockchip external documentation but u-boot preferred spl name would always good choice in upstream tree. Also, bin is more conventional way to include it on tools like binman, pad_cat etc in future patches. Note: usage of platform type, boot stage doesn't follow consistent oder as of now. Signed-off-by: Jagan Teki --- Makefile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index d8a0f68883..b48693e560 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-spl-rockchip.bin endif LDFLAGS_u-boot += $(LDFLAGS_FINAL) @@ -1387,11 +1387,11 @@ 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 +u-boot-spl-rockchip.bin: 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 +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 $(call if_changed,mkimage) endif @@ -1943,8 +1943,7 @@ CLEAN_DIRS += $(MODVERDIR) \ CLEAN_FILES += include/bmp_logo.h include/bmp_logo_data.h tools/version.h \ boot* u-boot* MLO* SPL System.map fit-dtb.blob* \ u-boot-ivt.img.log u-boot-dtb.imx.log SPL.log u-boot.imx.log \ - lpc32xx-* bl31.c bl31.elf bl31_*.bin image.map tispl.bin* \ - idbloader.img + lpc32xx-* bl31.c bl31.elf bl31_*.bin image.map tispl.bin* # Directories & files removed with 'make mrproper' MRPROPER_DIRS += include/config include/generated spl tpl \ From patchwork Mon Dec 30 08:28:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 969 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pj1-f69.google.com (mail-pj1-f69.google.com [209.85.216.69]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id E09233F076 for ; Mon, 30 Dec 2019 09:28:44 +0100 (CET) Received: by mail-pj1-f69.google.com with SMTP id g12sf13041081pje.5 for ; Mon, 30 Dec 2019 00:28:44 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1577694523; cv=pass; d=google.com; s=arc-20160816; b=dpU7SmIdJ/gjIlYbeaMx405FPV/FoNqemzxekbrrrtqKY0JF3tY3eiiH4BK+E8BOTg R5qRvn0ExZP7qlvYsfAd/Mkcbq14EuuzRZVDw0krw+29zqTpEPFoM844l2s8OC6gFIfB UFGbwNmBytD9Umluc5yqpyaasU06uGY/7f55k/9kLA/EYipVF66QRFS1yPJDCrb+LYEK DtMISNYH8dmaA2NSxRkJf0zvpeGWEACge08TnJvyy1aQJkgDEBLXXaE9CcLOz3tBIxL8 E5XjlyEzPXeX4JNQgdGAJ00SXWT2K8jHaPZ4SYffwA4mn9RCc5JZdbqThF356H30tkV0 +7Hg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=gIQXEvlnnwoCe9L4Z68xFVqWI7JW8g5ZU/5rfOSpDhU=; b=PEW8dPnpX9dJQiqGgQhGbmFj+Y7K3lhO0ihVs7qFLvN6/MwPatO0cYV8EbRVqCMth8 /vp1bT1+eJUYr+DZkT2CzdK+6n/5zyGxzjpaR9dqoVnNuDn2xON8oHZnfGZdaqAgA3rx HOQzyWj0RUHbDNbxvCWX6ulng845SzHGzmap0eHP0zp25aYNdCRDGINPsRFxO+9jH6m0 KcTp/jB98a8vD5IYXbQE2JyI3LbOIfCwE6GI9/ZB2uIThmcGKhLbL706YRiYvL3i8Qb5 nArYvVf9T3TFQNbCE+VAWOpSUDJr88Fzew5rEdKXqmWRO4YAlCZAo/FCp693xc9FBo5c axHw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=eVkjcaGr; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=gIQXEvlnnwoCe9L4Z68xFVqWI7JW8g5ZU/5rfOSpDhU=; b=JkKNZ8dJp/mYs//H0OEX5xkHBwLmKadJbyxzmH5e9PGACYQSrA4h1r5o6NCevnBVsb KuvhQ+mGcP9U/rohdG8AE7DgGTrdzCXV5CqzgE8ihqTlAenp3OWc9t9CpYBFNmCV8bxu O35OheYPRZePuOxBUDSxyhgMC3mc31fo46L+Y= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=gIQXEvlnnwoCe9L4Z68xFVqWI7JW8g5ZU/5rfOSpDhU=; b=oO+Ic6nQCDUJ3mpOSMSh2PruX7G53uSV0As/HT+Dh3v8q3XCX5S7ZdYC6oUIgkA5Nz 6lR+NO56/iQG+gE+GtVljxxTSv7mZOAM7L0CDAJwDjoRDtW4UY8Tk0eDfGOAeAsL0x4a mQNPA5ykdZvYDpsxFQeulXYkAhmoqjuqVmNJtV+rH8YXAoi57vx+gwCgG8CHAwjhxwny d2KuyQs1TNb8zVDByzYhVjEZkhi0gpHx6rrbTH9Rh+Mf9YmvRniGU10QtpuExT7ZNYp7 OWmkq8tS34elY3rBHcemg+D5jwYDVPJFC5C2IThpsw/xcA9b1lGsJm/XZMYi1DnEUn39 AC6Q== X-Gm-Message-State: APjAAAXmGKnVBP8GH8v1mf5oLGOUu1TY2XcedTx+PrOwJ2AHG5aqP4mo GS9uMR9CGcBRo1ntRoUfbImfPp4I X-Google-Smtp-Source: APXvYqxn5/P1AW7zjq1L49lgrEURm5TBu68hyPjTF+vkTmz6jvWTQ0JApDjpEaLzg/mP0CdF60DoiA== X-Received: by 2002:a17:902:a516:: with SMTP id s22mr67036196plq.89.1577694523627; Mon, 30 Dec 2019 00:28:43 -0800 (PST) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a65:4608:: with SMTP id v8ls9139522pgq.8.gmail; Mon, 30 Dec 2019 00:28:43 -0800 (PST) X-Received: by 2002:a63:465b:: with SMTP id v27mr72009407pgk.257.1577694523076; Mon, 30 Dec 2019 00:28:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577694523; cv=none; d=google.com; s=arc-20160816; b=ylZBqw8iu3DIW1ZxY5wRQ6N2xe+q2js/E0lwwS/7dFt3JuLimC8P5YLhAs4KZOVFU0 3TRaEXM81G3Mi/Z6l5prTl6l97gCOrzrl7sHE8Cr6oXjSKDXOmGYyJiwsHp2QEtgU6/v GapGCZ10SSOVz8Tx9JQqz/iHPCt9eE0/esRKscnIpPMMx/JXOGG85sqdgaJXKg1Oe2MY KOkOvSNv/SC4QxfqbjnW24pKZLPNapTltjSQN68YhaYNms0XqYm541OFz6LOWvuvs5g4 9vkc3M9M6+qIjqrqWlFchtjLoMcYrdtA1ZM3fLXJhBjUhtj049rdpH0t9CGn3cq3YFod zqOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=ohtCegxGTC6Cqe4V14RfDztSgq/DwnKYmeUpgrodjx4=; b=OJJ0fnrlYuAiQ0mRqtPpruaXAT5T6osHW6yTR6wfuL7UczDe65DjvMoJEe7B7GbdYl 2wH5n/fzGZ0PYhFkEPTfjcuYxhvvbSEJonald3Q2PFQ85VAY6CcYh1GK+Z3EFe7tomct i7cXyQ2/6et+URHGcMpTkrH1yZMLCpJu1I4G1lDf0DxMPWP0+TFntF00H2y4CgHlySB4 7Mb3GsK4xRZKerfBv11knWUuYHEN8jHQeBhe8mL/GyEsK1msOZrbqcLxmYfB66x2LeM8 p1CNjjLsa917rz8NMBiuhPl5y2vJGyNkimyhGu2Ad19W62psaz/POgBN8n5qw5Qz+Csm m09w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=eVkjcaGr; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id l7sor39935340pgj.52.2019.12.30.00.28.43 for (Google Transport Security); Mon, 30 Dec 2019 00:28:43 -0800 (PST) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:a63:1f0c:: with SMTP id f12mr72487594pgf.247.1577694522801; Mon, 30 Dec 2019 00:28:42 -0800 (PST) Received: from localhost.localdomain ([49.206.202.131]) by smtp.gmail.com with ESMTPSA id s1sm46240652pgv.87.2019.12.30.00.28.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Dec 2019 00:28:42 -0800 (PST) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Cc: Akash Gajjar , u-boot@lists.denx.de, linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, Jagan Teki Subject: [PATCH v5 5/7] arm: dts: rk3036: Add rk3036-u-boot.dtsi Date: Mon, 30 Dec 2019 13:58:17 +0530 Message-Id: <20191230082819.30191-6-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20191230082819.30191-1-jagan@amarulasolutions.com> References: <20191230082819.30191-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=eVkjcaGr; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 Reviewed-by: Kever Yang --- 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 + */ From patchwork Mon Dec 30 08:28:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 970 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pj1-f72.google.com (mail-pj1-f72.google.com [209.85.216.72]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id ECEC03F076 for ; Mon, 30 Dec 2019 09:28:47 +0100 (CET) Received: by mail-pj1-f72.google.com with SMTP id s19sf11614916pjp.9 for ; Mon, 30 Dec 2019 00:28:47 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1577694526; cv=pass; d=google.com; s=arc-20160816; b=lI4uT4OVUpNbyxQPGFBUyZaE6woQMD2A74Vt3eUtMrcjIagCTZQt2exvzTzoA2XrfV RrqR3lQQ2OPQ2c2aAGC6YN9xPEGqACCKymavoP/EEB5hea3RYqIXlbLhEacRCeRJjsTH 97PhE5t+K4GA6A4xHMH5NVNqqtVNhZHUqixa3mCtCgMwsKQMNxCBdeZfG81Nc+W8v47I lVfR+fwmNYPUQq66bp1Jp+rzj8NNy9CBOXXWJP5QMbLpscyKrh7MOn6KffWxVExVZ6Ug m8D4wXzZwCK0IlZQLwCpXzPMcZO4Ao3BzTZrVg/y2snuVetKioDmro6KgMJS1CXx41XA wNBA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=pfQvKb/f+pxUm4Orq8rh+a3di3WnVvKBIUXCaDmQePM=; b=V2WxVV8tI0MCMfOrxqAhhqX8FFXB5bahQcu4NjnfCN6NxMYgcYTdDgVRehdLbml/2B mwRqksT6xC9ksQ04nvDy0N/nixz7F3Lk39zcUVbxytQxk+EhJMu+idUi38I2rl2m+52T R+T8xrw1jNACHqZqHIrzTd8dWk4y3h7DTipRXWiQcUHhXrd7lAC5hk8HeUEmgTsXttmc 7tewxISPbYFKxxbe5btXGVEmZm3XDydaKHSRj95uk5QrKgVKxI1YqVZVF4tl8kyNjrOs /yki+WsvqAMZImwz0azhT4vuWVPSsZquktELH3mLZPa+kxng2hDbm1ASPip/AAO1II9J NynQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=YoHWYDgB; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=pfQvKb/f+pxUm4Orq8rh+a3di3WnVvKBIUXCaDmQePM=; b=MqJG0BivRWR3RQB4FJK8pkGSH/iIQSJ3dOGh6XWsrLXWg3H/YDYp7EqKwO81TscpKv 6GPRNuIEvsYYowgkGHWhyNmGVa27KRa8v8FLkglIDQIhFJpk+FK282hlQcjU7DNJz6n9 ioaqMXowh6J12QCMxAXyhPwzCgh4EdpceE8oM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=pfQvKb/f+pxUm4Orq8rh+a3di3WnVvKBIUXCaDmQePM=; b=ev68Kc9hZ2n/JFcplGyG6JNwfKV+YX/Fr/phJPVOXx0w+lZHQjthP2sjTbc6R7QFoj QCib4yPBB6A1ma5iyHmnC2QreuNkjwuuIeX2HDVxMYNqpvrCC0d+fZmnVxpbWMSU6Lhi 1LnWT9hHMoanE+PTRNb3yQsSbMEytucbMEg7bHc5kg8rf0WrIzWjNeDE3n78Pz8BVGtD x2+HBKGg6uI1ux9IVNZxJVvzGXSjPa41pVNr0quHw2Yij7vZvEY0YbSLgw+nKVGSlh3K Sr42Ifj4fqSwSiVtZ67+m5A+KgiHVrbmTBzy14RfJk2PzMSWCK1di0o0pOnj0U0AKIFx h6uA== X-Gm-Message-State: APjAAAUWK79awXiw4GYtKybnTXQXHJZBLtEvlwDIbGfCYihPDTtINQ4C kiI3hVmadhAXyHLiQOqUPTKeyCSw X-Google-Smtp-Source: APXvYqxYoOL2iabNGgRVb3cmjaJ2Gl++0PZQrpFJYSW9g9pmIJz/FWk09kAkznf8uzWi4AFDqAU3kA== X-Received: by 2002:a63:4d4c:: with SMTP id n12mr72137092pgl.212.1577694526722; Mon, 30 Dec 2019 00:28:46 -0800 (PST) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:902:9f95:: with SMTP id g21ls5898971plq.5.gmail; Mon, 30 Dec 2019 00:28:46 -0800 (PST) X-Received: by 2002:a17:90a:cf07:: with SMTP id h7mr43982470pju.66.1577694526224; Mon, 30 Dec 2019 00:28:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577694526; cv=none; d=google.com; s=arc-20160816; b=qOKqlYcZP4im3c/m6KQ59qMdiD4hoG6G8g0ZO3C9qL1VL45rpXTqVFit2PfuRZAFFr jOZ+iaQ5xEHCYSI9R2FiLqfUxf9oT/egfkbmDWHYc1c51USuYVCtfs8DcZhkyymwkGWD LUbZ6xPYSpN7RpLey0bmxTos7pZdtQeZsCbEyelDDpnITIMfVRcd1vBgpNR74RrxF0yo gociM0URqZfhz5KH1AFDaLFFzNrILCdAAyyNIDDEWR541XxwT3SIHBQ4hqe7Yot/Ldv9 aelDgzfhw6q0fReNP24XQXx2hCTkwizch9iQTLmI+4vMOslyMY0f+tN0SFLDn8q8AQ6L foEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=t68vP3zUnxKiomoAY67bH1HGMmANs3QjoEQpZMhCEPQ=; b=Aaf6ChF8papmyvjnvLUC6cCvGXzVJ1wf0WujKHG/i+usgdfUoXYQN0U8YTzaBETGc4 hXc5c1c+yrwIhJjeP8XuN/DS6riG35bpdZ0Oea4gFN4FQjDW53NIvB9AG4Ou+47Uezlv iZ6s6AzIzCdDKqigN/wrAv5CHRhhAsbVvv9v9x5ZFpTllBP/wZAlQwDJes3BFNaE3Fb2 fQx3oN5OoEgH+4QdHn1XGIctqRUxvscfXf2TAWdVin4ocgZP+lT7FsJIKfNdV6ZfBO9F /1astYuKVfnzSi7PHBwya7Cdo0Nh6J35TMcBcF6z282vHTI2D5crZwI2aY8ckgHmtSdL OB6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=YoHWYDgB; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id p7sor45268947pgg.48.2019.12.30.00.28.46 for (Google Transport Security); Mon, 30 Dec 2019 00:28:46 -0800 (PST) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:a63:447:: with SMTP id 68mr72595709pge.364.1577694525840; Mon, 30 Dec 2019 00:28:45 -0800 (PST) Received: from localhost.localdomain ([49.206.202.131]) by smtp.gmail.com with ESMTPSA id s1sm46240652pgv.87.2019.12.30.00.28.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Dec 2019 00:28:45 -0800 (PST) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Cc: Akash Gajjar , u-boot@lists.denx.de, linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, Jagan Teki , "Matwey V . Kornilov" Subject: [PATCH v5 6/7] rockchip: Add Single boot image (with binman, pad_cat) Date: Mon, 30 Dec 2019 13:58:18 +0530 Message-Id: <20191230082819.30191-7-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20191230082819.30191-1-jagan@amarulasolutions.com> References: <20191230082819.30191-1-jagan@amarulasolutions.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=YoHWYDgB; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 Cc: Matwey V. Kornilov Signed-off-by: Jagan Teki Reviewed-by: Kever Yang --- 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 */ + +#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 + */ + +#include + +/ { + binman { + filename = "u-boot-rockchip.bin"; + pad-byte = <0xff>; + + blob { + filename = "spl/u-boot-spl-rockchip.bin"; + }; + + u-boot-img { + offset = ; + }; + }; +}; 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) */ From patchwork Mon Dec 30 08:28:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 971 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 3070D3F076 for ; Mon, 30 Dec 2019 09:28:51 +0100 (CET) Received: by mail-pf1-f198.google.com with SMTP id d85sf22405832pfd.4 for ; Mon, 30 Dec 2019 00:28:51 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1577694530; cv=pass; d=google.com; s=arc-20160816; b=Z4Vjv+Zro+e8N355FfNrtVPhfeoWoWHR63qLTNIRsJ0QzhpYEhjCx2NaZFMTndTfky 04H/8onfX7TH03uacPysckHVDZSm/PPZqwmEKEiSWt7VdwsKpX+2xJF1bABLXzmiufNP vLJMyDA/lmHt7ASr0YDpW4tjPVVD5Yqd9lbl4v3y2Dbp7Yp+MRUK6IEiC07DJhXOuR1b ge5yTQDZdSC3bdPDsxGdVVGZNTiM4DQcg2SuGlwK91QSYJ2z2qGMGRFCTZhaRfPN1aUx 4NSNZiZn1hz4xjBdJ79/y47SyG7CUAv0JL1JJcUTL2lVYlafNF3ngTWfGhHjB2kRx6AC ijoQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=t9GS4+GTkc6L4IU/szcxXH7KOGqO+BDxZaIQkjRCbDE=; b=WvtMA5as4EOC2SIsa8/CMNYtIdXeFrwJViKB7F/yzX1wlmLsgPTjtpHhohXGiZKER5 UeI5VDM9jGEsPQKmOGIahcgjjJQ4xyXsuIh7Zyb3Jwyqsen+DQtbJLs3/oGsAxZNcShm rj1JX/LuMTyGKKadelKjUsx8CvqdAt8CtJbaQXal6rGvWWCofnM92fRW0zRvzlGNHDQF qj0QGymlkvdODU5k/qjdHTcu0DizZXcvvnLI1Vs3EOY43hoyg2ufbGGDCUPoSNaDSHQw txZxSiPzFT+uNeN2UCPCjwS0CRbQyBtF+tR6UAXqGe1fbQCZ8+0I/wvTA9NEPfh4OGUm Z2Ew== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=jc+QbzRQ; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=t9GS4+GTkc6L4IU/szcxXH7KOGqO+BDxZaIQkjRCbDE=; b=YJVaChJj1KMIdkAONpESCxgrKTVFSxYVN3AISRrbLT9Tu4kY1nGZuRgIsmqvcSQwt5 fDju1DI8qQw8wGfEKH20vKSG9kZET9IC7u8UGgmbc5nyqRJFeLaHIiUlTRxhKYkEJod9 vUHNl7aQzz2YNqDWRpGHX3Nsw9mxwHb3nKJcY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=t9GS4+GTkc6L4IU/szcxXH7KOGqO+BDxZaIQkjRCbDE=; b=f5xeR4sZ6MyQ+igkiFRcAgo2WJk4odGcSbOJju67AW2XWGWuqQvHZbBg79QB4np0Ck coD0YkmjUA+TMZqabcjXVTwBXjPfJIkOWv2pZ12ABelhzLqEIxWKMIS/0uf3XJQVigo2 JFJUZXUsbPRHbN+2GP3gIPOB6CP0318CF0RjTgwIQ0FBSY4cprmQx2bLMu4XxcqV+HBC 6eXb1hL7cRMKtuPOuAzrFTY6y2hDct+YEwnGSCYYh3WFUfs0N7YwP6iuoH7NKLHe1Tey hSSP6AkzO/CFqieA7XyAk1YskSdt+k1eVLlXr40w51swtcO1me0RvhnNGZ5QKclunqy6 9Bvw== X-Gm-Message-State: APjAAAVIR5cfRfEkBmjH1e5MOJY/OaKMvHFKksfqzCxEUPDvuk3MCUcy WtH8tx+NSdqb5wlxNbcH9QySilBt X-Google-Smtp-Source: APXvYqwBPWzgi2cEi/rG0x00pSVInJQYIhlNL77EflbXoV0ZgOrF4eSgaa7J5IGuQS9tMF3hBVkWBA== X-Received: by 2002:a17:90a:cb8c:: with SMTP id a12mr45505177pju.71.1577694529962; Mon, 30 Dec 2019 00:28:49 -0800 (PST) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:aa7:84d9:: with SMTP id x25ls9770872pfn.2.gmail; Mon, 30 Dec 2019 00:28:49 -0800 (PST) X-Received: by 2002:a63:cb48:: with SMTP id m8mr72780502pgi.128.1577694529276; Mon, 30 Dec 2019 00:28:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577694529; cv=none; d=google.com; s=arc-20160816; b=g/yy7a/QalptpU5Q0cyUB+iTWnYG2fCJ+xJknnKw8tfrkmMBFWdAFrvXlT2D1Qtbtc Ab/xxgncreIHRcUuf7Tkdt9pKYt/AgnOETUOPisSk8dXmnPRMGuZWkt3wHZTakO8A70g twrrtir3TdcLN9ld6l9am9oGrLc342MmJ4g70Eb24FSlpQQjpb/rDogiaSvf7bkbw/IE CdxnOrTl+3ETbDUKusLkfGWttP9dbZl/0gkP4aDG32Ij93dHnZM7YnO2SfI0zxTThw9Y sfD0C+Mo0DfpefpTGasknaw32o4RfCfpU+hhP1ZQz+uJSJDZzkm8HyxxHjxocuS1TDSj Fo7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=cH1Kgx4pxWjY/ylyr5O0lvoO8yHz8X1lY8R/7tMQV9M=; b=rO/BLbZCvQs8q53uUlpBN+bt1Qp9Uo0PZ1RxtjOMHGxkXYI3DIKiktFFCwQi3Ioszn VjEHTNIWrk9C7+Ixxo7s0LrjIeh09vxv9OGKIqD2f9tqdTTCODID9BZemU3GIhOuFjxH 0Ht5NcnFgUr2aMfSOh2s5XUfVZhd9QZF7ctGaseUGrOeE5E4FsYm5j0cqeu89x2zOlSw XPj0bbT7LTiSi2BnQAa7IUgUFuNustrERs6taP8ZPGGsQoeAzYOPDauDaOMPohaIP75B i/Ty+0Koi1V1e3SpXn2wnH6+FEK/DnmykZ5aKyoE/ph2MHA8mhz3YH/7mGqNtZd6jhmb V4iQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=jc+QbzRQ; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id o7sor44755881pfp.5.2019.12.30.00.28.49 for (Google Transport Security); Mon, 30 Dec 2019 00:28:49 -0800 (PST) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:a63:1119:: with SMTP id g25mr70792114pgl.359.1577694528916; Mon, 30 Dec 2019 00:28:48 -0800 (PST) Received: from localhost.localdomain ([49.206.202.131]) by smtp.gmail.com with ESMTPSA id s1sm46240652pgv.87.2019.12.30.00.28.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Dec 2019 00:28:48 -0800 (PST) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Cc: Akash Gajjar , u-boot@lists.denx.de, linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, Jagan Teki , "Matwey V . Kornilov" Subject: [PATCH v5 7/7] doc: boards: Add rockchip documentation Date: Mon, 30 Dec 2019 13:58:19 +0530 Message-Id: <20191230082819.30191-8-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20191230082819.30191-1-jagan@amarulasolutions.com> References: <20191230082819.30191-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=jc+QbzRQ; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 Cc: Matwey V. Kornilov Signed-off-by: Jagan Teki --- doc/board/rockchip/index.rst | 10 +++ doc/board/rockchip/rockchip.rst | 128 ++++++++++++++++++++++++++++++++ 2 files changed, 138 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 + +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..625155e432 --- /dev/null +++ b/doc/board/rockchip/rockchip.rst @@ -0,0 +1,128 @@ +.. SPDX-License-Identifier: GPL-2.0+ +.. Copyright (C) 2019 Jagan Teki + +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 +- Describe steps for eMMC flashing +- Add missing SoC's with it boards list + +.. Jagan Teki +.. Thu Oct 17 22:36:14 IST 2019