From patchwork Wed Sep 25 15:00:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1167494 X-Patchwork-Delegate: bmeng.cn@gmail.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; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="KK6ELSNg"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46dk5Z693Qz9sNx for ; Thu, 26 Sep 2019 02:28:50 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 86E8FC2218C; Wed, 25 Sep 2019 16:16:59 +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 C2C29C22055; Wed, 25 Sep 2019 15:07:06 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B055AC21F74; Wed, 25 Sep 2019 15:07:04 +0000 (UTC) Received: from mail-io1-f65.google.com (mail-io1-f65.google.com [209.85.166.65]) by lists.denx.de (Postfix) with ESMTPS id AD7C3C22153 for ; Wed, 25 Sep 2019 15:02:20 +0000 (UTC) Received: by mail-io1-f65.google.com with SMTP id h144so14630191iof.7 for ; Wed, 25 Sep 2019 08:02:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=akgnZtYWTOi0nX/zrWIlr8rfKAocVnrgmGaj6/EOZu8=; b=KK6ELSNg5skY6xWD89YAHpGts+Kf7lz9RY5HjjrtlVumyype1gk79eEtxAbnknSST0 1Zix2kEhanOaoGfALrOrRvdJ+nX3E4HnIGU5hfDed7TS2DK6Kuc559EGUkfh7X6z3WQr Ba055RRYKP1rvVwmleob0Xc8Fd/9oIXB5hs/E= 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=akgnZtYWTOi0nX/zrWIlr8rfKAocVnrgmGaj6/EOZu8=; b=IBd3O/CbgebagMl76+OJFZadFerz41R1jrEFrepbgQFPcEDjqBnX2332LKYYXZ4lEq qBdmhP48dJspyfo4Eo9PfGTW4RVXC9IwLj2WYi8cGcwGswwu+sjFn7IDgcgHnKvLnnwH VSLPFB9LwiyfQgqgGi/THQzdGU8Q/ha0CPToKsdYod4yBK6CGoIrcB+/8lq7mtMDH/aw FVQjyp+WvTn/EpEULWsc5Xsw5GWAmuvvnZI/5ig/o8cLm44UI7E66GCUcLiYpU1kEm97 wxcT8Dv0OKwhlkBHySCDZINKZdFZp+aRqZhJpeg9A5z0UuVVgoP9zWypeM0aX76AllL3 rZtQ== X-Gm-Message-State: APjAAAXBIABM5igWBgStGK/qpusZDTY2gMnHqgvxWlJtbtWcG2IGS6nq mUPRiB+8rQ4JR52MaAFungPdSvzYq2o= X-Google-Smtp-Source: APXvYqxj7RC5NbEgtTcFQjBEWBWfWBGMI2ssGdCa+vRG/WLqRfiN9U4p2ZwIKmOuZ2v07YA3ySllbg== X-Received: by 2002:a6b:9109:: with SMTP id t9mr5527264iod.16.1569423739456; Wed, 25 Sep 2019 08:02:19 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id 197sm6758613ioc.78.2019.09.25.08.02.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Sep 2019 08:02:19 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Wed, 25 Sep 2019 09:00:30 -0600 Message-Id: <20190925150052.201698-105-sjg@chromium.org> X-Mailer: git-send-email 2.23.0.444.g18eeb5a265-goog In-Reply-To: <20190925150052.201698-102-sjg@chromium.org> References: <20190925150052.201698-102-sjg@chromium.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH 104/126] x86: Add an option to control the position of SPL 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" For apollolake SPL is run from CAR (cache-as-RAM) which is in a different location from where SPL must be placed in ROM. In other words, although SPL runs before SDRAM is set up, it is not execute-in-place (XIP). Add a Kconfig option for the ROM position. Signed-off-by: Simon Glass --- arch/x86/Kconfig | 5 +++++ arch/x86/dts/u-boot.dtsi | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 02c116caeb7..9d01801ff13 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -896,4 +896,9 @@ config X86_OFFSET_U_BOOT depends on HAS_SYS_TEXT_BASE default SYS_TEXT_BASE +config X86_OFFSET_SPL + hex "Offset of SPL in ROM image" + depends on X86 + default SPL_TEXT_BASE + endmenu diff --git a/arch/x86/dts/u-boot.dtsi b/arch/x86/dts/u-boot.dtsi index f33f276b90d..8fc5146f26c 100644 --- a/arch/x86/dts/u-boot.dtsi +++ b/arch/x86/dts/u-boot.dtsi @@ -49,7 +49,7 @@ u-boot-tpl-dtb { }; u-boot-spl { - offset = ; + offset = ; }; u-boot-spl-dtb { }; @@ -58,7 +58,7 @@ }; #elif defined(CONFIG_SPL) u-boot-spl-with-ucode-ptr { - offset = ; + offset = ; }; u-boot-dtb-with-ucode2 { type = "u-boot-dtb-with-ucode";