From patchwork Mon Nov 16 15:02:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 1400975 X-Patchwork-Delegate: monstr@monstr.eu Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20150623.gappssmtp.com header.i=@monstr-eu.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=E4QsrtGb; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CZXRC4Cmmz9s1l for ; Tue, 17 Nov 2020 02:04:23 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 396F782575; Mon, 16 Nov 2020 16:03:00 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20150623.gappssmtp.com header.i=@monstr-eu.20150623.gappssmtp.com header.b="E4QsrtGb"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5E7A7822D2; Mon, 16 Nov 2020 16:02:40 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ej1-x641.google.com (mail-ej1-x641.google.com [IPv6:2a00:1450:4864:20::641]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 7316582385 for ; Mon, 16 Nov 2020 16:02:34 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=monstr@monstr.eu Received: by mail-ej1-x641.google.com with SMTP id f20so24870322ejz.4 for ; Mon, 16 Nov 2020 07:02:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Bat5b48ZRD2Xahbx2Hw7FXEo9fJoX5x/+yXEXpZjy0g=; b=E4QsrtGbTlG8e401Mf8Ta8i2wxtqS8LaF5cQ1848/oWVpuyaNeGDB2M8lNF5VZzD51 Ewo11auYyCZ/+9nk0/Z5G33OEtwezuFH+tE7+mB4c0ERmzTdrIFyijNMYKsqzb7bYUIs cxartHPYclccVsWVxoj2Jr4ZnGZaSnYvLZ8LDNCU5WhhBrnvIjcIt3Twx6z82df5lH6h u47o+7Lm+9hLmuHDDV/nPe3BuKZBr+8rGhElJ9MGYWRBlvmNjnl5WRAV2wlH7Mib4dqR reimgtnFB9ECUOwxLVhvrENDJSljepUpzIUACyr7gpaUYU+6I3gaKbiiD1eCNnqndHya kMfA== 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 :in-reply-to:references:mime-version:content-transfer-encoding; bh=Bat5b48ZRD2Xahbx2Hw7FXEo9fJoX5x/+yXEXpZjy0g=; b=X0T5u8/dY7gTvJiKUxueP/jm4CH0R38BCWLcHlrNFIKmrmwpQDfVmaKNusAXiGyfSN vZVTUc5C+Hw96K3o8bDgSE6hFR1qV1Yu6G2mbcF9M3wfQzk3ZZw00oUYmCpEhKPUaBK+ YK5Cz8F73cH+LvRR1kX+UflmJQNxMlYoL0mUqjuiPxQo9IUxZ8Ch7UWfi8HfO13nTdwE 6/F42rA7gAkZuBicz7x6BXb/xSAyregZOVONR6OE1yTQXw7JpboFYKejgYuoHEmG4mnr ZPFsKR88ygtHPHTK32tsiKhGhJoBWuZvGKi8OlSmeKvrWL+jIO1ZKv4GHEvMoUI86TNn eREQ== X-Gm-Message-State: AOAM533cEHnuMXmhHaXccjA+8HNl4gEg13Y8zk/vV3v2OUvNxvwuxgOR VhmJ16vY7ywiRd76H9VHUCfV9nt5zZrVupOo X-Google-Smtp-Source: ABdhPJyAZSWPk5hZP0L9v6WBreG5NWa2Fu2zb3PHXhcw+Q4EvAyryEAvdBc78mSP4gAhb7Q3eyeYfg== X-Received: by 2002:a17:906:9902:: with SMTP id zl2mr15007289ejb.510.1605538953776; Mon, 16 Nov 2020 07:02:33 -0800 (PST) Received: from localhost (nat-35.starnet.cz. [178.255.168.35]) by smtp.gmail.com with ESMTPSA id p91sm11050782edp.9.2020.11.16.07.02.33 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 16 Nov 2020 07:02:33 -0800 (PST) From: Michal Simek To: u-boot@lists.denx.de, git@xilinx.com Cc: Michal Simek Subject: [PATCH v2 5/6] microblaze: Unify of setting for SPL_NOR/XIP support Date: Mon, 16 Nov 2020 16:02:18 +0100 Message-Id: <7bbf59a0274d75ccc0d0815ca286a4670a4d8a1e.1605538936.git.michal.simek@xilinx.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean XIP is not enabled in SPL. SPL_NOR is enabled but any macro setting with using SYS_FLASH_BASE are wrong because it is not aligned with DM. That's why change these macro and align them with TEXT_BASE macro. Information should be find at run time based on DT but implementation is not done yet. Signed-off-by: Michal Simek --- Changes in v2: - Rework the whole patch because SPL_NOR is enabled by default. include/configs/microblaze-generic.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 72550113cefa..c31a7880743f 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -163,14 +163,12 @@ /* SPL part */ -#ifdef CONFIG_SYS_FLASH_BASE -# define CONFIG_SYS_UBOOT_BASE CONFIG_SYS_FLASH_BASE -#endif +#define CONFIG_SYS_UBOOT_BASE CONFIG_SYS_TEXT_BASE /* for booting directly linux */ +#define CONFIG_SYS_FDT_BASE (CONFIG_SYS_TEXT_BASE + \ + 0x40000) -#define CONFIG_SYS_FDT_BASE (CONFIG_SYS_FLASH_BASE + \ - 0x40000) #define CONFIG_SYS_SPL_ARGS_ADDR (CONFIG_SYS_TEXT_BASE + \ 0x1000000)