From patchwork Tue Apr 30 06:45:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shyam Saini X-Patchwork-Id: 345 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 165F33F0E1 for ; Tue, 30 Apr 2019 08:45:59 +0200 (CEST) Received: by mail-pg1-f200.google.com with SMTP id d1sf8547551pgk.21 for ; Mon, 29 Apr 2019 23:45:58 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1556606756; cv=pass; d=google.com; s=arc-20160816; b=t0WdqldDUzBnMsMdPxoHuw/Au7oElJ7Ez3UzdnN01uBM9HdEaqm1R4HRxx2U2qvdbN rNu53e8oouVnkTMq6uiWzE5TJb54RU2FV+yJUPmU4X2Bs+O6Pq0y331Ut/zlWtwE04Nm CX6wW7eHImX/IzDRsqAgyzfXOh32JHeY3ZwPrlwc76fYc75KK9vd8k2YZshRbtENH3Zd ZZF7TlS55ctjmnkc/V7VNf+Ewbz3czn4FUmOFeZNktQrrMHESKl+1ocMaGnUhKQyrVAg s1aprYUPl0oVU9mgq0m3O2mOHs4Z81PugNUN5N/qUj2v2javvO723J6/wONMPz6fIX7x kIYg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:message-id:date:subject:cc:to:from :mime-version:dkim-signature; bh=Yr3hDr5zOl0JQujayyWryoEwRbMRoUgkE1ZBARSrUfg=; b=z+nWqU9RDKV3rLGdzQL5a5XJtecnJ1ZF+prZ8uUdApypqzFwtWUbpdZlNrznY4hYwp 3ZicL8sdJFVwJRt/lsmdEZ6pDWfYp0b5h95ijb5NV1eX65rv2pDaILw7D3PKbx2dSV8M XSOrFeuLx1xe5PzEkjzwMEZNNHi7jtDgjoH1XOVUBCZGQYzhE1pvn1fjgHLopEP7uBnR OOkI3iS1dBiYeIKs2ntZSI/OayqpLwAGKUJxdqvICojDv0mDYfa2aBVyO1KxlgWj+M52 hHqbUxccCoarsGrLaSLGFLhlGzIwhezYDFWBAejGfGSZklzD8c04rSAhjnJ2mhFWtkIr txoA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=fHQnqZwt; spf=pass (google.com: domain of shyam.saini@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=shyam.saini@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=mime-version:from:to:cc:subject:date:message-id:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=Yr3hDr5zOl0JQujayyWryoEwRbMRoUgkE1ZBARSrUfg=; b=dZVHbBw6DuQDtp1T7tTbWPStAEPlQ1lQ2PfWYUfVcQIF+5T2Xl6fs7wCBhjbxHbKa5 6AkMcm6D9f3HimmkJ2v+gGajk9Pntx5JpTioJB/H2T7kOfSWmooMhSEUKMQt4rp3szF0 9/PtuiZMOghDjZL9nEAOtu9AONZqeZIGs7WaA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:to:cc:subject:date:message-id :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:x-spam-checked-in-group:list-post:list-help :list-archive:list-unsubscribe; bh=Yr3hDr5zOl0JQujayyWryoEwRbMRoUgkE1ZBARSrUfg=; b=I2FidPzpEMzOEPBUIQwzNeoX620OW8LpgU/pl7D7HCIbFCjPahTILPEJCKTPSpQxfp R4Bv02lC5RxkX5PP/a640pv0gJzs7gCd+rMYn0pv1HECDGtWp3JL7q5gQgyEAMunD8Mg ck0Lit1cqmCelKuugnait5rdCgQflxFMfbIE1UXu6qh49Ch3zm1JP4PVpHKGp90A5XOF TEqK9rQDt9YP1jLWreCVxr+xkuGfUI5pOIU30+Na0m6R/VPAz8H49nSbcBGgcpn6pRfZ 3YMLAIEgOm9+eslgnuGHaWMCqs6Z46ISLZKIUhmWTmh4KymbIMcHP0JgMaEIj1mxU44S ZTMQ== X-Gm-Message-State: APjAAAWP5IkZZwTRtPvdTomdmN2jzfCfPRr6lpiWSUxcTp1WOWG6tvGE +KmdFCe8p6AhluGVC4hJBcAbo4PB X-Google-Smtp-Source: APXvYqyf0khs9k35IkHR0IG8uccNwg/13f28/iSRanZ7PKNfp/REMENCQn0MvibDdWI46hJ5LAKXKw== X-Received: by 2002:a63:f212:: with SMTP id v18mr59758335pgh.231.1556606755861; Mon, 29 Apr 2019 23:45:55 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a63:5b06:: with SMTP id p6ls85041pgb.14.gmail; Mon, 29 Apr 2019 23:45:55 -0700 (PDT) X-Received: by 2002:a63:5466:: with SMTP id e38mr65270102pgm.340.1556606755414; Mon, 29 Apr 2019 23:45:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556606755; cv=none; d=google.com; s=arc-20160816; b=U2EO/k8O8CzFNm/Ur1DPDqGaYbqenWCJqtOUyKs92UAkpsg0mrktyE/8Ghxo6e6EIQ L7Q/qs03BMCPRU+/GRwYJMPcg0/hiiZ3WMel7KOJ+qhYahjlNBcaamVa6zJTVK/Ut3+y yH9qdz6AI8xSaBKCfkRaRv9fC935qXzqg+E+FawQmPT2P+uHyjI9KC+86ozjvZIb2cOc oGhOTzQZkKRqw7sHc2kc+15sgGFnXuFQKQMdKVNMeY/NKY8mFN3Vjo6kVUll9+QC/20i /xn7ZPitYXG8BHpTsxFdgY/NEaf1p1vO2grt8yJ8PwWfUdFd1dRNWuWQLiZDxhUdqO+6 UUKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:dkim-signature; bh=Saqjk90VvO7VVOqR5Cb+AqIeazlpo9yCdk8qstbg3Yo=; b=JBftKiqtCgzxxiDWPqhD56JIPexbYoUEyxXQe5lYlhJypUREbyMekT5mNzEIAUuaOa 8mh/thPPrxKH+gBGIxSJz5Ye+hiGoPv14AQ9Oind2H77vMqIa+cfDlnL4uwNTBq/t/t/ 41EIXJm5Sd+KGaEOu9zh8pIqn12/HA9k16HT3ewvxq0ZGppHjBIVLnPUws+OO/q3IYSD sSMB9HiV+Q6LQ6QD3M6verGGdvtULfkP+2/RRFWqTiVXYXlh8ke9dhIU1H59k3r1U/E+ 6cE2E7beRafzfCag1P+j344r3bZavPkL+6OhAkDm9XX4OTbKgD7JyZBaIX+AQgd6lBZz Nkjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=fHQnqZwt; spf=pass (google.com: domain of shyam.saini@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=shyam.saini@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id d10sor9798328pgh.86.2019.04.29.23.45.51 for (Google Transport Security); Mon, 29 Apr 2019 23:45:51 -0700 (PDT) Received-SPF: pass (google.com: domain of shyam.saini@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:a63:1055:: with SMTP id 21mr44982724pgq.200.1556606750111; Mon, 29 Apr 2019 23:45:50 -0700 (PDT) Received: from localhost.localdomain ([49.206.200.184]) by smtp.googlemail.com with ESMTPSA id 128sm3411810pfg.70.2019.04.29.23.45.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Apr 2019 23:45:48 -0700 (PDT) From: Shyam Saini To: jagan@amarulasolutions.com Cc: linux-amarula@amarulasolutions.com, Shyam Saini Subject: [PATCH] Makefile: Add single image for imx6 socs based boards Date: Tue, 30 Apr 2019 12:15:26 +0530 Message-Id: <20190430064526.16008-1-shyam.saini@amarulasolutions.com> X-Mailer: git-send-email 2.11.0 X-Original-Sender: shyam.saini@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=fHQnqZwt; spf=pass (google.com: domain of shyam.saini@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=shyam.saini@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This was tested on engicam imx6qdl and imx6ul boards Signed-off-by: Shyam Saini --- Makefile | 10 ++++++++++ arch/arm/dts/imx6-u-boot.dtsi | 16 ++++++++++++++++ arch/arm/dts/imx6qdl-u-boot.dtsi | 1 + arch/arm/dts/imx6ul-u-boot.dtsi | 1 + arch/arm/mach-imx/mx6/Kconfig | 2 ++ 5 files changed, 30 insertions(+) create mode 100644 arch/arm/dts/imx6-u-boot.dtsi diff --git a/Makefile b/Makefile index f2c7bb6041..dd415353ba 100644 --- a/Makefile +++ b/Makefile @@ -851,6 +851,11 @@ ifeq ($(CONFIG_ARCH_SUNXI)$(CONFIG_SPL),yy) ALL-y += u-boot-sunxi-with-spl.bin endif +# Build a combined spl + u-boot image for imx6 +ifdef ($(CONFIG_MX6QDLL || CONFIG_MX6UL)$(CONFIG_SPL)$(CONFIG_OF_CONTROL),yyy) +ALL-$(CONFIG_ARCH_MX6) += u-boot-imx6-with-spl.bin +endif + # enable combined SPL/u-boot/dtb rules for tegra ifeq ($(CONFIG_TEGRA)$(CONFIG_SPL),yy) ALL-y += u-boot-tegra.bin u-boot-nodtb-tegra.bin @@ -1364,6 +1369,11 @@ u-boot-br.bin: u-boot FORCE endif endif +ifeq ($(CONFIG_MX6QDLL || CONFIG_MX6UL)$(CONFIG_SPL)$(CONFIG_OF_CONTROL),yyy) +u-boot-imx6-with-spl.bin: SPL u-boot-dtb.img FORCE + @$(call if_changed,binman) +endif # CONFIG_ARCH_MX6 + # x86 uses a large ROM. We fill it with 0xff, put the 16-bit stuff (including # reset vector) at the top, Intel ME descriptor at the bottom, and U-Boot in # the middle. This is handled by binman based on an image description in the diff --git a/arch/arm/dts/imx6-u-boot.dtsi b/arch/arm/dts/imx6-u-boot.dtsi new file mode 100644 index 0000000000..fa02d5f61f --- /dev/null +++ b/arch/arm/dts/imx6-u-boot.dtsi @@ -0,0 +1,16 @@ +#include + +/ { + binman { + filename = "u-boot-imx6-with-spl.bin"; + pad-byte = <0xff>; + + blob { + filename = "SPL"; + }; + + u-boot-img { + offset = ; + }; + }; +}; diff --git a/arch/arm/dts/imx6qdl-u-boot.dtsi b/arch/arm/dts/imx6qdl-u-boot.dtsi index 0aa29e38b8..5c360eed15 100644 --- a/arch/arm/dts/imx6qdl-u-boot.dtsi +++ b/arch/arm/dts/imx6qdl-u-boot.dtsi @@ -2,6 +2,7 @@ /* * Copyright (C) 2018 Jagan Teki */ +#include "imx6-u-boot.dtsi" / { soc { diff --git a/arch/arm/dts/imx6ul-u-boot.dtsi b/arch/arm/dts/imx6ul-u-boot.dtsi index eb190cf8c8..6bc1629a97 100644 --- a/arch/arm/dts/imx6ul-u-boot.dtsi +++ b/arch/arm/dts/imx6ul-u-boot.dtsi @@ -2,6 +2,7 @@ /* * Copyright (C) 2018 Jagan Teki */ +#include "imx6-u-boot.dtsi" / { soc { diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig index e782859b1e..36f460cc21 100644 --- a/arch/arm/mach-imx/mx6/Kconfig +++ b/arch/arm/mach-imx/mx6/Kconfig @@ -34,6 +34,7 @@ config MX6QDL bool select HAS_CAAM select MX6_SMP + select BINMAN config MX6S bool @@ -57,6 +58,7 @@ config MX6UL select ROM_UNIFIED_SECTIONS select SYSCOUNTER_TIMER select SYS_L2CACHE_OFF + select BINMAN config MX6UL_LITESOM bool