From patchwork Wed May 8 18:14:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 1097176 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="faeUrnDG"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44zl5n2b5gz9s5c for ; Thu, 9 May 2019 04:15:57 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 06134C21DAF; Wed, 8 May 2019 18:15:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 7D999C21E12; Wed, 8 May 2019 18:15:17 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6DDADC21DD3; Wed, 8 May 2019 18:15:12 +0000 (UTC) Received: from mail-ed1-f66.google.com (mail-ed1-f66.google.com [209.85.208.66]) by lists.denx.de (Postfix) with ESMTPS id 2F865C21D4A for ; Wed, 8 May 2019 18:15:10 +0000 (UTC) Received: by mail-ed1-f66.google.com with SMTP id f37so22893094edb.13 for ; Wed, 08 May 2019 11:15:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JilycTHKGktue6+iRYF3LcXSOo00dXX8dY6uQ4IjCyc=; b=faeUrnDG00vasRnWNSgUvQ2UJb/ZF4zjK8n9ePsoGRgfsUcCnn6ZmlEqJq2Pk0mTUy AppDosZ8qTckh1yfNf/nj/KkdEyVEzslqNTyTheIwFS3l3jVRreG73nOXkLupbywqYwJ zvnr+UdeL+hcaLOrTLPPFbbDGHag4dATBV6tK9GXrQmUrcnJvUAo2GXqQo86qpiXvpPp k6nlMLZ8CoIHLIgfFdIuKlNDD84c2vcPyTVFHBI0PrfqMKipD4cNTwGv0ZOqsKoReR/i gvKomVSfjeYj09NJjGBwg2JvhgTBUsD9NigvJeKhyRJ9k0ol7HLAnFjmMxCXxUGlAJCM HvrQ== 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=JilycTHKGktue6+iRYF3LcXSOo00dXX8dY6uQ4IjCyc=; b=H+RqQM2QSxdRhGt5AOz4wSCZjJrYzT0L2j9Dzp08X6AhHdUifuL8j7dLHwmJ/Ka8s6 GdMHHgCzSTgQ9HAiIRt30CvZfapc2YxctEVuYpaPt/I/BUliiRjSvbntKmgYIGQdsok6 vLYubJpjOSwxV8M+SIi4SFjn63Q4tSmUmqvG8c0bdQwiXLiPPN14hAVR4fUYair9tak7 zetUrYj7ATIFdywgI2zwlUaxht8FdyMJTMacu79Nmdst7g4QR/6jeJLMUAtXAg6MdNn4 IeZ9GMc+mYJ78agnmmMV7Hi63FwrEerm7RpnZqMvNpgFA8TylnZG74s8JHELooo79QgW qDqw== X-Gm-Message-State: APjAAAWBdNtW5GxKu5anGe6zQMLnYPCAyZ6/bVIPUAcXssVdROvJdwZ2 dT4ITlkV7fYGNOEDBdv9kVJSTRYZhy4= X-Google-Smtp-Source: APXvYqx+hMCBHCTVnQXUFBJg6wyn/ToZOc2yHLx1Zf1s7GP3ipEyH+R5mVh+vAKJlGaLVsUxMOgERg== X-Received: by 2002:a50:bae4:: with SMTP id x91mr34401541ede.76.1557339309614; Wed, 08 May 2019 11:15:09 -0700 (PDT) Received: from event-horizon.net ([80.111.179.123]) by smtp.gmail.com with ESMTPSA id r2sm2809106ejp.76.2019.05.08.11.15.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 May 2019 11:15:08 -0700 (PDT) From: Bryan O'Donoghue To: u-boot@lists.denx.de, fabio.estevam@nxp.com, maxime.ripard@free-electrons.com, breno.lima@nxp.com, pjtexier@koncepto.io, trini@konsulko.com, peng.fan@nxp.com Date: Wed, 8 May 2019 19:14:42 +0100 Message-Id: <20190508181448.20452-2-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190508181448.20452-1-bryan.odonoghue@linaro.org> References: <20190508181448.20452-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH 1/7] warp7_bl33: configs: Enable FIT as the boot.scr format X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This patch switches on FIT verification of boot.scr. After this commit your boot.scr must be in the FIT format. Signed-off-by: Bryan O'Donoghue --- configs/warp7_bl33_defconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/warp7_bl33_defconfig b/configs/warp7_bl33_defconfig index a79f670ea0..c0ad26ff13 100644 --- a/configs/warp7_bl33_defconfig +++ b/configs/warp7_bl33_defconfig @@ -55,3 +55,6 @@ CONFIG_USB_ETHER=y CONFIG_USB_ETH_CDC=y CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00" CONFIG_OPTEE_TZDRAM_SIZE=0x2000000 +CONFIG_FIT=y +CONFIG_FIT_SIGNATURE=y +CONFIG_FIT_VERBOSE=y From patchwork Wed May 8 18:14:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 1097177 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="ciI6jYrd"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44zl5x15lLz9s5c for ; Thu, 9 May 2019 04:16:05 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id AAB06C21DB5; Wed, 8 May 2019 18:15:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id EC331C21DA1; Wed, 8 May 2019 18:15:22 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id C38DFC21E0F; Wed, 8 May 2019 18:15:14 +0000 (UTC) Received: from mail-ed1-f65.google.com (mail-ed1-f65.google.com [209.85.208.65]) by lists.denx.de (Postfix) with ESMTPS id 98B15C21DD7 for ; Wed, 8 May 2019 18:15:11 +0000 (UTC) Received: by mail-ed1-f65.google.com with SMTP id p27so8015138eda.1 for ; Wed, 08 May 2019 11:15:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ShjRkvkuQ5uFewwbjOFScm+Le/kwoYSXA1NnhyyLpKU=; b=ciI6jYrd1l5L1yr2Rbr36+gyrWMP0WM5LSL7bFXb9D6k/Wy3hUULEvOW+PuB8jRtq2 T+LEWwI6ztIfhFQyrtl5YRA09sBOC8wM2huMSQGOi8ukTdK5FrUdN+iZo2afSdS6xl7/ WEGxxZb/OM9cUf3P5uYGbpN9FYg1kS4byLgOZWjF+NldWJmqCIoK58hLqVk82jArME67 IQGFJbMhZFezyn2kgQwQZj54RAVTXbeMvAl7C/yELDClXSoXw9rDCFv3KnsZ1d1e/EId EokWuzX2nH+DRIRKsQtg28apulX7ZykDaJnlQ7jllizsM+RjwhxZVxcaX+FnZ9znXd4h KGsw== 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=ShjRkvkuQ5uFewwbjOFScm+Le/kwoYSXA1NnhyyLpKU=; b=rchwRpHKIk+Hz0XLiJRq8rECkiWYqoLxc+1h6M+2Tq/A1yLzcajgIJR0oclQxEpgvw 9cJdKv8ly6NiDWAeCK3qxcyhiTtGaE4RWp/OL80KOS5hQgsAkGG7edtm7f3tWJ3PmwBi +agdGchgMDA/zaL1LtKcybK6nODyw1c/3YjskGDxENXYUQbzGbhBOTt9ddUhiaLRaHaf FDdBvhn0ggilky/ClfeDopKpTKYLIBAGdUDURHTvlySZZLZR7v2qeBZ2YjwLSzXoaUSX MjA4oBFaI8pTc6cQ+JHkinVTWlzyPPyD869HjOERnmbpzih4zrhcbPjU6pWyoh4/ULOv pDBA== X-Gm-Message-State: APjAAAVM/HeQkrk30w71lAxZ/m1F90FdWkT1JUTDErQQRgQAWkuakAOe wVC0CaiAUH37MmdUs9Idnnelymqkyvo= X-Google-Smtp-Source: APXvYqzfRfEV3owKaRUK4Iy5Lvx+YcuelgB2hgIhDNPZzwIZdZYc4BoxVkhjUsNiAQmPe6+5kKAbcg== X-Received: by 2002:a50:929a:: with SMTP id k26mr41315840eda.52.1557339310918; Wed, 08 May 2019 11:15:10 -0700 (PDT) Received: from event-horizon.net ([80.111.179.123]) by smtp.gmail.com with ESMTPSA id r2sm2809106ejp.76.2019.05.08.11.15.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 May 2019 11:15:10 -0700 (PDT) From: Bryan O'Donoghue To: u-boot@lists.denx.de, fabio.estevam@nxp.com, maxime.ripard@free-electrons.com, breno.lima@nxp.com, pjtexier@koncepto.io, trini@konsulko.com, peng.fan@nxp.com Date: Wed, 8 May 2019 19:14:43 +0100 Message-Id: <20190508181448.20452-3-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190508181448.20452-1-bryan.odonoghue@linaro.org> References: <20190508181448.20452-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH 2/7] warp7: include: configs: Specify image name of bootscript in FIT X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" When obtaining the bootscript from a FIT image we need to specify the name of the bootscript as defined inside of the FIT. This patch makes a define that appends a "bootscr" parameter to the source command when compiling up in FIT mode on warp7. An environment variable is supplied to enable others to use a different name than "bootscr" as the image name of the boot script in their FIT. Signed-off-by: Bryan O'Donoghue --- include/configs/warp7.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/configs/warp7.h b/include/configs/warp7.h index 0ef8e35948..95955fd626 100644 --- a/include/configs/warp7.h +++ b/include/configs/warp7.h @@ -38,9 +38,17 @@ #define CONFIG_DFU_ENV_SETTINGS \ "dfu_alt_info=boot raw 0x2 0x1000 mmcpart 1\0" \ +/* When booting with FIT specify the node entry containing boot.scr */ +#if defined(CONFIG_FIT) +#define BOOT_SCR_STRING "source ${bootscriptaddr}:${bootscr_fitimage_name}\0" +#else +#define BOOT_SCR_STRING "source ${bootscriptaddr}\0" +#endif + #define CONFIG_EXTRA_ENV_SETTINGS \ CONFIG_DFU_ENV_SETTINGS \ "script=boot.scr\0" \ + "bootscr_fitimage_name=bootscr\0" \ "script_signed=boot.scr.imx-signed\0" \ "image=zImage\0" \ "console=ttymxc0\0" \ From patchwork Wed May 8 18:14:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 1097178 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="OopIAYbg"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44zl6s4CRpz9s5c for ; Thu, 9 May 2019 04:16:53 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 3B202C21DED; Wed, 8 May 2019 18:15:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 6F4D9C21E30; Wed, 8 May 2019 18:15:23 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E472FC21E07; Wed, 8 May 2019 18:15:15 +0000 (UTC) Received: from mail-ed1-f66.google.com (mail-ed1-f66.google.com [209.85.208.66]) by lists.denx.de (Postfix) with ESMTPS id C3E01C21E02 for ; Wed, 8 May 2019 18:15:12 +0000 (UTC) Received: by mail-ed1-f66.google.com with SMTP id p27so8015182eda.1 for ; Wed, 08 May 2019 11:15:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gshTQTEiw/fu2LyjBvDDAxJa+Gp7Lde5czfI/pBAyk4=; b=OopIAYbgYLAUa6zuwZ6Rtz1dkFSfvonvnaifGKm8WtQP8LFI3DFC7rCIWELX7hpQPJ OjsgBfCzKAvQ5HUraT+7VOZ1OKf4BegH3dZo7rriYTqdKWiJEhdgetUdvBlJ21LQZtsv 7hcpx4EA0rU1aFx8pShKtf2q+QVAohdkVOoArb4Uj8YyzjgeyZngwc+53sxjemYZBDGs auVdu07kkq3o5SMUJewxmYjedhvDj5+WtZoy3+R9HbeDRVZMlbYmdh791BoeZbRIgHff 5s8+MwtkKXTZpeItoQpCeRnc/url1YNUtHPhkNZrFWQOL6DlwQJWZRGIYdXX0sUyhDic EhCA== 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=gshTQTEiw/fu2LyjBvDDAxJa+Gp7Lde5czfI/pBAyk4=; b=P9MuTmh/2NyCISU6zyyqjGq9IjEWJZZM26NhrzOV55dtlCR5iElnGO7wPDcbMYDV/Y W31tFnF83PGdn4Mcw1TlNRW/jsTAGkrw2b0OHZUY4t/I8seJEZX5Y79wx4L5eaKBt65l bYtjAavVLKdm4NE19iMQfyeRuvlSIGwdhu4yNGuw37KIPynIX2uyNCjrnxKCKu7aGyMt UZvdqRJjnvoenX7lBsUDi+bX8DJSGBlkxpuX7+6ntrxFpWFd7pMuPLP7fhCbLimzI78m R84oQiOe4ak1ZtwAEvsZ90xB4c+JPg3KNHcPJh+aKQnpSWrWL6Wg6tqhyCRwNF4kbKmv uYXw== X-Gm-Message-State: APjAAAWW97uUS4IqZVkZsouyiRrkR6KHaBJmmd0vyQpKN4NR6cxASEh0 tUha2FcCRUMVgJ65hyOO0/EScIfimho= X-Google-Smtp-Source: APXvYqxEOhmBtk6RiRsG79I0sLzF0lf02Xx23jSSxBNTGZquRAGPmQdLuMIX5yNcW+FBQCjKwgWcIg== X-Received: by 2002:a50:9025:: with SMTP id b34mr39881294eda.145.1557339312140; Wed, 08 May 2019 11:15:12 -0700 (PDT) Received: from event-horizon.net ([80.111.179.123]) by smtp.gmail.com with ESMTPSA id r2sm2809106ejp.76.2019.05.08.11.15.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 May 2019 11:15:11 -0700 (PDT) From: Bryan O'Donoghue To: u-boot@lists.denx.de, fabio.estevam@nxp.com, maxime.ripard@free-electrons.com, breno.lima@nxp.com, pjtexier@koncepto.io, trini@konsulko.com, peng.fan@nxp.com Date: Wed, 8 May 2019 19:14:44 +0100 Message-Id: <20190508181448.20452-4-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190508181448.20452-1-bryan.odonoghue@linaro.org> References: <20190508181448.20452-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH 3/7] warp7: include: configs: Differentiate bootscript address from loadaddr X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Reusing the loadaddr to load the boot script breaks some of the logic we want to have around the bootscript/FIT load addresses. Making a dedicated bootscript address allows us to differentiate the bootscript load address from the Linux Kernel or OPTEE load address, thus ensuring that no matter what the load sequence the bootscript and Kernel/OPTEE binary load addresses do not conflict. Signed-off-by: Bryan O'Donoghue --- include/configs/warp7.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/include/configs/warp7.h b/include/configs/warp7.h index 95955fd626..0c63050833 100644 --- a/include/configs/warp7.h +++ b/include/configs/warp7.h @@ -50,6 +50,7 @@ "script=boot.scr\0" \ "bootscr_fitimage_name=bootscr\0" \ "script_signed=boot.scr.imx-signed\0" \ + "bootscriptaddr=0x83200000\0" \ "image=zImage\0" \ "console=ttymxc0\0" \ "ethact=usb_ether\0" \ @@ -70,16 +71,16 @@ "warp7_auth_or_fail=hab_auth_img_or_fail ${hab_ivt_addr} ${filesize} 0;\0" \ "do_bootscript_hab=" \ "if test ${hab_enabled} -eq 1; then " \ - "setexpr hab_ivt_addr ${loadaddr} - ${ivt_offset}; " \ + "setexpr hab_ivt_addr ${bootscriptaddr} - ${ivt_offset}; " \ "setenv script ${script_signed}; " \ "load mmc ${mmcdev}:${mmcpart} ${hab_ivt_addr} ${script}; " \ "run warp7_auth_or_fail; " \ "run bootscript; "\ "fi;\0" \ "loadbootscript=" \ - "load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ + "load mmc ${mmcdev}:${mmcpart} ${bootscriptaddr} ${script};\0" \ "bootscript=echo Running bootscript from mmc ...; " \ - "source\0" \ + BOOT_SCR_STRING \ "loadimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ "loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ "mmcboot=echo Booting from mmc ...; " \ From patchwork Wed May 8 18:14:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 1097182 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="RmD92PnK"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44zl9D1rMyz9s9T for ; Thu, 9 May 2019 04:18:56 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id E9672C21E1D; Wed, 8 May 2019 18:16:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 88ABEC21C27; Wed, 8 May 2019 18:15:43 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id BEA0BC21DB6; Wed, 8 May 2019 18:15:17 +0000 (UTC) Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com [209.85.208.48]) by lists.denx.de (Postfix) with ESMTPS id 2E7ABC21E12 for ; Wed, 8 May 2019 18:15:14 +0000 (UTC) Received: by mail-ed1-f48.google.com with SMTP id g57so22898245edc.12 for ; Wed, 08 May 2019 11:15:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Rox1pH+8kItuIkriU5GpPniGJqdTkeo4ybPkS3FJM2U=; b=RmD92PnKGhtY97MzvCh/TW3zMK85XKVqr0FJ0EF1iEXCEGAlnAYR0zvK/SQOu5z3yr GChyAfQfDeDcbivUwEy1xwxaBixgECVQa+Z9ljaCV4hNonD6wLINnhI7/cdO50d+Ol0f 8a1460t1gvbhDTliMn/WL3BMlIC9ZjSck61E8CKfW8C998D3XS6/MphtO1YdhKmB5h4R FfrAZwoF/I76QI/nh/MtAiNhvgSbSMqAoAmSZ7Xz3/M3kk/PgLBKyyHk0de71qx50lyC lDOXy5BKLxx11hO2ae2JGDJfP+pvAlNOyZZrgbDUL9GIytFE1E6h2Yg1T2IOByebs8IQ ZoWw== 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=Rox1pH+8kItuIkriU5GpPniGJqdTkeo4ybPkS3FJM2U=; b=Blp9MLKir09/DyH+6avXrNlnNZl8Zcclk3Um9iEgIoFKbPjHjhlzaiyesSEdTJjqYF /+tr15ni1GoqUHanGtD9PKahlxN/hthypDeK+C1Id8MLsU9hnbVeIeUBHdfipia5DENk pi+vubrgckSzHx9W9VM4F1U9/MbLZ7FxWc9g9T/F0lFtyiTCHomYXDF/S/T49ZyDKdeR rdE+N0e5hhFzeNA1eZQmuLLU4gYI+3rzHJeTh+Z+IwCPZ3Jvk7rfv/y91PpuHyybqnGs N61UH77knA1PBzhESOG/pHnoxgJltCd68mah7wkHcL35jQl5iEYVjbbDCTI76VFYI3AA ZJOA== X-Gm-Message-State: APjAAAVJN+WR1p5YcsLQTtIwzez6v41ducJUjHKZD7R0ut4WFdCuAL2K XB0Fs48j92WraXGhMObSGBHiytZUubY= X-Google-Smtp-Source: APXvYqxonP8d2Za09UVKWOu+CBQwWE4WpFOJTxCrpUM5/HBYNWMM71z2uU9lb7IZ27g8nv8qEdi7fA== X-Received: by 2002:a05:6402:1612:: with SMTP id f18mr41005199edv.295.1557339313592; Wed, 08 May 2019 11:15:13 -0700 (PDT) Received: from event-horizon.net ([80.111.179.123]) by smtp.gmail.com with ESMTPSA id r2sm2809106ejp.76.2019.05.08.11.15.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 May 2019 11:15:12 -0700 (PDT) From: Bryan O'Donoghue To: u-boot@lists.denx.de, fabio.estevam@nxp.com, maxime.ripard@free-electrons.com, breno.lima@nxp.com, pjtexier@koncepto.io, trini@konsulko.com, peng.fan@nxp.com Date: Wed, 8 May 2019 19:14:45 +0100 Message-Id: <20190508181448.20452-5-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190508181448.20452-1-bryan.odonoghue@linaro.org> References: <20190508181448.20452-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH 4/7] warp7_bl33: configs: Enable CONFIG_OF_LIBFDT X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" In order to switch on DTB overlay support in WaRP7 BL33 we first need to switch on LIBFDT support. Do that now. Signed-off-by: Bryan O'Donoghue --- configs/warp7_bl33_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/warp7_bl33_defconfig b/configs/warp7_bl33_defconfig index c0ad26ff13..5b6a85356f 100644 --- a/configs/warp7_bl33_defconfig +++ b/configs/warp7_bl33_defconfig @@ -58,3 +58,4 @@ CONFIG_OPTEE_TZDRAM_SIZE=0x2000000 CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y +CONFIG_OF_LIBFDT=y From patchwork Wed May 8 18:14:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 1097179 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="O0rwJIZC"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44zl7M5gBgz9s5c for ; Thu, 9 May 2019 04:17:19 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 7C752C21E16; Wed, 8 May 2019 18:16:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id EFA37C21E2B; Wed, 8 May 2019 18:15:26 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 65835C21E42; Wed, 8 May 2019 18:15:18 +0000 (UTC) Received: from mail-ed1-f65.google.com (mail-ed1-f65.google.com [209.85.208.65]) by lists.denx.de (Postfix) with ESMTPS id 759EBC21E1A for ; Wed, 8 May 2019 18:15:15 +0000 (UTC) Received: by mail-ed1-f65.google.com with SMTP id a8so22947604edx.3 for ; Wed, 08 May 2019 11:15:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Z/Z00Bb9yNuqW6W+eieLpStUJUPi7uZcDj13sUM6QEw=; b=O0rwJIZCsbrGfT32TSXIgETAs+rdoLPf6faoT+/1UJtrP94UG8DTIEs2HZF01S6RI3 K/fvgoc0TV79j/YI/HUsF/i9vZDiCmlWKwobrcqdxSn7e/rckyzE0KZ0mGzZX0+aYxlR x71AxO10ija2bT1gwETI9u3tj7vW1XxzPRS201LDSE39qxl4526s1Oz9rsTw1F4vl+d3 LawGrMBzNUjY0qVwm9LP5Nfs/hZe17916KJpA060hOOydVgCFLBlVkDgqLMCfCgNDnQe 42y9T3fJLLiz1zM3TzSXKcKCbtZ1nH2zjkczDBPuUUr9xqyAH17bFEbPwpcYN/Yw3ijr NgFg== 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=Z/Z00Bb9yNuqW6W+eieLpStUJUPi7uZcDj13sUM6QEw=; b=d3065lz2/e20fM/InsSroQfHk9z5OhiKeggTtJYA63e9xXuy/lfWLWnpyE1uekeh6n 98/UfmSiZusRQ6V5Ys7iSYvsHYn290bLK28BJdNrl0KSNCDT+nbr7LxjxHnV8c1nepdh gg6vznpZFErCobDv8ZBl+z0bw9pwAypUmyvOV6SW1SFVhrzEGSnk2GmqE+YjYSEs6LsW 3R14FeuNFu/X9/AnZ3EmqscLcLsIg4p2uXLgprBgEnuYLVwT1uoPwklrGahc8rLLCcn6 eO9Jqi8i0CNYmdiDClgmn/dFZb/vE1OABr2sSjiZpgFIj3gUlIT9SAKB3lP9mdjFjoro ICsw== X-Gm-Message-State: APjAAAUvnquEDbzOjQnKxwLumVk17JjhnxoRETKeqeak0pVyOB4rw3jV 8Eg3ZryqfkyVWs8pbRqFMbsEJUSDwio= X-Google-Smtp-Source: APXvYqyUzhoR2xq9+0T+jiu0Wszflbod2MpzLNNV1d1MF4X9c9dRNsDviJIrEd6Ivx1JyWRojswxTQ== X-Received: by 2002:a50:919d:: with SMTP id g29mr37763057eda.146.1557339314844; Wed, 08 May 2019 11:15:14 -0700 (PDT) Received: from event-horizon.net ([80.111.179.123]) by smtp.gmail.com with ESMTPSA id r2sm2809106ejp.76.2019.05.08.11.15.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 May 2019 11:15:14 -0700 (PDT) From: Bryan O'Donoghue To: u-boot@lists.denx.de, fabio.estevam@nxp.com, maxime.ripard@free-electrons.com, breno.lima@nxp.com, pjtexier@koncepto.io, trini@konsulko.com, peng.fan@nxp.com Date: Wed, 8 May 2019 19:14:46 +0100 Message-Id: <20190508181448.20452-6-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190508181448.20452-1-bryan.odonoghue@linaro.org> References: <20190508181448.20452-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH 5/7] warp7_bl33: configs: Enable CONFIG_OF_LIBFDT_OVERLAY X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This commit enables CONFIG_OF_LIBFDT_OVERLAY a requirement to perform a merge of an OPTEE provided DTB overlay into our main kernel DTB image. Signed-off-by: Bryan O'Donoghue --- configs/warp7_bl33_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/warp7_bl33_defconfig b/configs/warp7_bl33_defconfig index 5b6a85356f..d4716378a7 100644 --- a/configs/warp7_bl33_defconfig +++ b/configs/warp7_bl33_defconfig @@ -59,3 +59,4 @@ CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y CONFIG_OF_LIBFDT=y +CONFIG_OF_LIBFDT_OVERLAY=y From patchwork Wed May 8 18:14:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 1097180 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="TK3WFo+W"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44zl7Q2GZcz9s5c for ; Thu, 9 May 2019 04:17:22 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 12931C21E42; Wed, 8 May 2019 18:16:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 75739C21E07; Wed, 8 May 2019 18:15:32 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id C5451C21DB6; Wed, 8 May 2019 18:15:20 +0000 (UTC) Received: from mail-ed1-f66.google.com (mail-ed1-f66.google.com [209.85.208.66]) by lists.denx.de (Postfix) with ESMTPS id AE291C21DD3 for ; Wed, 8 May 2019 18:15:16 +0000 (UTC) Received: by mail-ed1-f66.google.com with SMTP id w33so20607260edb.10 for ; Wed, 08 May 2019 11:15:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6S3zZPgL1st0t7mROlL9R1WJevZxHlaVCtc/cCzS4Go=; b=TK3WFo+WlJSqrNMPHDJ9naj0HgUd0guP8lmuMoMWiNpfoS4fgQTxxJJS4ql+Us7YOe 2XwbRE/h04OWaZqMPveaXxbqubn1lqwT7lMxnEQgn4tWb50MlGcCMjJJIO1ROslDqrD3 ShxGG0f1GOzZW60G9p0XALeDGPIkqLpRJOXlm6FDlJd0OukZW1Kno0pXFTao5dVxCAL0 71iuuU64MOQ3+8bY/NIjCftGuXSDo64V7QeDvaxM+SlpRgGYfY66t6pjOnzW27mtW8GH tydoT0/ZQsNNSlNUunNuXa/gFtrjToKGm0yAwc8HYZLIG7HoniS0+lBx/wauD0c3hzgg 5MTQ== 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=6S3zZPgL1st0t7mROlL9R1WJevZxHlaVCtc/cCzS4Go=; b=HHAHPI/j0dVdDMRBo3ptIPwVboP8nEvPulTkY+iZz7LFm9j6XDr+/dGE1qpeolBadR qoVsca2gmlaSkft4MqpDDrGJStfT+EemUe5R/e8a6MpBfHL4PeRmgurmiTdFR8JLp0MU x0/8tXIko8lrmQaXVhU5TpdHhpsote/F9eDGobuCaxpOGvcYS6YT82RaXCr6v+QHg7yk HXzjswyT1qy0HnMs7NIclLvbzEzZtJ7YoYSDu49dYHmCC3JUHk7XxFZoSHGs9Z5ky5lv vGqJmHMr5c3pR090a1WEmYBLbxBlF0/q4fv16bbRc423ssWG/HYwNJDBpQLgp22Kk8zw J8Uw== X-Gm-Message-State: APjAAAV327bRq2rue7s9Lz4ebYPQlrYxvbaRCreJ+dDod2mHS1k4mco7 JDSNFq1PBaF0m6br0n36n/95b8XR2ks= X-Google-Smtp-Source: APXvYqy8CP5GSkQRMNkbCV1ZcYEc+r03HlmLtUPE1DV+SMmMin9UU6F/v61fqNe4mtKtS+uN8i4I8Q== X-Received: by 2002:a50:8fa4:: with SMTP id y33mr40903129edy.197.1557339316014; Wed, 08 May 2019 11:15:16 -0700 (PDT) Received: from event-horizon.net ([80.111.179.123]) by smtp.gmail.com with ESMTPSA id r2sm2809106ejp.76.2019.05.08.11.15.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 May 2019 11:15:15 -0700 (PDT) From: Bryan O'Donoghue To: u-boot@lists.denx.de, fabio.estevam@nxp.com, maxime.ripard@free-electrons.com, breno.lima@nxp.com, pjtexier@koncepto.io, trini@konsulko.com, peng.fan@nxp.com Date: Wed, 8 May 2019 19:14:47 +0100 Message-Id: <20190508181448.20452-7-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190508181448.20452-1-bryan.odonoghue@linaro.org> References: <20190508181448.20452-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH 6/7] warp7: include: configs: Specify an fdtovaddr X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" In the Mbed Linux OS bootflow OP-TEE runs before u-boot and provides a DTB overlay at 0x83100000. This overlay should subsequently be merged into the main DTB before handing over to the kernel. This patch defines fdtovaddr at 0x83100000. Signed-off-by: Bryan O'Donoghue --- include/configs/warp7.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/configs/warp7.h b/include/configs/warp7.h index 0c63050833..bab23cfdca 100644 --- a/include/configs/warp7.h +++ b/include/configs/warp7.h @@ -58,6 +58,7 @@ "initrd_high=0xffffffff\0" \ "fdt_file=imx7s-warp.dtb\0" \ "fdt_addr=" __stringify(CONFIG_SYS_FDT_ADDR)"\0" \ + "fdtovaddr=0x83100000\0" \ "optee_addr=" __stringify(CONFIG_OPTEE_LOAD_ADDR)"\0" \ "boot_fdt=try\0" \ "ip_dyn=yes\0" \ From patchwork Wed May 8 18:14:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 1097181 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="xieM+TpK"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44zl8g4j4vz9s9T for ; Thu, 9 May 2019 04:18:27 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 64217C21E3B; Wed, 8 May 2019 18:16:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 08B9BC21DF3; Wed, 8 May 2019 18:15:39 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 824C5C21D74; Wed, 8 May 2019 18:15:21 +0000 (UTC) Received: from mail-ed1-f66.google.com (mail-ed1-f66.google.com [209.85.208.66]) by lists.denx.de (Postfix) with ESMTPS id DDEE4C21E35 for ; Wed, 8 May 2019 18:15:17 +0000 (UTC) Received: by mail-ed1-f66.google.com with SMTP id e24so22926088edq.6 for ; Wed, 08 May 2019 11:15:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1A1yIwxwNx004Jg+/Gk985/oaYFSrCw1yNAJEEK0IUI=; b=xieM+TpKA8Rg7TiZqt6T/B5ZGCIWDCQZaAPmVq3PDU6ItYeCK//NPDTjTKyE7+/9e7 r0K1QpwTn4nEUuwg+YuUFU3LwoG0IKamXQsDVxFGpzfwHShMfRsi9Wyw97mPJmMHsr34 m2/U3OfeKSLAhOSB3QWwQWi3+0oANbn8IPc2jsDgWyoNdTbMRd/JSQWMB6Fq37wzNc2x iGkYoVqAw8vxvB2yNZ5/Hhaxz9LlWu+qcbNzfBzpUjdIRvXcHo9PrGOPqJ9lihUs82QS C03hxGV9CdJj7SOMnaiS/Ko8/sW6mFLRfAoF74smFKjN2bmcdf3wquUiLGDfFm5FNpJx PZ5g== 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=1A1yIwxwNx004Jg+/Gk985/oaYFSrCw1yNAJEEK0IUI=; b=JGlyxBrrbvpzq5DPU99zKe2Zpt5LZKuI6u0cUjCjWrzHPlgoTGaJzf8dpa1+ioWUoY RSLLdIp3UPy/7yWJevK8zZloTaqBWEI0ydRz6HIhG4EZLxW9qYddZLO7VWKkjQc/L2Vd iUv7gL1GYGMEUZTr50Kgdz4EPQs2Fd+G1ybWFNqV2pg5s9Uba43QFEgil/B6QAcdWObz whC2kcT4q9ivZE+zZNz6eogG4xIW2gD5qPXgu0IN9ZERv33ujPp+G+akdnHDE/5Mwsxd Mk0m3epnODHKwwU7BhFcEJ4ZqvJHsdcAYKah6DV+jYF8tWXrjm5cOnCcPXfK9cGWU44b /fcw== X-Gm-Message-State: APjAAAXOUXtLcmfZ0mx9cv7VdheYYidGyozkPP1TRgW3ArEvH+qMdWAc fOD/30ZwyIgFc244Ri9qeH4dqK9wXMQ= X-Google-Smtp-Source: APXvYqwx3Z1OHnBCkgZaCT+Yusdh8GpXsj2iicWw9doxAlXEB6KpmDVhP/BM1lipFexr/0+tSTdpoA== X-Received: by 2002:a50:95f8:: with SMTP id x53mr40732528eda.204.1557339317271; Wed, 08 May 2019 11:15:17 -0700 (PDT) Received: from event-horizon.net ([80.111.179.123]) by smtp.gmail.com with ESMTPSA id r2sm2809106ejp.76.2019.05.08.11.15.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 May 2019 11:15:16 -0700 (PDT) From: Bryan O'Donoghue To: u-boot@lists.denx.de, fabio.estevam@nxp.com, maxime.ripard@free-electrons.com, breno.lima@nxp.com, pjtexier@koncepto.io, trini@konsulko.com, peng.fan@nxp.com Date: Wed, 8 May 2019 19:14:48 +0100 Message-Id: <20190508181448.20452-8-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190508181448.20452-1-bryan.odonoghue@linaro.org> References: <20190508181448.20452-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH 7/7] warp7: Specify a default CONFIG_OPTEE_LOAD_ADDR if non provided X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" If no CONFIG_OPTEE_LOAD_ADDR is provided i.e. you are not loading OPTEE into memory in u-boot, then just set the non-existent CONFIG option to zero, elsewise stringify(CONFIG_OPTEE_LOAD_ADDR) will return "CONFIG_OPTEE_LOAD_ADDR" - which looks weird in the u-boot environment. Signed-off-by: Bryan O'Donoghue --- include/configs/warp7.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/configs/warp7.h b/include/configs/warp7.h index bab23cfdca..8c31d72205 100644 --- a/include/configs/warp7.h +++ b/include/configs/warp7.h @@ -45,6 +45,10 @@ #define BOOT_SCR_STRING "source ${bootscriptaddr}\0" #endif +#ifndef CONFIG_OPTEE_LOAD_ADDR +#define CONFIG_OPTEE_LOAD_ADDR 0 +#endif + #define CONFIG_EXTRA_ENV_SETTINGS \ CONFIG_DFU_ENV_SETTINGS \ "script=boot.scr\0" \