From patchwork Thu Jan 9 18:46:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1220585 X-Patchwork-Delegate: ykai007@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.a=rsa-sha256 header.s=google header.b=pEbJHhTS; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47tw9S1xylz9sPJ for ; Fri, 10 Jan 2020 05:48:12 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DAD2381918; Thu, 9 Jan 2020 19:47:48 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="pEbJHhTS"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1FE9881919; Thu, 9 Jan 2020 19:47:48 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pl1-x644.google.com (mail-pl1-x644.google.com [IPv6:2607:f8b0:4864:20::644]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 8E05181916 for ; Thu, 9 Jan 2020 19:47:45 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jagan@amarulasolutions.com Received: by mail-pl1-x644.google.com with SMTP id c23so2905723plz.4 for ; Thu, 09 Jan 2020 10:47:45 -0800 (PST) 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; bh=d+jIcib05LKVddxJcU9EnThFBXIIwGZfMc8WfDOiGuA=; b=pEbJHhTSzh90Pa3BS+J/INBm1HoAmSZhBSbBYavCWDQ2cC2itkm8zLv0jVvqQLIyWX XPh6OOUIRWjqI6/JSpnfAOOJo1fGh9qoLtoN9qDmLLYVsxuMID2NNgZCsWZZfJu829Bk 1s8utlZWilcpTy9HnI8aOPuoRZaH/fnPWVZyw= 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; bh=d+jIcib05LKVddxJcU9EnThFBXIIwGZfMc8WfDOiGuA=; b=trEoNrUniEwf0WbTh5uR5rT01TxD4APQfeH5CF3tE409e0ro4QDBV3RckftN1o6WtH dyBEOr20MraInGGxxB/ibtq/rZrtmRdMBHLNN3Gf8r5W6gTdklJpYAmASWmvumEQjuVB iCNh8oMbaCd32ALgborIjtiS4fc45LU5M1ZA/TaMoO0GL3jS1EuJkfEz0nyM4nVe8kQp MPXD3np7ZTo8qAO4ja6VQFON3jjezJ753klJqsBZFJJq3BBXbp6wrNtxsVY4ED4U5n2w 44Xzn301JDUhGBSDaoxxdkfebRSqix2ohIQ7YFg1i8d8ky20ID4O9WCSQew6opAfoRx3 rVoQ== X-Gm-Message-State: APjAAAWa/XCFcdCPIp4nGOLwxcwq+4p72XX77NqV3LGWNnHrBbmoOPKi iFTFKyduqIwkW5gSnr4ykAFx+w== X-Google-Smtp-Source: APXvYqwiYq1s+qUJYh4FrWX3LIvmdwuRvjhsSZmy4VWYfzzgogmBIrkJOS2iWQsPITMW2CfQPOeyqQ== X-Received: by 2002:a17:902:788d:: with SMTP id q13mr12929692pll.210.1578595663950; Thu, 09 Jan 2020 10:47:43 -0800 (PST) Received: from localhost.localdomain ([2405:201:c809:c7d5:c4eb:be5d:1485:edee]) by smtp.gmail.com with ESMTPSA id i8sm8967306pfa.109.2020.01.09.10.47.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jan 2020 10:47:43 -0800 (PST) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Subject: [PATCH v7 1/7] Makefile: Add rockchip image type Date: Fri, 10 Jan 2020 00:16:16 +0530 Message-Id: <20200109184622.3098-2-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20200109184622.3098-1-jagan@amarulasolutions.com> References: <20200109184622.3098-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.26 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-rockchip@lists.infradead.org, u-boot@lists.denx.de, "Matwey V . Kornilov" , linux-amarula@amarulasolutions.com, Akash Gajjar Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.101.4 at phobos.denx.de X-Virus-Status: Clean 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: 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..e264b2a49a 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_SPL_SPI_LOAD),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 Thu Jan 9 18:46:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1220587 X-Patchwork-Delegate: ykai007@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.a=rsa-sha256 header.s=google header.b=hyrLjcMT; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47tw9f724Pz9sPJ for ; Fri, 10 Jan 2020 05:48:22 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B8A7481927; Thu, 9 Jan 2020 19:47:57 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="hyrLjcMT"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0D76681928; Thu, 9 Jan 2020 19:47:57 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pg1-x543.google.com (mail-pg1-x543.google.com [IPv6:2607:f8b0:4864:20::543]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 6D26881926 for ; Thu, 9 Jan 2020 19:47:54 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jagan@amarulasolutions.com Received: by mail-pg1-x543.google.com with SMTP id q127so3633967pga.4 for ; Thu, 09 Jan 2020 10:47:54 -0800 (PST) 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; bh=svFOCP+Hi5ZqvIKYRk6Zycpu9rLX5NELckQLxT8y0tQ=; b=hyrLjcMTYh8xhAFVAWDvAXRCSj1X0xBFAFA8845Z5PkhcDRFFfz4RDShhytZW6CJ6B zA7rJUvNjmtl0fV6MI/lMqYZka4MOEHURxGW99HvrSZ5Z+WYAQvVmWpfAM4/7O2LcPzN vZGGUJ7vCbhmwjiBFiGqUn3emouPr+vQQD7R4= 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; bh=svFOCP+Hi5ZqvIKYRk6Zycpu9rLX5NELckQLxT8y0tQ=; b=DZdFNQ7t3cDEUncZDvARk+4D6DGqgZjdTDydfvGpa/zFN6XRT1g9pSsEBr5pV7JSuy yVEfXiEZHUdns0fTWx/p95hyk65H5Z0dNtoCob35b4GtJdfwHH1HijTaYVz9D7ke+F7o 8iJMHkz7W8a1bwnoIUzF/oaK4YQRCWF0/73zAw4qBsGep372/X3wcZgFIS7ZsoTb1hQr +S1fQPLxiUW62gg3CSobZPxJyf/XpAzKinub4ZVwiVSZE4a0qCTAc6gMYmrXstYi+Omd k9nm6g4z8I74E5o0TcOvl5xEZfJwUHizHVAYbBoNIyTtCDA+Wos2rA6dMP8gwxu5okPU rngA== X-Gm-Message-State: APjAAAVfmZbio2TJLjpFcpcvASx03OPm8PKdYVt+/MB2ZdcPdtH70Y3A mzqSKKPw/9ScMIdKKyxSbTupYA== X-Google-Smtp-Source: APXvYqx8itwUsZvmhFP9is/hawvqZ6ec0rHI+bA3A2mUezV2+yD+RoSTB/ke79oQ08ormUb2wkTNkQ== X-Received: by 2002:aa7:9191:: with SMTP id x17mr2565462pfa.38.1578595673069; Thu, 09 Jan 2020 10:47:53 -0800 (PST) Received: from localhost.localdomain ([2405:201:c809:c7d5:c4eb:be5d:1485:edee]) by smtp.gmail.com with ESMTPSA id i8sm8967306pfa.109.2020.01.09.10.47.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jan 2020 10:47:52 -0800 (PST) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Subject: [PATCH v7 2/7] Makefile: rockchip: Suffix platform type with tpl name Date: Fri, 10 Jan 2020 00:16:17 +0530 Message-Id: <20200109184622.3098-3-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20200109184622.3098-1-jagan@amarulasolutions.com> References: <20200109184622.3098-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.26 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: u-boot@lists.denx.de, linux-amarula@amarulasolutions.com, Akash Gajjar , linux-rockchip@lists.infradead.org Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.101.4 at phobos.denx.de X-Virus-Status: Clean 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 e264b2a49a..50ac12fe9b 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 Thu Jan 9 18:46:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1220588 X-Patchwork-Delegate: ykai007@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.a=rsa-sha256 header.s=google header.b=oP0uRYPA; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47tw9s65KWz9sPJ for ; Fri, 10 Jan 2020 05:48:33 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DE15A8192B; Thu, 9 Jan 2020 19:48:11 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="oP0uRYPA"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0884A8192A; Thu, 9 Jan 2020 19:48:11 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pg1-x543.google.com (mail-pg1-x543.google.com [IPv6:2607:f8b0:4864:20::543]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 7B71F8191F for ; Thu, 9 Jan 2020 19:48:08 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jagan@amarulasolutions.com Received: by mail-pg1-x543.google.com with SMTP id k197so3619086pga.10 for ; Thu, 09 Jan 2020 10:48:08 -0800 (PST) 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; bh=ZU8kvWg4m+hftYZcxYVQAS3W4JM96ciVS2kwizCqq9M=; b=oP0uRYPAEAOaggQ/REYXW7UaoBex/A5GL3FZCs1QGkko9ghyflhb3SrVuOyzqryGoe zjECopiK6iv1k58vemjNePDUvPKAJ7QDgspQKiQPaij3c2i4hssiJI8GIEe1KLlf9ynq EiziVUGvM1SjR8imUjwD/pJm4xoXp5bMqDuKQ= 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; bh=ZU8kvWg4m+hftYZcxYVQAS3W4JM96ciVS2kwizCqq9M=; b=KzHlIe45e7pMWPM1htcNCaQpdjOOfhtgpCnFI9AYd9pVHdIem7ynqVQ9r3kutW8OdD /b+abJRNlyrbb6lXRIzhD8y1U/v2aT5ycSoz5xz5lperLVY0dF9phGeSkf7MyftI2CzA XnFIB9HpHmBQ0e6yHgvOCUUshyP/BqDUEzNQJFO0+Tk82YaG1Zx14foui6snKXED8UUO Tof3a7XnweE9K82cp2o3xTdE4PQxhlO1SsU+Rzl65U413fsCY8SR0O/ntELjs+eHuiyq gl8h9uFVHopcPDqioUpMt04NAOz/f52Wq2UUGqukA/7HVMqNTRZIE7unLvJmqSsEr7A9 mN7g== X-Gm-Message-State: APjAAAUz3QoG4sQrC+KYQ3vcHTI+1wWEmDz+LJThYZy+LkcYYZBR5Jks YbPZVm/sY8Z5lNRorclpMT4SpQ== X-Google-Smtp-Source: APXvYqz5tJVW15+xI0hAosP1sJb7rIXahl8WM6ylzL3uzisT540VClKQiLvR58JFHSrWcZ6Gpul7kA== X-Received: by 2002:a65:6898:: with SMTP id e24mr13386669pgt.59.1578595687111; Thu, 09 Jan 2020 10:48:07 -0800 (PST) Received: from localhost.localdomain ([2405:201:c809:c7d5:c4eb:be5d:1485:edee]) by smtp.gmail.com with ESMTPSA id i8sm8967306pfa.109.2020.01.09.10.47.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jan 2020 10:48:06 -0800 (PST) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Subject: [PATCH v7 3/7] Makefile: rockchip: Support SPL-alone mkimage Date: Fri, 10 Jan 2020 00:16:18 +0530 Message-Id: <20200109184622.3098-4-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20200109184622.3098-1-jagan@amarulasolutions.com> References: <20200109184622.3098-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.26 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: u-boot@lists.denx.de, linux-amarula@amarulasolutions.com, Akash Gajjar , linux-rockchip@lists.infradead.org Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.101.4 at phobos.denx.de X-Virus-Status: Clean 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 50ac12fe9b..5361524f77 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 Thu Jan 9 18:46:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1220589 X-Patchwork-Delegate: ykai007@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.a=rsa-sha256 header.s=google header.b=YH6eV3eC; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47twB42G6Lz9sPJ for ; Fri, 10 Jan 2020 05:48:44 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 22B3B8192C; Thu, 9 Jan 2020 19:48:24 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="YH6eV3eC"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 607858192C; Thu, 9 Jan 2020 19:48:22 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pf1-x444.google.com (mail-pf1-x444.google.com [IPv6:2607:f8b0:4864:20::444]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id C7E0F81909 for ; Thu, 9 Jan 2020 19:48:19 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jagan@amarulasolutions.com Received: by mail-pf1-x444.google.com with SMTP id i6so3787635pfc.1 for ; Thu, 09 Jan 2020 10:48:19 -0800 (PST) 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; bh=ohtCegxGTC6Cqe4V14RfDztSgq/DwnKYmeUpgrodjx4=; b=YH6eV3eCDtnsHKmePAzRqe3RQsvPnizhVNvcWdjktOnGpGxH4BAeL3txaetnNsYdky z+T2RR/xrZLWofAFTm6k/CrV6OTAWxRrfJJ19YlPZchL0yxPJsaYUQi/fnLaZjxz57u4 7Vjldo3IZqS/7DtauzKRakDF2yH17MImwn/bk= 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; bh=ohtCegxGTC6Cqe4V14RfDztSgq/DwnKYmeUpgrodjx4=; b=naH8vyXhv+vUxuLIaL0oRYcNGZyrxit52kwuOKsxJ/J+HqwxYcKlJmFvVTmXG+sTIj ekcsmNXzw1stw6f73621+iCx/yye/SzMP6R0oslkn/QqFTFMFU6/XUaUpeJoHtxJq2BE sptdAh7Wxx/aDr1t1sNI+b/vZWYqJxViOIWHHQ33Q9hDsU5RvVEoMz/zUZ3FN1Aoie4o 1wiu7Rbf2lnQ9C0ys5EmQdP5/5RwQ+XKmBkorztP3IYIYW1U22Ffdez3K1Npl5iVyXBl 6gXdVJlDFML3orgxQtotasctTb5RL60td8yrb4OusAkkdiRkPxpz2+W7leWPq3F2mVYJ DIAA== X-Gm-Message-State: APjAAAV1wZ+3CKrVpFH4flK9aCSjuSOyjP1D1UU9Pq2DUCPUK0C0tO3d Iac7CUgye+j7h4PCFdTFrdxKbw== X-Google-Smtp-Source: APXvYqxRFGs4yozuVbdMQ9qGzD8SKZnYZxyPBrekHt8IsGLUMZIWVQvWESICQZFhVkb40Yk7hKRErw== X-Received: by 2002:a63:213:: with SMTP id 19mr13075880pgc.160.1578595698338; Thu, 09 Jan 2020 10:48:18 -0800 (PST) Received: from localhost.localdomain ([2405:201:c809:c7d5:c4eb:be5d:1485:edee]) by smtp.gmail.com with ESMTPSA id i8sm8967306pfa.109.2020.01.09.10.48.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jan 2020 10:48:17 -0800 (PST) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Subject: [PATCH v7 4/7] arm: dts: rk3036: Add rk3036-u-boot.dtsi Date: Fri, 10 Jan 2020 00:16:19 +0530 Message-Id: <20200109184622.3098-5-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20200109184622.3098-1-jagan@amarulasolutions.com> References: <20200109184622.3098-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.26 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: u-boot@lists.denx.de, linux-amarula@amarulasolutions.com, Akash Gajjar , linux-rockchip@lists.infradead.org Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.101.4 at phobos.denx.de X-Virus-Status: Clean 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 Thu Jan 9 18:46:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1220590 X-Patchwork-Delegate: ykai007@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.a=rsa-sha256 header.s=google header.b=YC3EvEdb; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47twBH6y9Yz9sR1 for ; Fri, 10 Jan 2020 05:48:55 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 64B5581916; Thu, 9 Jan 2020 19:48:36 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="YC3EvEdb"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DB20C81909; Thu, 9 Jan 2020 19:48:34 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pf1-x444.google.com (mail-pf1-x444.google.com [IPv6:2607:f8b0:4864:20::444]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 3385781909 for ; Thu, 9 Jan 2020 19:48:32 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jagan@amarulasolutions.com Received: by mail-pf1-x444.google.com with SMTP id x6so3768189pfo.10 for ; Thu, 09 Jan 2020 10:48:32 -0800 (PST) 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; bh=JN+8+Nyqtv8x9KontYLpWObUjUyrnqdpOzW75jef2Gs=; b=YC3EvEdbcM8sWmRZs1v4NU/GCFvalamRKgYE/DaCNljFrht0nUpEy5iWNY8043czpC w3cUIFeUk3Tq+VTJptBq5PjtsaopldvXGi6jQ/RuL60cZHVEHiteoGxhiEGflA7QYDG7 mWDuCEKz0RfL6gL+jCt+54RYix+L1EZYvSRlc= 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; bh=JN+8+Nyqtv8x9KontYLpWObUjUyrnqdpOzW75jef2Gs=; b=miS/LEDkL3FotvU7/ibo9vQ62rI50yQvjNMQDSqwl8wZz9etyN6Acw196I7tDBmbDn FHmMp1C5h9VqPxtiO7b9fosswoMSpQ//E488tyq9GimKNn5izHqAY1YSyGi+b5XozU00 y3Fv462I0JCq0U3uE4awK1n4rn9tdJmkx9spO4JVstDMDrbwT/FeUFo3tvXwtqQL86qv aPKOy1zGNh8n/7vyzYqiX32/4inrFR/d2mSYLJbBWjImIc8xKSK/AxQetv463PCLJnv/ c7kor4nKCfy2lyt5d1H7AFBfGzwk0U0ElBXyE+xVNbGtK1hgyhLuW4/0OpRdEObZB9Ah gXCA== X-Gm-Message-State: APjAAAUwvkFJBHj5SUGIcNAdMYi/kaK1fh90JsZ5KNWlfu8nuRUCzfjC moh05wZiE1DiT42dqwsk7yqxcw== X-Google-Smtp-Source: APXvYqzOQwcIXmilDQyaodX5NPubR/o8wbXoxBCjhqKcyxgNoWSBpnMa29lDsl0a9FzaBee+HGyOjw== X-Received: by 2002:a62:b418:: with SMTP id h24mr13287164pfn.192.1578595710879; Thu, 09 Jan 2020 10:48:30 -0800 (PST) Received: from localhost.localdomain ([2405:201:c809:c7d5:c4eb:be5d:1485:edee]) by smtp.gmail.com with ESMTPSA id i8sm8967306pfa.109.2020.01.09.10.48.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jan 2020 10:48:30 -0800 (PST) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Subject: [PATCH v7 5/7] arm: dts: rk3188: Add rk3188-u-boot.dtsi Date: Fri, 10 Jan 2020 00:16:20 +0530 Message-Id: <20200109184622.3098-6-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20200109184622.3098-1-jagan@amarulasolutions.com> References: <20200109184622.3098-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.26 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: u-boot@lists.denx.de, linux-amarula@amarulasolutions.com, Akash Gajjar , linux-rockchip@lists.infradead.org Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.101.4 at phobos.denx.de X-Virus-Status: Clean Add U-Boot specific dtsi file for rk3188 SoC. This would help to add U-Boot specific dts nodes, properties which are common across rk3188. 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/rk3188-radxarock-u-boot.dtsi | 2 ++ arch/arm/dts/rk3188-u-boot.dtsi | 4 ++++ 2 files changed, 6 insertions(+) create mode 100644 arch/arm/dts/rk3188-u-boot.dtsi diff --git a/arch/arm/dts/rk3188-radxarock-u-boot.dtsi b/arch/arm/dts/rk3188-radxarock-u-boot.dtsi index 1bb5408592..204bb3a90e 100644 --- a/arch/arm/dts/rk3188-radxarock-u-boot.dtsi +++ b/arch/arm/dts/rk3188-radxarock-u-boot.dtsi @@ -3,6 +3,8 @@ * Copyright (c) 2018 Fuzhou Rockchip Electronics Co., Ltd. */ +#include "rk3188-u-boot.dtsi" + &cru { u-boot,dm-spl; }; diff --git a/arch/arm/dts/rk3188-u-boot.dtsi b/arch/arm/dts/rk3188-u-boot.dtsi new file mode 100644 index 0000000000..1e7d079315 --- /dev/null +++ b/arch/arm/dts/rk3188-u-boot.dtsi @@ -0,0 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Jagan Teki + */ From patchwork Thu Jan 9 18:46:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1220591 X-Patchwork-Delegate: ykai007@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.a=rsa-sha256 header.s=google header.b=dOaqQCRg; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47twBX2QB6z9sPJ for ; Fri, 10 Jan 2020 05:49:08 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 69C9C818FE; Thu, 9 Jan 2020 19:48:50 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="dOaqQCRg"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D7893818C2; Thu, 9 Jan 2020 19:48:48 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pl1-x641.google.com (mail-pl1-x641.google.com [IPv6:2607:f8b0:4864:20::641]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id BC04081926 for ; Thu, 9 Jan 2020 19:48:43 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jagan@amarulasolutions.com Received: by mail-pl1-x641.google.com with SMTP id g6so2907299plt.2 for ; Thu, 09 Jan 2020 10:48:43 -0800 (PST) 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; bh=lJIMf+9YZW+X6GdFWHZpRH4+lugUPac38t0E8telXj0=; b=dOaqQCRgCyyMkKq7oLsjHHiFZCMitz/EPJ3lnSXlvMD5Jfqo17spbAXIbyRo/10DAx dJlBlpt6vO63/vwU1LeAy9yd283EoeT8kV3qrjbPggCGpscTyQR9p1dCVoZ/ogLl2Kav Uol/gsdZ73+KZYQDLsGZF97iMrGO0XBv3Qefc= 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; bh=lJIMf+9YZW+X6GdFWHZpRH4+lugUPac38t0E8telXj0=; b=dq+aFrt5itDebZLCsr6jRy3Fbkkz92XAhg/LijfRf/FA2JH/xibeJHd1MFH1Zdqpco UrgcSYX5r9ADHG6nmaNuV6CaoUDVNwt5/keuccXBmnx3dPHV/rW0FwL66zRrNJkNaAQj F0BHsrZYw6wZiCvyc3Z8GdMOxSXd6ReWIE0xmJrKAcXpGPmbs/cV3DeR9mmFu4RFOBpF +leBvKUd1TtLFPHhZeIZl5QLo9JAHrm8/KIC5ZvfUEH0wg2bNXddSgTgPbeXLewxMkfw 9Myn5fMMktbh4R1DKdoQO5qOC8RUwOWtt3VLMjYsdsuU0egjWJGCWtOXctv/IrOPng3u xXPA== X-Gm-Message-State: APjAAAUMX0ef5/L51u2OYn3gfioCW2k79BKMruTZglW/i01O0v0lPBtd aoQwSrpOH3kqfj8zvqGA2yFYrQ== X-Google-Smtp-Source: APXvYqzt0kWtQqZ2QN1STaAsjev3pJYcMv7YcL6bzeqQHm9yf8VAun4Ih/TIiZ5qKuFj1YKNqTLBSg== X-Received: by 2002:a17:90a:200d:: with SMTP id n13mr7269727pjc.16.1578595722296; Thu, 09 Jan 2020 10:48:42 -0800 (PST) Received: from localhost.localdomain ([2405:201:c809:c7d5:c4eb:be5d:1485:edee]) by smtp.gmail.com with ESMTPSA id i8sm8967306pfa.109.2020.01.09.10.48.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jan 2020 10:48:41 -0800 (PST) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Subject: [PATCH v7 6/7] rockchip: Add Single boot image (with binman, pad_cat) Date: Fri, 10 Jan 2020 00:16:21 +0530 Message-Id: <20200109184622.3098-7-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20200109184622.3098-1-jagan@amarulasolutions.com> References: <20200109184622.3098-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.26 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-rockchip@lists.infradead.org, u-boot@lists.denx.de, "Matwey V . Kornilov" , linux-amarula@amarulasolutions.com, Akash Gajjar Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.101.4 at phobos.denx.de X-Virus-Status: Clean 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: Matwey V. Kornilov Cc: Wadim Egorov Signed-off-by: Jagan Teki Reviewed-by: Kever Yang --- Makefile | 14 ++++++++++++-- arch/arm/Kconfig | 1 + arch/arm/dts/rk3036-u-boot.dtsi | 2 ++ arch/arm/dts/rk3188-u-boot.dtsi | 2 ++ arch/arm/dts/rk3288-u-boot.dtsi | 2 ++ arch/arm/dts/rockchip-u-boot.dtsi | 21 +++++++++++++++++++++ configs/phycore-rk3288_defconfig | 2 -- include/configs/rockchip-common.h | 3 +++ 8 files changed, 43 insertions(+), 4 deletions(-) create mode 100644 arch/arm/dts/rockchip-u-boot.dtsi diff --git a/Makefile b/Makefile index 5361524f77..1d71a77cbb 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-rockchip.bin endif LDFLAGS_u-boot += $(LDFLAGS_FINAL) @@ -1395,7 +1395,17 @@ idbloader.img: spl/u-boot-spl.bin FORCE $(call if_changed,mkimage) endif -endif +ifeq ($(CONFIG_ARM64),) +u-boot-rockchip.bin: idbloader.img 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: idbloader.img u-boot.itb FORCE + $(call if_changed,pad_cat) +endif # CONFIG_ARM64 + +endif # CONFIG_ARCH_ROCKCHIP ifeq ($(CONFIG_ARCH_LPC32XX)$(CONFIG_SPL),yy) MKIMAGEFLAGS_lpc32xx-spl.img = -T lpc32xximage -a $(CONFIG_SPL_TEXT_BASE) 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/rk3188-u-boot.dtsi b/arch/arm/dts/rk3188-u-boot.dtsi index 1e7d079315..41ac054b81 100644 --- a/arch/arm/dts/rk3188-u-boot.dtsi +++ b/arch/arm/dts/rk3188-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..a2559e2db0 --- /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 = "idbloader.img"; + }; + + u-boot-img { + offset = ; + }; + }; +}; diff --git a/configs/phycore-rk3288_defconfig b/configs/phycore-rk3288_defconfig index 2f10c7a3b3..ee164a9083 100644 --- a/configs/phycore-rk3288_defconfig +++ b/configs/phycore-rk3288_defconfig @@ -19,8 +19,6 @@ CONFIG_DEFAULT_FDT_FILE="rk3288-phycore-rdk.dtb" CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000 -CONFIG_SPL_I2C_SUPPORT=y -CONFIG_SPL_POWER_SUPPORT=y CONFIG_CMD_GPIO=y CONFIG_CMD_GPT=y CONFIG_CMD_I2C=y diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h index 68e1105a4b..b55e09a9ca 100644 --- a/include/configs/rockchip-common.h +++ b/include/configs/rockchip-common.h @@ -9,6 +9,9 @@ #define CONFIG_SYS_NS16550_MEM32 +/* ((CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR - 64) * 512) */ +#define CONFIG_SPL_PAD_TO 8355840 + #ifndef CONFIG_SPL_BUILD /* First try to boot from SD (index 0), then eMMC (index 1) */ From patchwork Thu Jan 9 18:46:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1220592 X-Patchwork-Delegate: ykai007@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.a=rsa-sha256 header.s=google header.b=QgC4yrBv; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47twBl6PTmz9sPJ for ; Fri, 10 Jan 2020 05:49:19 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7F9B981917; Thu, 9 Jan 2020 19:48:54 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="QgC4yrBv"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8F9438186F; Thu, 9 Jan 2020 19:48:53 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pf1-x441.google.com (mail-pf1-x441.google.com [IPv6:2607:f8b0:4864:20::441]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 3C1A08186F for ; Thu, 9 Jan 2020 19:48:50 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jagan@amarulasolutions.com Received: by mail-pf1-x441.google.com with SMTP id w62so3770996pfw.8 for ; Thu, 09 Jan 2020 10:48:50 -0800 (PST) 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; bh=RV+d12yuIQSCZ/M2vOO9iyyB/0NvK5sAyrZn/RyXJus=; b=QgC4yrBv+FeckqLpGGuGoIK8ExKkfGZQZklCP6m3wEVaWxN4OJjOhpLmIBcXsXVzTo gH/ATYeAV7DT0p2DMQ+mIoHlG2lhbv5dTBjLgrezQyDRw2nPy4/A1FN03vzG2gyB/qwk cDMK4IW1x6g5LdOjp4KFegAxmjw3CpsvpY4GE= 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; bh=RV+d12yuIQSCZ/M2vOO9iyyB/0NvK5sAyrZn/RyXJus=; b=a5JFxqMAoIU0tLywaFmx9KLLvjzPzkbA2UPNeNdvkVrStvPHpWSdsEMZnv6Qq28BVu tyYshm0FLYcI9U5xxCF9T9wf0Au38N4ZWDneJnG4lcP2RtQ1tfL9fUUFPzbmnyB8KMvf JKMuWJeO/Y8IUUTxVs4r/0kxsoBIHmcTrOXf+VewS7Br0mr5CyUcxrtlz+xLQrniGumE R6+fKDRs2Wc+5t33n9Iil751U/H/cG/PaWKbLO2GzDnmPKPxWx7Ed/S2pRiL8UwQrEZQ QlvJXuVty7B7nFeiv0eRGd+S53Gr7WRAE2y5YVNWyjFPgvMqizI+TPZGkk5xkTcqWoVP Bodw== X-Gm-Message-State: APjAAAUpBnjZgeNVL4TXZiw+lzmnhYN/S+xQaI0t5ILpMjJVrYZ8kCzc Td5kn5mBev0Qb9awnLXsY4C1yg== X-Google-Smtp-Source: APXvYqy/aEM520W/aKX8zkmsmfUA17s+YFngzDmqICFsB1mbQh7MJOD204V3lHVC1hgIvWywXxTp7Q== X-Received: by 2002:a62:342:: with SMTP id 63mr12756077pfd.19.1578595728451; Thu, 09 Jan 2020 10:48:48 -0800 (PST) Received: from localhost.localdomain ([2405:201:c809:c7d5:c4eb:be5d:1485:edee]) by smtp.gmail.com with ESMTPSA id i8sm8967306pfa.109.2020.01.09.10.48.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jan 2020 10:48:48 -0800 (PST) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Subject: [PATCH v7 7/7] doc: boards: Add rockchip documentation Date: Fri, 10 Jan 2020 00:16:22 +0530 Message-Id: <20200109184622.3098-8-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20200109184622.3098-1-jagan@amarulasolutions.com> References: <20200109184622.3098-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.26 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-rockchip@lists.infradead.org, u-boot@lists.denx.de, "Matwey V . Kornilov" , linux-amarula@amarulasolutions.com, Akash Gajjar Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.101.4 at phobos.denx.de X-Virus-Status: Clean 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 Reviewed-by: Kever Yang --- doc/board/rockchip/index.rst | 10 +++ doc/board/rockchip/rockchip.rst | 130 ++++++++++++++++++++++++++++++++ 2 files changed, 140 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..cd9c8d6dc4 --- /dev/null +++ b/doc/board/rockchip/rockchip.rst @@ -0,0 +1,130 @@ +.. 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 +- Add rockchip TPL image building +- Document SPI flash boot +- Describe steps for eMMC flashing +- Add missing SoC's with it boards list + +.. Jagan Teki +.. Fri Jan 10 00:08:40 IST 2020