From patchwork Wed Jan 17 03:05:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kever Yang X-Patchwork-Id: 862018 X-Patchwork-Delegate: philipp.tomsich@theobroma-systems.com 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" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Z0Vfb9+P"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zLsRb0J2qz9ryk for ; Wed, 17 Jan 2018 14:06:01 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 2F212C21DFA; Wed, 17 Jan 2018 03:05:53 +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 2846FC21DA6; Wed, 17 Jan 2018 03:05:51 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4CA32C21DA6; Wed, 17 Jan 2018 03:05:49 +0000 (UTC) Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by lists.denx.de (Postfix) with ESMTPS id CB226C21C34 for ; Wed, 17 Jan 2018 03:05:46 +0000 (UTC) Received: by mail-pf0-f193.google.com with SMTP id e76so10762843pfk.1 for ; Tue, 16 Jan 2018 19:05:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=7gwfcDaJ/pMlHmxg1rq5/iHb0L5sclTqIXK+XTfMYm4=; b=Z0Vfb9+P2xNrx4KZ7MbmVi98bMRXkoSdV5OLu0U4afhM741ZJU80wZEYITn6WG1JWq AxXmMw81WBfDPt04NSKpe9krUNB0Vgff1BoHuqXX+Qowwj2Jyk9jyR8ZEV/Nx/IVc8xJ AAUgKhNbtNBBSfGQJMLfcZ/vVpZTf8Vpb0LnxgBw7AwsDEvIRPaY6wcOsVHPGzW0F+g4 rzfWzynNh95ou4k8nswHuCrc2RgyTLDMOerUuFEPXjVE9GOy9rMVToSUXra4SWF9iv+N kT1oJOl9QJKAWKCcrQKR9BbF9fsTC8RXW2ejXg4B5+az+Efg1QvcSzAJ8K3yGkpn8dFN qa+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=7gwfcDaJ/pMlHmxg1rq5/iHb0L5sclTqIXK+XTfMYm4=; b=lsS9S/02pZrq9csVdVHQEAUHAn4eZCEMaczE8Pmumu3F6+e4fshWdXF3NA845lYguz thCK03sfuSM33fl4BIcyNYZ25GAjo5jgu79oJz5A21M27zIdbWf8DCiY/h2FvXSkXVc5 8dd2v0m00PuMGY5MpNQY+k0sQFk8OhSX54htEBilu7zwTTrJj1y7AphmVKYtQGSjX3TB s/X3dYemrtu6de8thQQxeVAnPwnTTTybr2P9FvNJecQzLh9ZjrhgZKaDNuKiKWzQE8lO FBnbre4kgrtjloZagbrtnXDo4ki6f5TWEZVOTZzUy5qVvBgZkbpxc4e6yGzyMh/+GKJL c9uQ== X-Gm-Message-State: AKwxytdd2FNPA4Df0BIDTZaDLBDEvFBBa6o8Jd8R6GOPV765C7zHZ8lM eqF+uOy8yv8EGBn21SpY4TYfaA== X-Google-Smtp-Source: ACJfBovHgCq/7XPXwCfjwhxBMerH3eV+1XiEM3ilc+fTz/QwX4TiymxxkNc/pFaa6Na3iyjlpVaZtw== X-Received: by 10.98.67.138 with SMTP id l10mr3452736pfi.72.1516158344932; Tue, 16 Jan 2018 19:05:44 -0800 (PST) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id x22sm6077303pfa.169.2018.01.16.19.05.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 16 Jan 2018 19:05:43 -0800 (PST) From: Kever Yang To: u-boot@lists.denx.de Date: Wed, 17 Jan 2018 11:05:38 +0800 Message-Id: <1516158338-11399-1-git-send-email-kever.yang@rock-chips.com> X-Mailer: git-send-email 1.9.1 Subject: [U-Boot] [PATCH] spl: atf: pass NULL for bl32_ep pc 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" ATF use bl32_ep_info->pc to decide if thre is an available bl32, let's mark it as NULL first. Signed-off-by: Kever Yang Acked-by: Philipp Tomsich Reviewed-by: Philipp Tomsich --- common/spl/spl_atf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/spl/spl_atf.c b/common/spl/spl_atf.c index 2a450c6..c4a5be2 100644 --- a/common/spl/spl_atf.c +++ b/common/spl/spl_atf.c @@ -50,13 +50,14 @@ static struct bl31_params *bl2_plat_get_bl31_params(uintptr_t bl33_entry) ATF_PARAM_IMAGE_BINARY, ATF_VERSION_1, 0); /* Fill BL32 related information if it exists */ -#ifdef BL32_BASE bl2_to_bl31_params->bl32_ep_info = &bl31_params_mem.bl32_ep_info; SET_PARAM_HEAD(bl2_to_bl31_params->bl32_ep_info, ATF_PARAM_EP, ATF_VERSION_1, 0); bl2_to_bl31_params->bl32_image_info = &bl31_params_mem.bl32_image_info; SET_PARAM_HEAD(bl2_to_bl31_params->bl32_image_info, ATF_PARAM_IMAGE_BINARY, ATF_VERSION_1, 0); +#ifndef BL32_BASE + bl2_to_bl31_params->bl32_ep_info->pc = 0; #endif /* BL32_BASE */ /* Fill BL33 related information */