From patchwork Wed Dec 27 12:26:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 853157 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; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="hSui0XN9"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3z6CJQ04lVz9s7h for ; Wed, 27 Dec 2017 23:45:57 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 7EBDCC21C8F; Wed, 27 Dec 2017 12:40:02 +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_H3, RCVD_IN_MSPIKE_WL, 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 27BBEC21EAE; Wed, 27 Dec 2017 12:33:20 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 3A16BC21C34; Wed, 27 Dec 2017 12:26:46 +0000 (UTC) Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by lists.denx.de (Postfix) with ESMTPS id C539DC21C4A for ; Wed, 27 Dec 2017 12:26:45 +0000 (UTC) Received: by mail-wm0-f66.google.com with SMTP id t8so39118812wmc.3 for ; Wed, 27 Dec 2017 04:26:45 -0800 (PST) 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; bh=MPvfzS27FFZVhuLu4sR5LipDhttAvAyqqyhrpyYX6iU=; b=hSui0XN9nbJDbMW+mP41OQuw1wzYLz5Q//vtEjgic8F3Yae1U/VN5YUnJbhjZYMB97 iBDcui0KyLavSCIFOxQLzi1ijx/pW1e8P6U5GizJncsGy3VqvubgSAGkbzV1sxp7t04z lsX5pYqAh0itiFxYX3KwT50KLfgN7yNYQA6oU= 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; bh=MPvfzS27FFZVhuLu4sR5LipDhttAvAyqqyhrpyYX6iU=; b=H4gPnuhj0IzgfeZ6FXEhhXNkqtGzrrYL4jKkl1pkQ1Vxw0fUgAoxTLzZA5kIJ1KySA fhtqrskKdAUck0TzGNjRQgYUQ8gxzo++9uhFZdXOEh6Ne+oJgYxS9DhHZGqnYFlbyGOz 0nvhKFbaq2Tbpk21pngrzqjsdgA4dDuP5q5p5cwrXf0X/yR6vRoGgZu0yAPyIgljOCcx +5UAyT8p6dHMQ45Kb513w7J8sF8t237e/A1vrpsK7tWzF717G+7CpvV66mmgysOunx0N 0rR+XBZAUG2rAtLp0g32sTDq2M/E/2IvcRoMfyGTIeInJXwK/5J+8MLdj0ceCU+bwgCq 3s8g== X-Gm-Message-State: AKGB3mKZ8xO7cTU5rndxKTbd02MbWJIuTBo2JO+ZJz8nfkmfuUHw+Fv0 KsrZwdLUoK5I28cwBwCrWb/YuHUgWlY= X-Google-Smtp-Source: ACJfBotW3dtlguVEZ/Q/jptW6Svm3GRGE7dhOQ4meFwt9Ca0H5h9FxgpB0OUTet/24uVlMZtq6HhJQ== X-Received: by 10.80.138.199 with SMTP id k7mr34943701edk.229.1514377605224; Wed, 27 Dec 2017 04:26:45 -0800 (PST) Received: from localhost.localdomain ([109.255.42.2]) by smtp.gmail.com with ESMTPSA id a5sm28388838edm.47.2017.12.27.04.26.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 27 Dec 2017 04:26:44 -0800 (PST) From: Bryan O'Donoghue To: u-boot@lists.denx.de Date: Wed, 27 Dec 2017 12:26:05 +0000 Message-Id: <1514377566-28512-23-git-send-email-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514377566-28512-1-git-send-email-bryan.odonoghue@linaro.org> References: <1514377566-28512-1-git-send-email-bryan.odonoghue@linaro.org> X-Mailman-Approved-At: Wed, 27 Dec 2017 12:32:59 +0000 Cc: Fabio Estevam Subject: [U-Boot] [PATCH 22/23] arm: imx: hab: Implement hab_rvt_failsafe 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This patch implements the basic callback hooks for hab_rvt_check_failsafe for BootROM code using the older BootROM address layout - in my test case the i.MX7. Code based on new BootROM callbacks will just do nothing and there's definitely a TODO to implement that extra functionality on the alternative BootROM API. Signed-off-by: Bryan O'Donoghue Cc: Stefano Babic Cc: Fabio Estevam Cc: Peng Fan Cc: Albert Aribaud Cc: Sven Ebenfeld Cc: George McCollister --- arch/arm/mach-imx/hab.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/arch/arm/mach-imx/hab.c b/arch/arm/mach-imx/hab.c index 9f344a8..93e11dd 100644 --- a/arch/arm/mach-imx/hab.c +++ b/arch/arm/mach-imx/hab.c @@ -70,6 +70,21 @@ ((hab_rvt_exit_t *)HAB_RVT_EXIT) \ ) +static void hab_rvt_failsafe_new(void) +{ +} + +#define hab_rvt_failsafe_p \ +( \ + (is_mx6dqp()) ? \ + ((hab_rvt_failsafe_t *)hab_rvt_failsafe_new) : \ + (is_mx6dq() && (soc_rev() >= CHIP_REV_1_5)) ? \ + ((hab_rvt_failsafe_t *)hab_rvt_failsafe_new) : \ + (is_mx6sdl() && (soc_rev() >= CHIP_REV_1_2)) ? \ + ((hab_rvt_failsafe_t *)hab_rvt_failsafe_new) : \ + ((hab_rvt_failsafe_t *)HAB_RVT_FAILSAFE) \ +) + static enum hab_status hab_rvt_check_target_new(enum hab_target target, const void *start, size_t bytes)