From patchwork Wed Oct 23 19:56:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 873 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id C79CB3F08B for ; Wed, 23 Oct 2019 21:57:12 +0200 (CEST) Received: by mail-pl1-f198.google.com with SMTP id f10sf13420142plr.7 for ; Wed, 23 Oct 2019 12:57:12 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1571860631; cv=pass; d=google.com; s=arc-20160816; b=BhM5wjGSNXQMPIQEFjrBxT8fySsbX4Bj7HM5P8lWzCPz4PQF9nEL2OBEWSSiPCNVxo WenrL/Qem7jtJT6w8TZb0RbWR2LquRo5mPIOrwXjS1zPbpwovMo0An9cRmp5Xb5CNoxR 6JQFcHKPbvHY5GTxQVgslFKWH/iDYDcINuO0zWrI24vHdNYP/FB9a20eIRucmOzGJWaQ r3m6l2KrqpmYVHDXTIdrSv1pOfEOKNc0KfG0OjnAnZEFUawMGuMh2OXLkTjv6DkbaS2E bDcueWBzDmGQf+7iYphksYLdc0CVUKrHmp7wbgXF00d6HSdJjGHLvKguwBLQn0GhE8CD XRxA== 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=IBzRAlV3xkyHZf/TXtIz64prdAd3y3+SRsbK3uQnsaE=; b=b6stEgaK/7dzOPBqBOnEkvdRKBpCWooHWQ3jLROC6V74gwmnjTLN6zKbYPQTSoQEUo OhiXu2E++emH0KoYvy4yqMn84SIpTeoROJxSXL+m6G0R4+k3lFSTm447Q1Mwvs7/sfKF rQ5LNuX3YMkTFRqA8urYLrt7SVAcq2lta9wcJfAHRdADhltV69M8aTrSXUMkuIQpg9rY ZvQcWAQ67o2atgSWBwpmnWM+45ZkT2Mwe4v4a9NVdjhp74zrQtbMkvKfFrNhkAmQZZN4 vh8tgi+3FQrhhVNeK+9EZ1QvzqpVnTnBDiLDNhhR8Hh3k10oGHaFCCUiC4naYQGTJIAI EiDw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=LrjZwwsl; 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=IBzRAlV3xkyHZf/TXtIz64prdAd3y3+SRsbK3uQnsaE=; b=nFNbQOe9r5wx7KGpom+vQusxLqoNailpkaq9owvkybiS8hELC/W11QtV2lctDQxhIK WvuK0rHHlEAK7IjkQHUqhpF3aFMWSFA+y3V1W6ZfIfi9LhmUMoFBkYIPIAMydfUWl8J4 526yNeA7RG03Xi95XgL7stVpzMjCaZKEGeMpM= 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=IBzRAlV3xkyHZf/TXtIz64prdAd3y3+SRsbK3uQnsaE=; b=jazOOUWOJoR256QxQAsUWPKAdkCBVDW8yPbR+ehxDmvq+r4ps9H81bCZeRvfiL+Q8i a45BekxJi2M90LUw5pGzPDW1EcJDu7G58DpPzb0K34Qu2N0J60SmcsmweVoyPvq56Hzb q4ve3/VsHZSZiph3cyPcPw+E9sHfMnri0+0NAA+fzwKcsTUZkeEZeLq4aUtsAd5gtMlX 9e2djmLSG1KWHSU5NalGVVtIl7qPdZRaaP0Rktk95W7kEXNFSSSePlScGYvZuPS189Aq F1rBUSbp1PvIbWTkyyd/S6CKdl1vRBXXX2M0SLHewbtsmeQZLyQ4958nWfQlMPYDALVk VFGw== X-Gm-Message-State: APjAAAXP8Q5bwsDgTPhmPu22oOgs+fo5XfXOUmA6+T3nWYVwhR9d0uDH TnwO+k48E2FLppLNgy3l6Rl4OqPe X-Google-Smtp-Source: APXvYqxbGjLVlJHOwxnj4px53a6AIlI4uyvp0rEySB0KHz54ZhgGqMh4hFoU5FtODTB4aNL2x8IOiA== X-Received: by 2002:a17:902:8601:: with SMTP id f1mr11823265plo.144.1571860631146; Wed, 23 Oct 2019 12:57:11 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a62:7c90:: with SMTP id x138ls1069242pfc.4.gmail; Wed, 23 Oct 2019 12:57:10 -0700 (PDT) X-Received: by 2002:a63:7845:: with SMTP id t66mr11935698pgc.31.1571860630578; Wed, 23 Oct 2019 12:57:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571860630; cv=none; d=google.com; s=arc-20160816; b=ZMQkFq8hWj8RTwCEwGykXYWiUNwDU8tC7lS7fVaiuppvUXs/FKrr+AWIwdTMriL/5q 0Xwp3ZBAOTutGGxNRAXc8s1AknwRNhS9ZsHxYPdjf2nGwqQE2kDGKrctaIGdPQyR3ebm J7Yuk48gVgZjLsMDWogcRuXwI9eUylah9h99YKXVV8wLFb9eFynJotS5UB/lV5Fb18Hb HH9knLjQp7Wlip5b06ZsKOcDkramOMhpQwFLqMmu2ig7/hCnZp9sGsQ58rjAX5nq5PNs n0fRkz20pAn21jvv0MnEto0JEB/ACTmOHz9BWALLjHN70iTlvr3E+HBogXLi65LQndw9 rkTQ== 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=H2yQ4xkPkDVIKzB8uHsZTOyId3pkkwHkdUji6o4jAL4=; b=eixgs7R0QOpwWWvEYRS6Gefivj7J9ZslheQS6QJAcnfv0zEC+ckDCYh5X5XIdnsrVI PN6ps7g5tRC8WKIq7sx5qO2tXzHATltCUT3KmfrxkKJPg3OJeYZkFMowQ/ngZ1q3E5SY hao6GSgAcjI2P/n/u6PdjaiHUMo/r8+fCtrkdkrXbLp5gdcXnv+spCEeq36pIzTbctAb /9sAnbkOxTfdNjSkUqj10AJasv2wrYr1OzBSSRbkW9qnmprLEQ/5p4M01DSjqpWTgPvE PgTA1e5cnJJKzRuBpq65jGYUqYKcBVvPlkon81feeFz+dz5qr2iF3U04v6Cbv52gaScn LyWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=LrjZwwsl; 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 x2sor27892690plv.19.2019.10.23.12.57.10 for (Google Transport Security); Wed, 23 Oct 2019 12:57:10 -0700 (PDT) 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:902:6bc9:: with SMTP id m9mr11360010plt.227.1571860630252; Wed, 23 Oct 2019 12:57:10 -0700 (PDT) Received: from localhost.localdomain ([115.97.180.31]) by smtp.gmail.com with ESMTPSA id o185sm31499280pfg.136.2019.10.23.12.57.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2019 12:57:09 -0700 (PDT) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Cc: u-boot@lists.denx.de, linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, Jagan Teki , "Matwey V . Kornilov" Subject: [PATCH v4 1/7] Makefile: Add rockchip image type Date: Thu, 24 Oct 2019 01:26:46 +0530 Message-Id: <20191023195652.7158-2-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20191023195652.7158-1-jagan@amarulasolutions.com> References: <20191023195652.7158-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=LrjZwwsl; 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 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 From patchwork Wed Oct 23 19:56:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 874 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 367D03F08B for ; Wed, 23 Oct 2019 21:57:16 +0200 (CEST) Received: by mail-pl1-f198.google.com with SMTP id p14sf1972552plq.2 for ; Wed, 23 Oct 2019 12:57:16 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1571860634; cv=pass; d=google.com; s=arc-20160816; b=z40fbYphQTNb+vjWQUCKqQNIs/Lz4NH+J74B2QP2xS2cdLeTQQNJIsxWw369qWEU9+ IqDBT+FjClIvDc/C1gG8vXIRJ8u8zDvc1U+rTNLhs5G2a/nVHSD7HGjiGSDgU/4N9eA1 6mT0VHxwHGJTIgNy/hh13PWbeedgZUutyExQ2/D8iEv+jrXRvlfvHqbkynZNl6/eZg0t n9EoguCeY8MAzZohpq0l6AWb1AHbC35ETqDy8zgX7WF7u/0xFdN+kC7ssmKh4S9gyB45 SwWDW9bfmpWVYlTTxqB8RGEFqK3Yb5mwY7WivGvvudZpwZ5zkT3Mqxh4uELBKHumiDbB yeYQ== 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=OIOzl6X+zExZHHp6Omp6QoarhLF5IvT8NabzmdkIKtI=; b=WIuRQae3tm+C+twbGHG9/gTiqqD0HKBRQfQCfgglpNPvxS7ayBIGkxKQm6Szkg1uS6 wCiWPr16U/O9oDVBqRo7xfdSAL6ODakUMVHmg1SOFqi1s2JqwQXONGR4Nv4j2WuWAHNo aY8pXhL9eRbzrPFLpRxJIFUXeWSi7WH1+BUFcInl7apFRAQxMVx0U347gQoQ3iOfY9uS P/wG/zhRspuLawzmoY3sS7jwUrejqnnAhjNrp2fOC8SpQ25KOYF10ueTpH/SJAVcocib 1cyVKS2lupbc85oFEzddIS2E9483Qj0bmpeB9ooWr9J5OxnglwABZkbEENC27TLs+9Ka LkmQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=qTVF1+3U; 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=OIOzl6X+zExZHHp6Omp6QoarhLF5IvT8NabzmdkIKtI=; b=VfqlibIk5PI1cudPi/yGTVq5dpCpkUK+QTklQmp8AaqlD+3oV9GFu4Q8zYH5ft+8ev jQns02ms1zeHFigD/+gSLj3pd+ZNtSN0DusPF5gpA0nrgJizuW59nTxgMb8KMR+PDfEO cT91akeHEp1PPy6tgemeXcI9UfE4wxCXC3Iro= 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=OIOzl6X+zExZHHp6Omp6QoarhLF5IvT8NabzmdkIKtI=; b=IFcYaKBifJOlfyGHUz6XsMz3pN/a9kMRoEJ+L7vf6wpk72DrG3I8KApjgK+7wTT28P y4pIwVM/z025Fk5F710g+iDTtu/y9R+Hc20UpjwCP496OolIouszGxiCsT23n+KPkd69 BN/DmcX6O/elitb2rkVBMIZjO59C76nmZBq6mg+DM8sf0Bpsk+L3CjZcIvLcG2/4I4RF bkG/OoHxeMdGKG7vWnDUJUASfjy64yKe9VRNoZAuoZz7mmCYA6BpgZWcqjjRezCSvmyd j5RPN7PN6/KN/pEocS47jTPMCWg+JjKoqST5R2Oq5RWIiP6vr3d2WMLhitO2tF5FBRkE VXHQ== X-Gm-Message-State: APjAAAXbAG/c3I8ffS7R0cP7fBYHTsJrn8DnpscvpvRsJzvHLvKvlnub FCcGmWjQhEq0ZOytbB9+Ilj6RwUo X-Google-Smtp-Source: APXvYqy4gJqjAhjuVqWRLciWnyaTA6Qs8EtWUUU1GnEXj2u5Nw7H/1B2UsoTQl34aI1DtAmW7gQz5Q== X-Received: by 2002:a17:902:7483:: with SMTP id h3mr11673873pll.270.1571860634596; Wed, 23 Oct 2019 12:57:14 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:902:9a02:: with SMTP id v2ls989894plp.15.gmail; Wed, 23 Oct 2019 12:57:14 -0700 (PDT) X-Received: by 2002:a17:902:9687:: with SMTP id n7mr12099011plp.166.1571860634123; Wed, 23 Oct 2019 12:57:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571860634; cv=none; d=google.com; s=arc-20160816; b=Jw0d5vrK6iJj9IsGHxD9q+iyGT57hiEQyaIiM2g0xd1ZQ2xIdgld/8KGqKl3H2sLIz OD0Tq/OvDVt/9v7joSiaLLWsWULu/RM/yqRCNLtsneysP4Lx15HWhT6qW/iGVQ9qgSra Bbo0KXn243THXjKa2EkOzFRlHN8nigl1lvHfkOJp1nMlqGy+2mPdBPAOGqFV5JiRI+3d n3ZFLxYEm5t681g7Aak3d7kc6Jx7lywC/FjptcemjSuIWtxL34zk46fXOGlQauwobM22 L7uOCvw8EzQxWOhZjMYfz1PKlnLVyGUMAt3mOkWA3Ekz6xddlv3XhDEdKMlcDEPtsvcU n92Q== 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=I/dSc8zp8LBqE1vw+ydd8HYusz0zf83BUJfCTXC08WE=; b=pIGXXYrH2agVyGHWclUK0RN1789rhSYciwMOLdWf46OszCfLXZNkpAXqKfsMjeaJ1C fh7Sb+VxkeR0FCwsmN8LojRdNM6IYaM8NAULoDbf47t+7qGBM4RqBSmqFzPQLiqU5gEO F9Tg7JvADR/inhdw18Z+yPsD6G/Wyq1QN+gb9/UlAK98LzazMUrScbGjGWzlMpXpEhkc zWdY+zcOTmL/91+6sUwV9hs0YUK/MSS2VhCwPsYBF+pPHlsXkQMdcupn9th7QYR+juUD lrLKg/qZJ9p8Aj05eOQxMq34MLmFcrmAxfWY4paCGCEY1w8XVVmiT+lS1fybMg+77PPL 65wg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=qTVF1+3U; 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 35sor8715645ple.59.2019.10.23.12.57.14 for (Google Transport Security); Wed, 23 Oct 2019 12:57:14 -0700 (PDT) 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:902:a712:: with SMTP id w18mr7908388plq.304.1571860633624; Wed, 23 Oct 2019 12:57:13 -0700 (PDT) Received: from localhost.localdomain ([115.97.180.31]) by smtp.gmail.com with ESMTPSA id o185sm31499280pfg.136.2019.10.23.12.57.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2019 12:57:13 -0700 (PDT) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Cc: u-boot@lists.denx.de, linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, Jagan Teki Subject: [PATCH v4 2/7] Makefile: rockchip: Suffix platform type with tpl name Date: Thu, 24 Oct 2019 01:26:47 +0530 Message-Id: <20191023195652.7158-3-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20191023195652.7158-1-jagan@amarulasolutions.com> References: <20191023195652.7158-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=qTVF1+3U; 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 3e05d3fcfe..40cbf68fef 100644 --- a/Makefile +++ b/Makefile @@ -1342,10 +1342,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 Wed Oct 23 19:56:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 875 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pg1-f199.google.com (mail-pg1-f199.google.com [209.85.215.199]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 00C943F08B for ; Wed, 23 Oct 2019 21:57:20 +0200 (CEST) Received: by mail-pg1-f199.google.com with SMTP id s1sf15914057pgm.2 for ; Wed, 23 Oct 2019 12:57:19 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1571860638; cv=pass; d=google.com; s=arc-20160816; b=ObbekWPQfyQjvurSQQ9M48Wsc199FyziXxeuuW846q2nf5sALZpa3luAAa4Kp/3poc X6hIuC013eNbsgw1yYQAMAeVos2JOYM42/itR7mcffvOE7bDwR5LsQGXzgTdt5ds2F8C x8ou5DNCzvLG4LYCEhCH/ZVbfPl2pD8y2t8R4JMNWoNRQuYITh+uyjYA6hXOtG7nMgYi BKWKRU1Z+gkLgidBosRwComNupGXUZpEAw1da3XM/iGRlPCm9zLy0to9LFraQyGMorLU Cq2AvnKKn/nQvF84QeWia3KXa9qZmOZgK0hYh+m1RzSBNemaFjUAgxx9ss8fwUSndFeh fVHA== 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=E8YlCMSntFZkdItKbJTeNxk29cWtRGi1dsQiliTxTgM=; b=y1rvJ91lsk+Zmf6sL8NnUn6E8OAR0QAmm7GECs9mu0npwoI2znqHxdrDVnGiPcjwVf eA8LICq4npm0kpnT1VnDZowSSqs4Ewdt2R1avOF0IGw7kAgzaQzeZBwYQrjDLH1wVQTY SyyCQcmtYxfD+gQgfqhISat4IEUrHzS4NBB4uJsKZSPpnBspgXOzCBYfXjgwZ1/3O/4c SudpcoIHRiMYtTHBQuQolio9v2pI2HXpLUBYb3cEWjEo9Eeh/XNFZbOsfVJGw3YjT6Kn YMlHWqKACkjsm5dmpcJMySTNNA2kir7m5Pq+HTmTHZGxrXwCNtibVPDHAzwuwfUIvutP fCAQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=g9UWlVYW; 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=E8YlCMSntFZkdItKbJTeNxk29cWtRGi1dsQiliTxTgM=; b=qYqoVepDCr7xgL9TxIZZNBnPBNZnpaH3F8pXK6/y2J67xG4qybRnHpPdSTMDxQikWh R3C/5F8EjJVnr57zii3FQI3YUkvKLW1zQJdTbeH6nZ9x6BA5/fNPbIDLKfzRpZQ5msh9 lDGyOWGhDwY+APBytq4Hws3Gn2cvI2WEcbNuM= 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=E8YlCMSntFZkdItKbJTeNxk29cWtRGi1dsQiliTxTgM=; b=knfVc8+jJchTAUzAp7bltCoUQ2tywkPFvYR5sKESw7bI2vE3no/Ni9bTvLsRFr0jiX RI4tfATPViuLFs1/Yo0fff4N5nscxFH8OvvZACMM/H3fDFN71SzExaU5+84mHVTxumAF YgsLhLf7jxravEKV1l4o2nUQTnajbAlEyr6fYZryidtlohu9Lcz3TIUAw82BFJ21/pXb UtTIwn1ktVzpLMlDzS71psKzJ9U1ZK0smaaBlQfcwDWkB5FHyOcfAOSO/MQ6UjZj0imb bUDdGBtztJ6Dxb5ZCCfGGMQVLEm0F6zRfQ/5w39W3WbXjvAmuDV0H/xnqqopIZObknEi E7hQ== X-Gm-Message-State: APjAAAU1VYb/i/nGm5Z78mu6pDbanT939TCOULYqzkD9NYl4OYpYz+8V yehaMwdnTpx6YTO1spoNyQui4Mb2 X-Google-Smtp-Source: APXvYqzRQruJc2lUQKKyacfwgb4l6ilKJ+73DFeVaeWp/e5Ai8HSaTPXmrWhvdFPuFhosU8Ux0/wlA== X-Received: by 2002:a63:cc4a:: with SMTP id q10mr12116504pgi.221.1571860638468; Wed, 23 Oct 2019 12:57:18 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a63:6947:: with SMTP id e68ls999573pgc.6.gmail; Wed, 23 Oct 2019 12:57:18 -0700 (PDT) X-Received: by 2002:a63:f250:: with SMTP id d16mr7739667pgk.165.1571860637838; Wed, 23 Oct 2019 12:57:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571860637; cv=none; d=google.com; s=arc-20160816; b=rVg8JMbIpuIzlU3bVSF7Ev6RquzhW+/E2dEo6YzN6sU4/7/szIR22pTBoUy+4f/p2s MLEeGSne7mNucm/Ijq2n71r6TAlU2LqSN33Vr9f3GyTuwGhiZNRPSPvEad/tjSUSebQY jYlqZmxp3z3RZwBS2dtns2rpMllECYgEeGzQj7tPzxO55ePoTGX6eOlrsFs8Xfr+jm/D qOcZohJ7pOqsDqtsENV6y4X+W6V7n4rAtZ6yqDMCPAYdNMTcOe7VnuUZe9aor8CN5ppH PsNKqY5yoF48Vlnl9RYBOE53F+fwk32uBuOsCHBbas0s3vuQ+JnF34twVSQ2+9AOYgZh 23VA== 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=2IIX6hy/HPWIV2vnvPjHa7HNyD32IAzCXYHiNBs/B30=; b=mXwuRFLIpLIzlbGZwXQl3YMP3C4gp2bdP9fd6zS5OEgJMmjjh/lf4YF9gMp042Pqto xETW44TOZO4Xbl9L1fADYPheXWaVsQ1j4c0ljW6N/dEK4In9nWDbKmZiuRnH5eFAkVw3 D940chEc4asSnXNUDapiwR6pXLSlyfnqW8cfQjhFvbXZgVkKjS7KdgPe3kNyo4V1MxY5 uLy79qDaESQhPlqaIYp2rgP9rM1oqtvdOalSyUEpPa2kmier0tghhocc7+jJKfRhA4h3 tGM8va33V5z6a4jWTi2u0mJ8wfggPhppQYLfOOPbNyF2jHMlnmpsTNEEUPMh7NlGfjzv hXKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=g9UWlVYW; 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 g14sor258228pjd.10.2019.10.23.12.57.17 for (Google Transport Security); Wed, 23 Oct 2019 12:57:17 -0700 (PDT) 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:90b:f10:: with SMTP id br16mr2085547pjb.111.1571860636881; Wed, 23 Oct 2019 12:57:16 -0700 (PDT) Received: from localhost.localdomain ([115.97.180.31]) by smtp.gmail.com with ESMTPSA id o185sm31499280pfg.136.2019.10.23.12.57.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2019 12:57:16 -0700 (PDT) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Cc: u-boot@lists.denx.de, linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, Jagan Teki Subject: [PATCH v4 3/7] Makefile: rockchip: Support SPL-alone mkimage Date: Thu, 24 Oct 2019 01:26:48 +0530 Message-Id: <20191023195652.7158-4-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20191023195652.7158-1-jagan@amarulasolutions.com> References: <20191023195652.7158-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=g9UWlVYW; 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 40cbf68fef..b58107d6ef 100644 --- a/Makefile +++ b/Makefile @@ -886,7 +886,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 @@ -1342,11 +1342,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 Wed Oct 23 19:56:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 876 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 0EC813F08B for ; Wed, 23 Oct 2019 21:57:23 +0200 (CEST) Received: by mail-pg1-f200.google.com with SMTP id k23sf8119814pgl.11 for ; Wed, 23 Oct 2019 12:57:22 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1571860642; cv=pass; d=google.com; s=arc-20160816; b=b7RLCeZea+XXXWbyuVHKxd8iHEB1dyLUpEYJ7KcxWGNtVI3IrnB3f/zVIs1bvNHytv tpFRJNpPDdTkWnU51co7v64leDoak+rDbKJa7z5zTEQPAkMtfh11G3HUt5pqmC/un4BZ QAQaAAFtiDH1uu1GP5iVzFLRoZ6btajU18X5Z+V1yBGzFdHOtpL+j7oQlU+LYKoxLUTC ZPDEednPlGXLXbGNpk0EtCvhQVs6jL9k9HLrk67REIZlBMyKRjBCkn+qHp/KLCw4l8Wf 0QI8lb4APHBzkOeJQTKaKjp9wq0xoaEitouk5IUGMCSrVNlbrfTCeNV3978HhytF3yE5 ObnQ== 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=GlcUOb86xmnmAcY41HZ9LLBqBVbib6JY9ixGBTBnsmI=; b=EgglMEA5lMmypjl+fVgqqfU5EgbgvKKBANZbgjAfpRvfvR3frfKr+tyKqcby31nfND qES4YvBWl7xCG3gWwK0qUWZ3ypU4zDW721zY37C4M6Pri6GDKpB9Hif+ZAxCxjZNpd6q X70xHTUghxwcsYcNa+8OGwkqmLmVPnSJ+NhUUgHtNHEvRupZ1aZnWrEvtCwUwrcCZSCG bUfcuG5MHDh5LDNUxWTcn/ckZ6t//xfGAQ6qb/Jw5DxVDQvQpjKhiNHxq4RpPeKgFgwf VNZm4hoWRV1Mt0//H0LEvbICREvhHVfkOHLsctC7SbgimL+hsIeWqU+ACdCuFno7GP4y yjfA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=NPuhww57; 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=GlcUOb86xmnmAcY41HZ9LLBqBVbib6JY9ixGBTBnsmI=; b=PwmDaveumMWtilJesy+m8dsUeclmOmntpzFk5cmD2u19rgc8CAcmtnxZdw5J3ljJwt f0sFIXp87nYc/ZVL/+mMdE6LsdBdd5h1xLJo8b56/xUVrggYRZWM1RjBUJLULVN7qBrl STil3kC57FW+S4IwDSp94gPkKh295CiQ+clDE= 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=GlcUOb86xmnmAcY41HZ9LLBqBVbib6JY9ixGBTBnsmI=; b=a8XcT+IUZjIqhINyyJL4Mp4pSOiMOuskxebeRq00pn4a5+PPd/AJnZkfzZLOYmSADz oublYOhDhy5e7i75uDLQC+WF3ds2q35HU6/QNiVCrSFDhCZeHuybYBni54IUEzZvljB0 dEcOsQDfI0Oh9uDIOgON6/pYm8W7xwYdnZcs01T+c7N01MABg80fjAUog4LYcfUepmSN aI0iz1rL92hCPIwGXXe8m0d3wQiQRTPtVx71W7aO2jbhAFW0aloZCecRSXJ2BTp+u8ze 7LAVuIK3uOygd81EGSEskUV/AAPjDMBUG9mvJ3e9pBmsr39Ugc2ckz26P/xyGge8KIYV 4e4Q== X-Gm-Message-State: APjAAAX897vD/goAkJtzG85Svlp+RU0xIO+qIepoym40tqfdIXybmXoC AM62I3M72qllGdKu8N/fnury5tEP X-Google-Smtp-Source: APXvYqzhwmz/1yocgqTI1mOAfb5njHinREKbn1Eb4qefvLFHthhjUvJW53+K9YJs+bvGKa1kznowdw== X-Received: by 2002:a17:90a:a605:: with SMTP id c5mr2279634pjq.28.1571860641864; Wed, 23 Oct 2019 12:57:21 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:902:8f8e:: with SMTP id z14ls994188plo.5.gmail; Wed, 23 Oct 2019 12:57:21 -0700 (PDT) X-Received: by 2002:a17:90a:c717:: with SMTP id o23mr2169042pjt.88.1571860641396; Wed, 23 Oct 2019 12:57:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571860641; cv=none; d=google.com; s=arc-20160816; b=Qn1wCFFslpJYsBSwa/GXOIBH+6rwsOwoHuogROUYPW/1Gl113keJK3R1XfV49Kk86f 4jZ+VIRgN85UaVh6wDIlT6A95RdTPVwyuh9mhOX/3FMod8mfV8Ya1DXmxBCnytF02AIL z2XvLM/M+MApLI1aDhk1E8iqt/mqi3Q5TacMwZTS497OqsfB580PrRbcNQtUFOpRQbdL rphA+gdlTHa3EHvGaeTHdBtrmDxSW+3HY9Z5AV2HbKw/xRS+VUdLzXac9iJgqtXyQDBP 6R3/knnlt5frjT1oQwwPwvztnJUs//ieJP2g0SN1CCSBTfXmTFbV7q0E6kb/J6aYAd/q zL4g== 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=UfJRc8TL8ngreDxjNIKHRBze0gZ+aNZujK45sWM+6K0=; b=UG8slAqutSMfkjQSetQ11yn29kW7gN+qWaUZK94IqLMOjDRGZpyHacySAY8x+/lSYT V4L/+7kdEEZ7vLTpesmKRqH8kfZK/3CIzxwwRcUDZPwNSzQdatOM7TcMILWfia3mtcIu WQJ+x6aadYY3lqeIScFndpXmdL4O2aVOuoWfPVSWRSbMgxAHzecWYCAmLmwAPmll7v90 8REDimBzl27eRAlUSSmKon6MRknf6c6MOa38u5Y8ZpoxhIa8FMw1Q/AlL3WFFA0Q2/JR grjGLKn41djZuBMtRlBpWCtRHdop0PraP1+dKA0a59auBYkCgrhWK5jEB0H6RQgNrjMl OKSA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=NPuhww57; 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 j123sor3007878pgc.60.2019.10.23.12.57.21 for (Google Transport Security); Wed, 23 Oct 2019 12:57:21 -0700 (PDT) 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:5448:: with SMTP id e8mr11897058pgm.10.1571860640602; Wed, 23 Oct 2019 12:57:20 -0700 (PDT) Received: from localhost.localdomain ([115.97.180.31]) by smtp.gmail.com with ESMTPSA id o185sm31499280pfg.136.2019.10.23.12.57.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2019 12:57:19 -0700 (PDT) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Cc: u-boot@lists.denx.de, linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, Jagan Teki Subject: [PATCH v4 4/7] Makefile: rockchip: Use u-boot preferred spl name Date: Thu, 24 Oct 2019 01:26:49 +0530 Message-Id: <20191023195652.7158-5-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20191023195652.7158-1-jagan@amarulasolutions.com> References: <20191023195652.7158-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=NPuhww57; 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 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index b58107d6ef..a4278170d4 100644 --- a/Makefile +++ b/Makefile @@ -887,7 +887,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) @@ -1347,11 +1347,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 From patchwork Wed Oct 23 19:56:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 877 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 A5CB23F08B for ; Wed, 23 Oct 2019 21:57:26 +0200 (CEST) Received: by mail-pf1-f200.google.com with SMTP id 194sf17015195pfu.3 for ; Wed, 23 Oct 2019 12:57:26 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1571860645; cv=pass; d=google.com; s=arc-20160816; b=y+nveT4lRGgPBF5xeD+2ucW4oVGbKNYnqu4qQniSZNnm09BhdZliD0J1JBwq6OUic1 QvycX4oi4rzruMAJfCecxmNZhB+R026tSaSX/rURUr4VMFKizXB5RmvgDAmmxCOijvS0 sSRlXgdbOPdlLGojhFlumZDdjkQO+Be8p1u85F7tnsLxpn6kSGaNEnLrIhFPwECvwP7m hOCqndvy9571mk+VvQuoNaeNfpFYudrawL4Il1OZS577myCI0yt3Sszi2IqzYsiAxYD3 Xl8P8ughZ5bAYcaV5sa+6z8jJklJvu4hpelnOzmGuvBo3Sj1VItfJN4t29SfWdZB2mlt 4pVw== 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=JxT2j2MW9eVsYYuWMx2iHTu7mZza9vOhl+2UI5ZR+yI=; b=pHrwMiR34jkpvi5e5c2rJGIjAtYKz3TuD8dxyAvHwS8h00OpSJyHgrfkTCDGbpA6V4 JavICgijjW0w+01aV9GAAaD/Ywbm8/zKLt5NSbaBfl5bUKKJCHbsS/I9t6oW4uedu6G+ i3MjuLp8gaNKzlvXVKFNIKmVQQY99l/s8FwjQDMU+iHJiefIA8aOCmS0w5LqlbMG45Zf ofV/WXf2gnsTaM+ZDKMHYtFVWR21zH2Nltma0ykj5qNuWx2Vg9EgDktD30FmwDLKxqPZ RKEi/evcuT7np3tEf4id7x5RBfYTsdRiAqKyNuB2SIg9vJv0beuEaLxs3vWLB3u83tgV RrSQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=czX038Gs; 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=JxT2j2MW9eVsYYuWMx2iHTu7mZza9vOhl+2UI5ZR+yI=; b=r3/QFX+Zvkz8PgKMbwg3vEjjR+2snKlT4J3gX0KVKspgKCfS/j2k5Qni2MnhOVUtcH H98V+4ryE1zXznMl70fORhNNoN5sojHBAzS2DII7XECQp0ewpHjTcDvFZLKhNeS2biNR qFXcNmbCQQWgkcv8cC/ing1E/5i/267OOTSB8= 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=JxT2j2MW9eVsYYuWMx2iHTu7mZza9vOhl+2UI5ZR+yI=; b=KKQmxcXX/hO9jyb+9Z1c78pVytf/TsBcO2+B2f49HoPJaeYOQSgfBSjW2YQA5nSma+ lNi9K7nzcZGJFXewrvK2kudyXtXEALzWX6NICVYYbilMkfzQvD58JYQw8wgfxXWUIR33 EqJSD8WVGbpxEt3xPdrz+t5ytBawWVSC+RBMDjmM7oWzPZg+qu3ajtWxh04Fe2SS0sGH 2JZ3wnFbrKVtNE82HWXx1xcJLgA0dq/Kch8eZWl/Jv/Ds37ap9x2xsVzJ22z0OyAyFRO XdzDptapWqhFHRSSbHXJqRINThJjWOIx/Jmdvw8V/YndDjAs+j75UGK7SoN6R/i+/+fF WLOA== X-Gm-Message-State: APjAAAWbFNmJ7iwgKKbBFC8NTWsuhjxP4bGs1Rg9QvUb1FMK3Fw1xlOf 1ehUvSSsG7KlOerBNj3nQx5c0lCO X-Google-Smtp-Source: APXvYqzhlfYgyIuF2XzXzw/qtmQ2xVZAbzES3pvETaE0wVpKIlgh1Pnezs6KQTerWBvbLpIaUujYOA== X-Received: by 2002:a17:90a:e285:: with SMTP id d5mr2251849pjz.116.1571860645455; Wed, 23 Oct 2019 12:57:25 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:902:aa91:: with SMTP id d17ls996012plr.2.gmail; Wed, 23 Oct 2019 12:57:25 -0700 (PDT) X-Received: by 2002:a17:902:d88c:: with SMTP id b12mr11755188plz.254.1571860644997; Wed, 23 Oct 2019 12:57:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571860644; cv=none; d=google.com; s=arc-20160816; b=KSsTFtehnhTt4Xi/6/luna5K5YEowICV0JiExQQ/pBNSCT3E25EqPMhcFhpM/irvzj LgrRLFlHs0OU4GM/DnwIKYIWwPwsDJLePjqCrQeIhqdipPwT9fXG08T33k64cXowquRw o4G73RunTH8SGQoJyW0iuUjc/KMZs9GLIAE2BWSPe8+3dWcF4ADsVIO0GD6pztVUVPOV kz1tKgcNHOk0QJ5c7/qvlSUuVXrA0OXsS9HkyhjAUmSD2uFeYnUlnFP/TP+vQl/VUPGe wsD/ZOjGgd1KklGDzOh5qQZZ/UfrXJbXAaTtnMx/hsk3EbDb9TQGWZN41Qvsn+eygaha 3ppQ== 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=A7RLCH/JT0tEl6peEk3sNZgLp9Hip5V/KPZlFnSsfGo=; b=hDQkkSITCpMJ3U3c3bWIkNs2OMch11wUdapo/0pPRcnXsDg4CVZPoNASLj4G1ZrlcL nVxNFscw8+cJO5fmIVcI2c9vIQD/Ng8wJXvcX4WIzNDuhCBJ+SW1IEdzBaRKJQTybaWC W3eT3pJTFlNt+ercHqXXWGLcKrnYi/XecbCw01L1YdLCnTHmQcpCdg9lmB7qKAcW4bXZ jFKUTVh1sEkFnkiRzq2EQAQhwPJ/LmA8IPZ+vbMLxeFQcofPfKdK9anbiEcQ4A0mh8li wQOQj2lmzWvDKXYzVddWdlEhrqrnLOfkWa7RcnJC9oozSdPR7b5swdWZlUTJpCjUoqpm /Vsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=czX038Gs; 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 g8sor20667868pgn.77.2019.10.23.12.57.24 for (Google Transport Security); Wed, 23 Oct 2019 12:57:24 -0700 (PDT) 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:1ca:: with SMTP id 193mr7700923pgb.104.1571860644588; Wed, 23 Oct 2019 12:57:24 -0700 (PDT) Received: from localhost.localdomain ([115.97.180.31]) by smtp.gmail.com with ESMTPSA id o185sm31499280pfg.136.2019.10.23.12.57.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2019 12:57:23 -0700 (PDT) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Cc: u-boot@lists.denx.de, linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, Jagan Teki Subject: [PATCH v4 5/7] arm: dts: rk3036: Add rk3036-u-boot.dtsi Date: Thu, 24 Oct 2019 01:26:50 +0530 Message-Id: <20191023195652.7158-6-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20191023195652.7158-1-jagan@amarulasolutions.com> References: <20191023195652.7158-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=czX038Gs; 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 Wed Oct 23 19:56:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 878 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 8B96F3F08B for ; Wed, 23 Oct 2019 21:57:32 +0200 (CEST) Received: by mail-pf1-f199.google.com with SMTP id t65sf16990762pfd.14 for ; Wed, 23 Oct 2019 12:57:32 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1571860651; cv=pass; d=google.com; s=arc-20160816; b=pA6H4JkhharoQcIWFlb8hqEYElgopbk47HjCx3w7uu2BRK9NV1eBLNNeFT+8cV8Tdm QnltGZoj5AGSUzesADZy5oajbvy8Cmi4AhvwfCyqqQ+q2806rnlhZn+dKIrtpb8iBUil J4X6z40koOm5PzUVqZbYFearJuu6HuyVaseu4Tq3ch31HfCOkuTi+Gcyi3Ndl8IeWDFD qGa8Gm5EFY1MaaBnQKSsjlsMPba47V04cF6USwGG4DbZ2fJFUkWXvm5Hd0fOX4ZS1oDU z7qbaYZYl7eeE55Z4A92GFAztngRoZbPytY4zmQN/4sMCZTt+UHeV/3qn7unjEj645PI dtDw== 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=tMx8HZpjOSg19OwX2xSoNTV5r8rRhV/9eKD7nWIeyM8=; b=qtksrMADX49q0t7/ItNbvdPfD7gYb1icHrH22hr1UEvdeACUfOhe9xobm06nD2MUDV xZQ5/cqpZaN7n5KOKX3yquBJz+m/x68I6o+g9l7gVQmiXaDFuO+QQEamoPwdvXQiDYgx 5fcra5vH4NgTtZ/BHvpAjLSsbZd3ywkzYyz88rpxERNy0+qSX7K5oRtsXOp4hog3srBa WIuM5l8gLy02eKoiLnlUo5c7kEweZMcXwSBj7PduB6cAS31Y9EcsJZQBMy2V0sjND7TO fUq0Q65fTHJsabJ/SKDDIeMuBtRSszP9ujwIPV/ooK1XvkKGGTgsWtecSunGJ401HF/m 8pxA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=CiLzTeAv; 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=tMx8HZpjOSg19OwX2xSoNTV5r8rRhV/9eKD7nWIeyM8=; b=noPLBkIFNUMjmSa+LPfLceSJlTF04HgntWt/vkSFgpMY5R6SV3gx9BZox+hPC4kPsa EnZ6+oYIVs1GlVCif+JXkZoC1DF8zM3P5MiIQ2qyDAUYN4s2H6PqBOLzTz+SxFd8CW9N /EoNn1FaE9uHKpqe+tvlxfdpehnyMwJ/uEe20= 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=tMx8HZpjOSg19OwX2xSoNTV5r8rRhV/9eKD7nWIeyM8=; b=M0xoMTjg2LPgpFANYTKFiWcglNTVNlKCytA12wadjEz6HsWsUdn4Uz0nadiPkQaK+c vt8QBH3wc6uddX2Hl0Ry9/lxcj3Zmc6hZpW1sLbD9AXNSH6yxxEbke11UG3rYxvvVck7 cJkcqooyBNLeJmr/OLqS+9J2c24G/CDxEx3XjVugIKeoaw/VtlJuOGd5Z7n8YmEHtppv gjVjKw9ySCtFzXxfPU0f+2KpXl/yf2zyCFKkPwJ91miFqhmaw9pH0F1ONA+iCrvUS93M 0i3dygxoDKxeQRl7yu4o6DFw90mNoo5Aq/kD0+ShAQBj05LlmbF/IxfieGR+2NcTCvFt FfSw== X-Gm-Message-State: APjAAAWI3TMBKwSwlUAYEjH5/ddEZVgtldYFDOq08hz4JVABGqLn/pDK k3XfmEX7WofpuiuweQj21n6byPdr X-Google-Smtp-Source: APXvYqyFjx7gW8Yk6eqC1jc/wc+ov9IaP5+o55gg+q99vKgn+pABTEF84yLJz+DoYB9WWbL66YDvJA== X-Received: by 2002:a63:d0f:: with SMTP id c15mr11080046pgl.313.1571860651155; Wed, 23 Oct 2019 12:57:31 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:902:aa91:: with SMTP id d17ls996049plr.2.gmail; Wed, 23 Oct 2019 12:57:30 -0700 (PDT) X-Received: by 2002:a17:902:7207:: with SMTP id ba7mr11756433plb.172.1571860650577; Wed, 23 Oct 2019 12:57:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571860650; cv=none; d=google.com; s=arc-20160816; b=Aziqw6Zg81xGJkoo9GH0tJj561HfA0w2lbYtHCnBR8FXu/cAsxG9O1nbqM5e9pvNpH EjhGbl3QTqdNqL9l6pQEoSY/tvJcHfEcdkr4GW210FTWMMdnMyfFal5Sply7CnPRHC65 f14UslzzFrrfSpL6Etg3zoYS6rZulk3syUZ+hpeYPee9DA91SR6akgFTP4AHQTRpWvaJ vxuyqyEAW/JcDz+hydYOM+u7TMBSnPwFRH5bdlixM+uhYt06Afzs9loKBk9QbPnOxRgh yS4Q5ydS/ScbrUb8jNC+ZklkbFsC/K23UbP7FVszqrn/jRJaStQkLWc3zGMPzPktI3Ok a2tw== 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=xYatTQidUvcBY8oQodNSYrAF9VaBOnitFhHzBSyX2+E=; b=x9e2omhXHKoCGIl2MIv+eD16FZVSx7QTwYCkfBPNGxLkqWvbmw2aOJScBozeUv5V4P iEidn7lkkMYrVP6TAcuinFRkUa3eMoaySnaZdgQ8biq91YlkhfPa1wuVVMD9p7lEwkIm P/qax5L+O0iRgNV9FPtQSWruY9hPv2TlFCfoCsMw8hEcX1LAOWLLn3fYnZijwKTz6L/6 z2hmPCOQmjWx7b8R3B3tJcE/LdMuaLf0N7uGwXlkHAs8AIYX34LhHWrYRMAp0R4u3Lg1 VMwITZFnUfCYlg3cS5lf+8zp+aUmWsE/XM6aETl+7o091y0I/8PbCCTMNY42GhmMdLVn L/wQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=CiLzTeAv; 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 a14sor20452872pgh.66.2019.10.23.12.57.29 for (Google Transport Security); Wed, 23 Oct 2019 12:57:30 -0700 (PDT) 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:540c:: with SMTP id i12mr9273758pgb.322.1571860648304; Wed, 23 Oct 2019 12:57:28 -0700 (PDT) Received: from localhost.localdomain ([115.97.180.31]) by smtp.gmail.com with ESMTPSA id o185sm31499280pfg.136.2019.10.23.12.57.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2019 12:57:27 -0700 (PDT) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Cc: u-boot@lists.denx.de, linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, Jagan Teki , "Matwey V . Kornilov" Subject: [PATCH v4 6/7] rockchip: Add Single boot image (with binman, pad_cat) Date: Thu, 24 Oct 2019 01:26:51 +0530 Message-Id: <20191023195652.7158-7-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20191023195652.7158-1-jagan@amarulasolutions.com> References: <20191023195652.7158-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=CiLzTeAv; 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 a4278170d4..6c70106c6e 100644 --- a/Makefile +++ b/Makefile @@ -887,7 +887,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) @@ -1347,15 +1347,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 1df2aba3c2..8107414626 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1594,6 +1594,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 Wed Oct 23 19:56:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 879 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 066D03F08B for ; Wed, 23 Oct 2019 21:57:35 +0200 (CEST) Received: by mail-pg1-f200.google.com with SMTP id w22sf7767325pgj.18 for ; Wed, 23 Oct 2019 12:57:34 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1571860653; cv=pass; d=google.com; s=arc-20160816; b=jR8Dki4cZc00oct0/XOupPRgNwzW4A3697uk0xYnFES2be9poDAsQ8kc5k5lHiax4V oMOznIt7tpa5NGHfQKpNk3X6+okvVSaPbgkuxn5fUlvGgAkvLicscJOmTEW9K9cR622V n3zKE+0xFY3M9EbDJZrBuKnweRANSQ6IpMjfim4kwsLzZ1NbNywdm9N3H47VGQVCDd8A WOkjbsof5SNtqd+gk1ayZBVS1D+6vmGAg1xeicHluKEqcPlc8W8VcVKk8czKFYASem4O zcVlMDT2e9Jd7SoPUin7sSLtWO3hvpznzBGK8AuXA8tprcmSatlK6OijjII9G4su9Xgr REog== 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=Za2LW8jZ3sUbBy2MPqpw34MShg713R9UJHind7gDCYoQKKFsZsWWJIHifxf2jPPeGh SIqPBgeSmsi8AvJbRrw/crkPoX9PuMMvdCPyJzCu6DH42EZvNNBsnWjasUIeCM3ypUOc JINFxNu7CQSb+23m6YT2zS6aHyaBa/RV7Laza56qTLzM5qpBr4+Lm0hAOPPTPC3YZRx7 kBbWFtkE8LZFGYXQZtBawUKq/ye64SUQj2dHXFQ0hypHCtm96tgYy0y0EddNx/1KVEZ1 ciBjrIeLy/Dp29VWLxjcTj/aB84a4VqZC05Yd3yvxiOhBcXSf93pni0LNhrj11DMwiSd gxiQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=bY+O+beJ; 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=UGPHFHmTCIs9u4T12GPxq9ocVcwSiIBsUDnXyDw4dD0QrYHORKXvm+2oMqU+/Z4IDA tHKzqVcEXFulTsuD5nuWLBSmCEGd5NwPlLF0Wja93o1xfoStnsCy/9tf0wa4eHgJ4n2p CAijqigSQ+t8SHEST3fPfasyjdUG4IbdJMeJY= 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=oTpatEiKz2v1C6XoNaiOtSHImnWwUBKv3fxOJV4B90st2bxuAeev5x0PN1bWkimtUh oQCbababMqVEtYULD39gfmBOnimQ2bZ5RjoZBHdAWRmrfYbnwM2SVPYX7ki7Bu7VgLcT /zwZzs5C+iGxyLrk1AhEdYgEL1Msi+Nm/WAhHJuN2lMB32d+CE6dAi45Lls+KRVUoo2G cPcQfpCzYyN3s1o6XZ8fH+4ilWDBzbNXcpjJsYgswDNsCwl0OIQGZ5H9NIX4W4JKYkhb u/r4fk2ylcKbKe3Mtg4mcRffeBILvDbemi93N1ExjeLKXgGDIxa3LFsFrQwJH2wctmiA ggkw== X-Gm-Message-State: APjAAAXczC4zNNkNu8HDLaj4+p3LzVyRlMwQV6WumEZMrNPXmUGbN5MA xFXgf8bGwMFrT5s+GN+ASM1OraBg X-Google-Smtp-Source: APXvYqzoR0LKUPWktsTTT0V5bvC9N3hmqMFMtA2zB5RpfqKjx5AhJhUqAR6oxSSYla/BPqnBnXOzTQ== X-Received: by 2002:a17:90a:fd83:: with SMTP id cx3mr2174623pjb.64.1571860653772; Wed, 23 Oct 2019 12:57:33 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:902:d216:: with SMTP id t22ls998552ply.4.gmail; Wed, 23 Oct 2019 12:57:33 -0700 (PDT) X-Received: by 2002:a17:902:7448:: with SMTP id e8mr3053098plt.149.1571860653240; Wed, 23 Oct 2019 12:57:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571860653; cv=none; d=google.com; s=arc-20160816; b=aWF8j7Q5sK3tE3aTqyPxCLZQsArkNlBbJ3kz4ZXQtKs7EIN0VfPbZNFRO2F2p4H1KD JmwviwpWLfXXu3kiXxUV5O31S/2hZuYcssJ1+KxaYO9co0ZVodaRU8OZgeo66iqGcOHY HPcDKu9gQkbJ39PDsC81cyetukKAWnlDb0tmuGJjmjgVb0dc2YNctgZkl5VNsg2FAnG4 wZij16YWFVF8KWHvob46b8kFuBXwM/vPFKou3ttX8xsT8Yp2Y4zr4wcQxJlHqisCEN7a PckhJBdC9hAyPrnRvmGHxSdcn0iWIf4io6jkUW3mbvpfyPmcY8wSebbmzYeFPALSeJsz ZuFQ== 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=0hKHD3Bcd5WuASbXUjd74CKeUTMXQ+h9zACX4zAFRQ4POnI8giXX6KJEistuakUbC5 qBWE8VldffAR8IqECNDaWVqIshmucCwsWrg4iOSZsq0bT78OqPJLG2PJ2tzuMm8rVuea NxHIQc/BZLrEVPFr2ix6UJ8jLx06bOXb8SpuprHWGne6BHJKEoZRTr6Q6nBJVvSWyZV/ EEAm6e0c6jEJ8AnbamO2Vc5djreSIWqtCM1vRrhgqFNClL/avZxgsj44YhfROLJUhU2W 1ErQCPZfiOyQsy+88Iwb2F172uNrg59R+wlIAjby8jrOKfN635kCcmEuOwEI7hOwjMgn /3WQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=bY+O+beJ; 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 98sor12185664plc.56.2019.10.23.12.57.33 for (Google Transport Security); Wed, 23 Oct 2019 12:57:33 -0700 (PDT) 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:902:6ac8:: with SMTP id i8mr11067329plt.164.1571860652779; Wed, 23 Oct 2019 12:57:32 -0700 (PDT) Received: from localhost.localdomain ([115.97.180.31]) by smtp.gmail.com with ESMTPSA id o185sm31499280pfg.136.2019.10.23.12.57.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2019 12:57:32 -0700 (PDT) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Cc: u-boot@lists.denx.de, linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, Jagan Teki , "Matwey V . Kornilov" Subject: [PATCH v4 7/7] doc: boards: Add rockchip documentation Date: Thu, 24 Oct 2019 01:26:52 +0530 Message-Id: <20191023195652.7158-8-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20191023195652.7158-1-jagan@amarulasolutions.com> References: <20191023195652.7158-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=bY+O+beJ; 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