From patchwork Sat Jan 4 08:38:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 11317575 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0A97313A4 for ; Sat, 4 Jan 2020 08:38:29 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DD4BB222C4 for ; Sat, 4 Jan 2020 08:38:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="HFM4g0A+"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="gJUAqMV8" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DD4BB222C4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=qrgZhClzTlWj3rLqurI4uA7PGGc4WIjAiLGn718Ki7I=; b=HFM4g0A+WgXGK/ AS5/dKjNIFtcWY9vX8H/2l3ASFyCAF65uE4EeCP9mCNldJtCM3VQnVlXvg3X+J21gjqHmjRtwgK5S Rw5Rsne8z4FDTv8bm9VIhE+sZSVA7YpwgDFdfUpNqkxQLPjzZO6d78VccMuD5fPYmzFwntxbpClOv PVm93twP5g+MIpGVSzZS68TJrjOxRF3u5FixFiSAqOYjgGuovw33QBaeLFknoMQxyQS1po0roYeoa 5E9xG85t1YNifzKKS3JmJRJGKbzJ/zJckewLD0lqlii6iURn4H3Cdsd9yZet9tCEwY/4fv4av5wLY kJpfiUQ31xvxjcD/88lA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1inex0-00038l-99; Sat, 04 Jan 2020 08:38:26 +0000 Received: from mail-pl1-x641.google.com ([2607:f8b0:4864:20::641]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1inewx-00036x-HY for linux-rockchip@lists.infradead.org; Sat, 04 Jan 2020 08:38:25 +0000 Received: by mail-pl1-x641.google.com with SMTP id c23so19901529plz.4 for ; Sat, 04 Jan 2020 00:38:23 -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=uFc+KeHVvPb55BWADcWbagsPR+XJZj6DCQVbpAY2/9o=; b=gJUAqMV8ZL2IfJw0qiSCnVcr6YfYxBFbZ5ieh4lIoRc+kBtnXTj0lWMCq8UdYYO7Yx EApQAtTH2jvmGN3FocYuDz5aTFzACouufbhEDH2p/1b3YksvUcm/oosPEcG3uHVqxi/X oiLSHqHiaazMFUbe1XdkCHGzini0j5onsi9ls= 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=uFc+KeHVvPb55BWADcWbagsPR+XJZj6DCQVbpAY2/9o=; b=f9eg5H0Ta1qPyUNTMA82K0Etzho8/1xAdMyhDosygmQM1z5+Z/EpDO53hJCqmNJ04A mez0OB/GnEWh/DqQ2AxBHTbGtp4Fo0HhJVfgqDh2sCRTAoEFRvRcRlgNrvKnjhnNVNuB pbC/W/w3s2pa522YrXLCJlx0mKYn3DTyFXGKnOweTLNACf0SxaCvSD7hQ5+7xwBnmTNM iUSKujNfYDcKw5th85aNNx4f1aY6REC/aN/YJjlulIDYv4kviUqwXnTZaPBtrbu9yA2z I8mM4AZPotttVgjBJc+xbKTdFpbiGBQnpJ/XkxxjBnECg3KpAG2O8HRBjwp4DEW/VO3I QvXw== X-Gm-Message-State: APjAAAWyI9wpin7L7+KnjSKyNcRgntzby4VzNPvY/zYqJs/b8m4etS6G QXyYXZe92wwYbQ+EEeZnsll7sijMf9k= X-Google-Smtp-Source: APXvYqwc+09ApQi9UmP4qy+1CWQmgzXIQ/+xYb9N39bCeBjl5th2tCFGIFR3qtSIry2ci25tyd/fDA== X-Received: by 2002:a17:902:b210:: with SMTP id t16mr45346253plr.65.1578127102639; Sat, 04 Jan 2020 00:38:22 -0800 (PST) Received: from localhost.localdomain ([49.206.201.128]) by smtp.gmail.com with ESMTPSA id z4sm70201623pfn.42.2020.01.04.00.38.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Jan 2020 00:38:22 -0800 (PST) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Subject: [PATCH v6 1/6] Makefile: Add rockchip image type Date: Sat, 4 Jan 2020 14:08:01 +0530 Message-Id: <20200104083806.3930-2-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20200104083806.3930-1-jagan@amarulasolutions.com> References: <20200104083806.3930-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200104_003823_622479_768B45BE X-CRM114-Status: UNSURE ( 8.01 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:641 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-rockchip@lists.infradead.org, u-boot@lists.denx.de, "Matwey V . Kornilov" , Jagan Teki , linux-amarula@amarulasolutions.com, Akash Gajjar Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org Add rockchip image type support. right now the image type marked with rksd, So create image type variable with required image type like rksd or rkspi. Cc: Kever Yang Cc: Matwey V. Kornilov Signed-off-by: Jagan Teki Reviewed-by: Kever Yang --- Makefile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e20a206239..9998d238f3 100644 --- a/Makefile +++ b/Makefile @@ -1374,7 +1374,15 @@ u-boot-with-spl.bin: $(SPL_IMAGE) $(SPL_PAYLOAD) FORCE $(call if_changed,pad_cat) ifeq ($(CONFIG_ARCH_ROCKCHIP),y) -MKIMAGEFLAGS_u-boot-tpl.img = -n $(CONFIG_SYS_SOC) -T rksd + +# rockchip image type +ifeq ($(CONFIG_SPI_FLASH_SUPPORT),y) +ROCKCHIP_IMG_TYPE := rkspi +else +ROCKCHIP_IMG_TYPE := rksd +endif + +MKIMAGEFLAGS_u-boot-tpl.img = -n $(CONFIG_SYS_SOC) -T $(ROCKCHIP_IMG_TYPE) tpl/u-boot-tpl.img: tpl/u-boot-tpl.bin FORCE $(call if_changed,mkimage) idbloader.img: tpl/u-boot-tpl.img spl/u-boot-spl.bin FORCE From patchwork Sat Jan 4 08:38:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 11317577 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 362B9921 for ; Sat, 4 Jan 2020 08:38:33 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 14AFF222C4 for ; Sat, 4 Jan 2020 08:38:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="a1DY+1y/"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="iybUH2ff" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 14AFF222C4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=lMGF8mBkBMYchI00YGwHS4i9XqdpkXBqKlbpRwgpyCQ=; b=a1DY+1y/6mK57h gMHKqeIhfgjTPr1+LdHtI69bJIqRFiHpqQshoRUDzA9q0CC+/YpfXd9FSoQKrh/rhA7XrPOy7CFKB bO1XTaeRoE36iIbRixWDrez0x7yGwDcvrnndwiA4k9C+/qlG3yv62tcR1aQ0gy14jAgn94F+oyHvp jwhiukS85+ThxW/bHCN+6iQmJ/yvB7HyQBTmX8yKVrxtMtPJ1bfuOrYER8t+7GRHPoGb639wTn4x6 XwWl/1Ts69oZS/Ce5MAon4wRMPXqkboJvz1zkW2jJUrty+gBFaGAgzlKJNdWShWTXkHFrb5PNKV5g RL45e0E9X31hoS/DL5Gw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1inex4-0003BL-KX; Sat, 04 Jan 2020 08:38:30 +0000 Received: from mail-pf1-x443.google.com ([2607:f8b0:4864:20::443]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1inex1-00039O-Pa for linux-rockchip@lists.infradead.org; Sat, 04 Jan 2020 08:38:29 +0000 Received: by mail-pf1-x443.google.com with SMTP id x6so23477986pfo.10 for ; Sat, 04 Jan 2020 00:38:27 -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=MdVD38WP8mrB9cxL9ngtMTtlvhd/lrRFS5qqLyy/3UM=; b=iybUH2ffwHZ8FvY3iZPk+LR2t8dDtq9viG0yL0TPSFkLRlTWCIcLZw7dfijQhVNjvu xggC//+3voyj7FjBrB6BQYlm6APrE4CDPNYjMwehXmtudqpw2o0I4c55omBmRgfbfXq+ C5+HDr2m7KIvuEBhKq6Kj3L5DK9NZls9Ycz6k= 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=MdVD38WP8mrB9cxL9ngtMTtlvhd/lrRFS5qqLyy/3UM=; b=hrGjqk/fgW08zXZsgX0rZd7wf9DxxwZyeXd9L7jRPiVMZR5loASF+/7vC2G2OCBGvy +PYWlMEuw2r5WmBXXQ2btaAStAKgmy+ijbDbjZJGv7zgSLYZE72Rlu4EvovxnryKsOOu 4RkvD59jTB9ZwmJYoKjPRG7epBNc7lGnXVLIuFPRwcuBoJRFronLQGDkxvGdNYK6dfV1 bUSLLM9ARThJzgdZHR5H90R8ee0LurPa9I4jU5BRBq19djn1dmo2HcQJS6byOKfETcHB 0Sj+ll1y9fzVtzo2VZjiwcsDwe1ZGmkCiq8MZ9CjIZFB2t3KI20lN1YiUc+FP7NWXRqo 11FQ== X-Gm-Message-State: APjAAAXe3u8qqYZ9VzCWKwgSeev0L18mStf9ZYw/zd7JirGzdOk7X3Sm ZRcyJACfXb4KaCb1ZZ+y6ACTXw== X-Google-Smtp-Source: APXvYqwb1SzoGzh6oVwYxLX1rGGD/h1bIHAGWoWY9zLKIVVjVY3T8CX9gCYgbLdMkUz6RSO7x9kIGQ== X-Received: by 2002:a62:be12:: with SMTP id l18mr80665263pff.226.1578127106636; Sat, 04 Jan 2020 00:38:26 -0800 (PST) Received: from localhost.localdomain ([49.206.201.128]) by smtp.gmail.com with ESMTPSA id z4sm70201623pfn.42.2020.01.04.00.38.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Jan 2020 00:38:26 -0800 (PST) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Subject: [PATCH v6 2/6] Makefile: rockchip: Suffix platform type with tpl name Date: Sat, 4 Jan 2020 14:08:02 +0530 Message-Id: <20200104083806.3930-3-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20200104083806.3930-1-jagan@amarulasolutions.com> References: <20200104083806.3930-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200104_003827_834097_D95FD2A4 X-CRM114-Status: UNSURE ( 9.92 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:443 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-rockchip@lists.infradead.org, u-boot@lists.denx.de, "Matwey V . Kornilov" , Jagan Teki , linux-amarula@amarulasolutions.com, Akash Gajjar Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org Most of the platforms uses the platform type on their boot stage image naming conventions in makefile like, u-boot-x86-start16-tpl.bin - x86 start16 TPL bin u-boot-spl-mtk.bin - Mediatek SPL bin This would help to understand the users to what that particular image belongs to? and less confused. On that note, suffix platform type rockchip for existing u-boot-tpl.img so now it become u-boot-tpl-rockchip.bin Also, bin is more conventional way to include it on tools like binman, pad_cat etc in future patches. Note: usage of platform type doesn't follow consistent order as of now. Signed-off-by: Jagan Teki Reviewed-by: Kever Yang --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 9998d238f3..e519103be4 100644 --- a/Makefile +++ b/Makefile @@ -1382,10 +1382,10 @@ else ROCKCHIP_IMG_TYPE := rksd endif -MKIMAGEFLAGS_u-boot-tpl.img = -n $(CONFIG_SYS_SOC) -T $(ROCKCHIP_IMG_TYPE) -tpl/u-boot-tpl.img: tpl/u-boot-tpl.bin FORCE +MKIMAGEFLAGS_u-boot-tpl-rockchip.bin = -n $(CONFIG_SYS_SOC) -T $(ROCKCHIP_IMG_TYPE) +tpl/u-boot-tpl-rockchip.bin: tpl/u-boot-tpl.bin FORCE $(call if_changed,mkimage) -idbloader.img: tpl/u-boot-tpl.img spl/u-boot-spl.bin FORCE +idbloader.img: tpl/u-boot-tpl-rockchip.bin spl/u-boot-spl.bin FORCE $(call if_changed,cat) endif From patchwork Sat Jan 4 08:38:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 11317579 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 39F08921 for ; Sat, 4 Jan 2020 08:38:37 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1860E222C4 for ; Sat, 4 Jan 2020 08:38:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="B909F5RM"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="W7T61wSE" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1860E222C4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=nRXNLJ7RtNTPup/j9Un5fAVsjhU445rGKq5UXRFxzr4=; b=B909F5RMbuZc6T aw5ueKMOq9b9iTd6z4VTvstZGtvqu6/UEft+DwmXkO4pyN5ICCC5S91lOLY07r8R5rEz2F+thsOzS lMaWP9VMPUjBFgbtxskzpul8ddDqWf4GPpxUJKIf7lxgtWjVFdsIjOkzg4f8mJ7jGQ/D20zqAVgEf dH7L6AYq4kzEu1DhWDQ+ZMUR1B0CA0BBQa7i+ERdnaVWtwnpoz42JDnodDJAdKLUJuL777qSpuZF0 vwC3GDUnrpmRXj+dAsuDIWQagSK8Z/g8291ss6TDpNofA0YhXfLQt9q9CPbldwOknbwQM7Bke5KCj jgyDdV0Ak7qvhGUzmZIg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1inex8-0003EO-P2; Sat, 04 Jan 2020 08:38:34 +0000 Received: from mail-pj1-x1043.google.com ([2607:f8b0:4864:20::1043]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1inex5-0003C9-TZ for linux-rockchip@lists.infradead.org; Sat, 04 Jan 2020 08:38:33 +0000 Received: by mail-pj1-x1043.google.com with SMTP id s7so5662439pjc.0 for ; Sat, 04 Jan 2020 00:38:31 -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=fCEJAVTeFVKCDScEQscaeQ9cpdN3+DTMCdxgai1STTg=; b=W7T61wSENS++/58kjL+YAxWogoRtvumbSUc5D+tciCvnpWHx2sFJattxwu+QYD5Gd8 l8xzcPfRMml45eORZT7l3xyad2slTD0sGA8ymrdvUeau3tHPFHFai9P69QRD/1syrBfH vvmEAlfQNgP7y/nfDjS4fiUcgOaRclA+GnrLQ= 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=fCEJAVTeFVKCDScEQscaeQ9cpdN3+DTMCdxgai1STTg=; b=a8HXUIJK4jhCBxJuSC8GAS3PBuKWzhtbvp2JC3b2YTGMF7Nuo4OvcsJ8fViqyegaL8 M0gAHxmqku85Pb3eQT2oVI4uPMDvCrLqAkrMhyOXkMl3ClpXBh95ya34RMfAiMtFpCGS eKeVZ1h0FwiBQoMLvvd8kGK+ULZznpfKf2VyvW3kIz4n2w9ec9acvC8DywQHwZdBAA/v QhvHTLD+DHWepkb7B+/X6ixxYHBbY/JdCCOxpCx9cCiXT5JlD5F8xFCIjVnUD4Etgxq0 sSYBjyf+oBSO44rG1A0aA64rWRfdtqyJBj6Y1rRo4gPekGMfhEM1CfdPTQCUXiUp2qPD 8gHg== X-Gm-Message-State: APjAAAX4S93ocl/l1f7o5RlCzer/adhTeeTWfxO13NMLOrKtVwux6G2u UbEvs5Uu+f9XmT7R+TXABvUITg== X-Google-Smtp-Source: APXvYqyb6yrATUp0Gtpf8eeI7akRbSpXDQWi8AZSyL0uj+xRevGk7Iko+f8+SRDGWhkepEOzj6FbKw== X-Received: by 2002:a17:902:8e87:: with SMTP id bg7mr70053365plb.279.1578127110826; Sat, 04 Jan 2020 00:38:30 -0800 (PST) Received: from localhost.localdomain ([49.206.201.128]) by smtp.gmail.com with ESMTPSA id z4sm70201623pfn.42.2020.01.04.00.38.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Jan 2020 00:38:30 -0800 (PST) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Subject: [PATCH v6 3/6] Makefile: rockchip: Support SPL-alone mkimage Date: Sat, 4 Jan 2020 14:08:03 +0530 Message-Id: <20200104083806.3930-4-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20200104083806.3930-1-jagan@amarulasolutions.com> References: <20200104083806.3930-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200104_003831_968623_FE136581 X-CRM114-Status: UNSURE ( 7.66 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-rockchip@lists.infradead.org, u-boot@lists.denx.de, "Matwey V . Kornilov" , Jagan Teki , linux-amarula@amarulasolutions.com, Akash Gajjar Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org Add SPL-alone mkimage tooling support via Makefile for few platforms or boards used in rockchip family. With this users would get rid of explicitly creating mkimage tool for rockchip rksd or rkspi boot modes. Signed-off-by: Jagan Teki Reviewed-by: Kever Yang --- Makefile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e519103be4..d8a0f68883 100644 --- a/Makefile +++ b/Makefile @@ -908,7 +908,7 @@ ifeq ($(CONFIG_MPC85xx)$(CONFIG_OF_SEPARATE),yy) ALL-y += u-boot-with-dtb.bin endif -ifeq ($(CONFIG_ARCH_ROCKCHIP)$(CONFIG_SPL)$(CONFIG_TPL),yyy) +ifeq ($(CONFIG_ARCH_ROCKCHIP)$(CONFIG_SPL),yy) ALL-y += idbloader.img endif @@ -1382,11 +1382,19 @@ else ROCKCHIP_IMG_TYPE := rksd endif +# TPL + SPL +ifeq ($(CONFIG_SPL)$(CONFIG_TPL),yy) MKIMAGEFLAGS_u-boot-tpl-rockchip.bin = -n $(CONFIG_SYS_SOC) -T $(ROCKCHIP_IMG_TYPE) tpl/u-boot-tpl-rockchip.bin: tpl/u-boot-tpl.bin FORCE $(call if_changed,mkimage) idbloader.img: tpl/u-boot-tpl-rockchip.bin spl/u-boot-spl.bin FORCE $(call if_changed,cat) +else +MKIMAGEFLAGS_idbloader.img = -n $(CONFIG_SYS_SOC) -T $(ROCKCHIP_IMG_TYPE) +idbloader.img: spl/u-boot-spl.bin FORCE + $(call if_changed,mkimage) +endif + endif ifeq ($(CONFIG_ARCH_LPC32XX)$(CONFIG_SPL),yy) From patchwork Sat Jan 4 08:38:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 11317581 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3EFDC13A4 for ; Sat, 4 Jan 2020 08:38:41 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1DCE9222C4 for ; Sat, 4 Jan 2020 08:38:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="GoVhwrgS"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="IIYRBXbO" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1DCE9222C4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=EQRuc/0WPtACaOCH0dZpRe0O9Yep0g2SIHfVe0BMNbo=; b=GoVhwrgSQgkxAu sY0UuCzqK3FSwP202lagg4xgZgwcevdoE7OKkVgv84sMGuDxeoEQG3cbIH/60H8nANO9sqmVwtHV9 djuX7Mvp2J9PhnSjCtERrMmsRNDOfbUwQfaDZGifqm7X2G7ozM8hp3nOXXgBreQHkpeqMv8aGLTtg WNpp0uAhEjgyxA85JklOjPirOJ8FCeJgjrFandfdhuuFP6Yp0yV42wgP+RKt70Key9+SUo+mOp4BI 5i7BADe3ztZh1nPIZM1XfhAX3ZjHnlw6LsO/yKnY3pwRTKQQEL9x3Dr4Am+NVT870MDgDa3ofiLI+ yjNg//oQ5gy/HyRTH9BA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1inexC-0003Gs-ML; Sat, 04 Jan 2020 08:38:38 +0000 Received: from mail-pf1-x442.google.com ([2607:f8b0:4864:20::442]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1inex9-0003EQ-EY for linux-rockchip@lists.infradead.org; Sat, 04 Jan 2020 08:38:36 +0000 Received: by mail-pf1-x442.google.com with SMTP id 4so24564924pfz.9 for ; Sat, 04 Jan 2020 00:38:34 -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=IIYRBXbOsGH8hXV6YBbKcuDH0M61UCJvQ0sBQqLsIIVm8VskXQe84D6X3VlaRx/D2f bFQ0daYQYsH80C6qSe3pBUnT/ySnmTh1AR2M7vN/icFSX/vkn20zE9nDzNb9Hfc/daX1 oDnY1Gx9+ADOaCpI/FusdE7k0IoxXz2seeeT4= 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=ajbN4adcS3wH72Zk3YZkvA7GaPXJprKPa3Y0PB9WndOKKc5C6QpTteQhhUAZJavi3t BSiVpuaN8H8nzIDUs0H1UzEFuAJmSllZHMUfYg4SGkw0o+9TgVKTWFLdVtub7YVNo52k t3RpfZ8IWeQsVDDBy8W00WRvenmDegju0XkhropkgXzMoR5Xi6r5iVeP8KaX03MfTtTW BcRY8TusuK2axszZJsZwQW7tOj+/iZM1D7iFwL0l6gKbYYM+5dbgrVC0z2Hq34KkEUUe CcY3eXBt0CFrY0pAH1E0+Clzzg9DDJjrLmwYnUNhpp2NtyTszyaa87sZuIdY3WWDWxWW ApWg== X-Gm-Message-State: APjAAAWP0TuP7kiZUikuK5zhjtmcPEjV7nVKe/mLNHDNSdMTXeQyBnDK oI7stWRMEzlkrU8n+l9jCn4w5C9m3is= X-Google-Smtp-Source: APXvYqw2OCsNMxRwHD8S/UVu+fKwlJ+ecHoAH72qZztKGuNCA1dgNImD+ep66LSJjLdjTEyfYFm3vg== X-Received: by 2002:a63:1853:: with SMTP id 19mr97741447pgy.170.1578127114436; Sat, 04 Jan 2020 00:38:34 -0800 (PST) Received: from localhost.localdomain ([49.206.201.128]) by smtp.gmail.com with ESMTPSA id z4sm70201623pfn.42.2020.01.04.00.38.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Jan 2020 00:38:33 -0800 (PST) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Subject: [PATCH v6 4/6] arm: dts: rk3036: Add rk3036-u-boot.dtsi Date: Sat, 4 Jan 2020 14:08:04 +0530 Message-Id: <20200104083806.3930-5-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20200104083806.3930-1-jagan@amarulasolutions.com> References: <20200104083806.3930-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200104_003835_512789_CB371135 X-CRM114-Status: GOOD ( 10.47 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:442 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-rockchip@lists.infradead.org, u-boot@lists.denx.de, "Matwey V . Kornilov" , Jagan Teki , linux-amarula@amarulasolutions.com, Akash Gajjar Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org 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 Sat Jan 4 08:38:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 11317583 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 83DC613A4 for ; Sat, 4 Jan 2020 08:38:44 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 623DF222C4 for ; Sat, 4 Jan 2020 08:38:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="tJzYhi8o"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="ANS5+bvk" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 623DF222C4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=asAusme2RUvxvJofw6+CiQUhZbri5hiFd3gVpGW7KrI=; b=tJzYhi8oJ+AH+S +7qPX10Hf/cGngwnoUoULoULmVFw8aWxySoq9aAO7QGDvkaRw8zkXR3BnxWQmTJRzklvMfpT7bngi 3L5RncfNTLpzM8rDRa6SM9CVv7oB40KP1fKlEs3bX8GY2j3BmBfoxiORB1zZfaUNS7oRwAAtVYHfU wiU4EVjXZn5cXT5FTFBODKKtag5cC1EqikvcQrdNlfOdD0feA1d0pzwlMHnEGEJSEyTWiyCiXRzVG VMJIS3MoYUesN/jOWp6s58dmA7A0sCEp7VT5UWZ+k12oKNMKsYVJwHQq1iLkFZRjOhMiePFE5KCHk sg4qbAMctBqimTz8feyQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1inexG-0003Je-1v; Sat, 04 Jan 2020 08:38:42 +0000 Received: from mail-pg1-x542.google.com ([2607:f8b0:4864:20::542]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1inexD-0003Gl-7e for linux-rockchip@lists.infradead.org; Sat, 04 Jan 2020 08:38:40 +0000 Received: by mail-pg1-x542.google.com with SMTP id b9so24456107pgk.12 for ; Sat, 04 Jan 2020 00:38:38 -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=ehwuJZnRKKx5EZ4MhrVjA+CzbfF6qtPzoe+uGVxNIwE=; b=ANS5+bvk/K/TTlFzy4lYM3OpXfKAQPZwfqx2vlf4COOJUXdAGE/TYdvNlCqa38KGRJ dXqXRCAjFm+NcSrh1ThTG2/NrWxE+2YqyT94HYIbqJTplzRYc6n9ehBspcpPvlQowJSo 8vJgQTrHgz1DNV7vDpi68k3CpbQNBOSaAUAao= 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=ehwuJZnRKKx5EZ4MhrVjA+CzbfF6qtPzoe+uGVxNIwE=; b=BYtH1j7Y/ieNqvT3Qx6zbq9wEG+iKSxFE8iC4ZzfEOH51Huu8YdHVyzykoptjlKfVn zbt2tD2zOVGUsjQyOCnKH9fTvwgGME97pc8HHRfyrW4jKRj7b015fLth6packkHKrVNp csAu1URijFReFnUnHHGRcZoIyh0vx81dZb42mati7h0/BRU9SO4Nr8wPxS+KBaIjeJtm XsJ8sbw5WBywhC7p5GPEwAJlHnilW9Cim0pyu1sQJekIqlLPSq+urgfValYTl7Lq8hGe 4G5fRj9qgn2XaD+HARFtlUzF94zR7aHlPmNqDg7lQD7aUWMrdkBHT1CMq5396ziyQFKB 9a1Q== X-Gm-Message-State: APjAAAUpCsnbZMdpM3wpPwwzCSMPiVVzcKLbuRueoLLSRNSBuo4JCgge V1AddXfKq3CANDpsX2NGwqwm2anFgmI= X-Google-Smtp-Source: APXvYqwj+S4ETzhwogUdDVkSLbEcNa0HG6yhIJemSwhIEUCFULHXzXUwSY6XHRxH552MWrfblrruXg== X-Received: by 2002:a63:1a1c:: with SMTP id a28mr104679008pga.374.1578127118072; Sat, 04 Jan 2020 00:38:38 -0800 (PST) Received: from localhost.localdomain ([49.206.201.128]) by smtp.gmail.com with ESMTPSA id z4sm70201623pfn.42.2020.01.04.00.38.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Jan 2020 00:38:37 -0800 (PST) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Subject: [PATCH v6 5/6] rockchip: Add Single boot image (with binman, pad_cat) Date: Sat, 4 Jan 2020 14:08:05 +0530 Message-Id: <20200104083806.3930-6-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20200104083806.3930-1-jagan@amarulasolutions.com> References: <20200104083806.3930-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200104_003839_293754_BBC8F0DF X-CRM114-Status: GOOD ( 14.41 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:542 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-rockchip@lists.infradead.org, u-boot@lists.denx.de, "Matwey V . Kornilov" , Jagan Teki , linux-amarula@amarulasolutions.com, Akash Gajjar Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org 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 Reviewed-by: Simon Glass --- Makefile | 14 ++++++++++++-- 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 | 3 +++ 6 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 arch/arm/dts/rockchip-u-boot.dtsi diff --git a/Makefile b/Makefile index d8a0f68883..cdd3eb4614 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/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/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 Sat Jan 4 08:38:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 11317585 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B0427921 for ; Sat, 4 Jan 2020 08:38:47 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8EBBA222C4 for ; Sat, 4 Jan 2020 08:38:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="hBwWNCIX"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="NnPb4HWK" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8EBBA222C4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=PPBzJswyKmll+Sq39ufcGhzb79HxyAGGFwrwyusznuw=; b=hBwWNCIXc4hxRt zAjldlFd9ehJgzNy4DflX8i3oQgNhCYoZck8tGSZrIE8YEFuTvtP8fvt9WV9BRDUEgeEbWfxdFHVP Bc6J+m9Csw6Z3pezFvDUJCt/GC1wW0r2Tf/d3wnpnd1KUR+Y5Ur94j9T6YUZySrYDFT7SujFd4Xw8 shLu7izpAO/YBavIpsC4FQul3TiTI7juefqwDk2igUSUBO7RE75k18+OAxk/wr6Yv4taKXIYWrPZg bNLZeJHaxocH87QBH4DXeITvS/Hu996xWqvb127gG1/tEY0eOXBT7o4hfAH8GLz8bITmgIqewewAx R/JZdae9aDl4UnvBHARw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1inexJ-0003MF-0y; Sat, 04 Jan 2020 08:38:45 +0000 Received: from mail-pl1-x643.google.com ([2607:f8b0:4864:20::643]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1inexG-0003Jk-7I for linux-rockchip@lists.infradead.org; Sat, 04 Jan 2020 08:38:43 +0000 Received: by mail-pl1-x643.google.com with SMTP id g6so19911143plt.2 for ; Sat, 04 Jan 2020 00:38:42 -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=g4cWf3FBE3zdBAFpTRzwkWLhbqmjDXkUilYmTikUnN8=; b=NnPb4HWKoKDbADlF1/UlGmkF1rDMW+RjzpchoCCqZEuj44DbmSCdFRA1yJ+Bs8uRec fT7OoL9LDf1jw1Rk+k4s273dBERHnp2kIyzreFPnAIdkUg+gLgQEUdPMjxmYRFsZK2rW G2JdN7VIvS4TwFhl7ZlU52bVIof2I5h6/3ABQ= 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=g4cWf3FBE3zdBAFpTRzwkWLhbqmjDXkUilYmTikUnN8=; b=sHv11LjHU6K4UHldjzoSSKmgZ5gAWyHclQ0nz5ghJawuJzQeCVYdLtZgvWZWMx2FuY TS60aTyRxcXa9eo57M/24UjL5VrS0TvRqtYZkMVl9J231EmQKlH/dWHedi2+bMaKqJnL t9xwhCmneIUd499SUiRSb7jrBJEjBaYDcxBNLx2P9rwO1IrDTgxsvPsgwi+j+WLUzY26 9LewmhuBgV+nl8BJ6yE+zB3FPDnAP31pdHFA6fVfwZ9lCzGdieAGvSnkZ5z3i6k9k99Q 24k5Z6fSIbrTTaJzI39LG+b+YgSm6tRIow4cWf1rhwlaBK2/rgl+T0k317PqzGIe09on mkqQ== X-Gm-Message-State: APjAAAVH6sxzew8OV3OflnegE3kM4DAoK3re6zZzZUAZkA57GF6LNcwB Z24QLGluJ2On7S+TueiCrcVmdg== X-Google-Smtp-Source: APXvYqyHwbSDA9cVcqEOTTJyRxv9kf22kcx9GbRGzhdGEiT9WaSrXr9BvBsPagx3gbcPO4wWl3nujQ== X-Received: by 2002:a17:902:6b83:: with SMTP id p3mr82245420plk.284.1578127121634; Sat, 04 Jan 2020 00:38:41 -0800 (PST) Received: from localhost.localdomain ([49.206.201.128]) by smtp.gmail.com with ESMTPSA id z4sm70201623pfn.42.2020.01.04.00.38.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Jan 2020 00:38:41 -0800 (PST) From: Jagan Teki To: Kever Yang , Simon Glass , Philipp Tomsich Subject: [PATCH v6 6/6] doc: boards: Add rockchip documentation Date: Sat, 4 Jan 2020 14:08:06 +0530 Message-Id: <20200104083806.3930-7-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20200104083806.3930-1-jagan@amarulasolutions.com> References: <20200104083806.3930-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200104_003842_285397_34ABBC1F X-CRM114-Status: GOOD ( 12.21 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:643 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-rockchip@lists.infradead.org, u-boot@lists.denx.de, "Matwey V . Kornilov" , Jagan Teki , linux-amarula@amarulasolutions.com, Akash Gajjar Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org 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..6c34f1ab99 --- /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 +.. Sat Jan 4 14:00:54 IST 2020