From patchwork Mon Nov 16 15:02:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 1400970 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=qmuhaQIm; 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 4CZXPV0Ltmz9s1l for ; Tue, 17 Nov 2020 02:02:50 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4133A821F7; 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=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="qmuhaQIm"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 194B282385; Mon, 16 Nov 2020 16:02:32 +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-ed1-x544.google.com (mail-ed1-x544.google.com [IPv6:2a00:1450:4864:20::544]) (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 19B3081F67 for ; Mon, 16 Nov 2020 16:02:27 +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-ed1-x544.google.com with SMTP id e18so19052093edy.6 for ; Mon, 16 Nov 2020 07:02:27 -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=YQwEd9df2EVhL+rOqxONZIo+oI9x6o5NFwTTmIbviW8=; b=qmuhaQIm+fO6JeTqyBxvLF4LOjJ+fman49V1mBFo0amGFhmwMBoT6Fjn9FA2Ewv2/6 7PzbMRXxTBump+uqyIuDlj8/RuI/qkUX+FjSIeHEW9xO75A3e7n4OnAtioAxbC2KMf0Q w+sBKRoTPf3g3QMphMKuo5tJQZfmn72JK3pWEd83M82rW6aucDbE7c7s/2atcd4ZV0Wm mA/HuLaOnD2tkrk91TvmxocLu2sb8TZUz1Aqwe0pX9H9euNJ/SlRUgY4WQXSbGBd4qk4 /2rzLg3Eo6uJ5ppwcjVekdAd94MAqNMAOwI+IVdjX24nzY7GoRfJezj4NPeHTOVYnDbj 8FLQ== 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=YQwEd9df2EVhL+rOqxONZIo+oI9x6o5NFwTTmIbviW8=; b=NKQqY2TIJ+51cMVTE9WbFwzjxop9htRMFs/HUr37Er3Chd0vu46gLzduMgHJKQDBCO mrJ7ebxLEjnrxJYqMLn8NOGmr/ONd7DcmZQgfsolea0aCm3ionezr8lQ2Pr+vPBKXvsf Mg5abA7VXO85KDOBpzXVYmBaTXvl5E5j7Mec0YToE/SUGS7waxuMovgBT3IkSoJ7Rq30 S2o+reRXS2GMnaNGztnV8HO8Bg/2VMTJ8Lwv23VOK5vnNhlFFBA91LVkdBIUIkNlg7Et /Yo7XC2VpNk11jcvHg9oJqHKq5doogj/iYvE41tlgrQ05XPujGNkiNKECOeAEOVvbNA8 XKYQ== X-Gm-Message-State: AOAM5319hRgdtU7V2kjpVZXr+2j0/2sslm7KQ+tXNv0gkQjmh8hBppeW tVQRhsnweDru3jfJ7xZBnaG/CxbPd0LCuJzr X-Google-Smtp-Source: ABdhPJwm/Z1p6Rd6xJHt6zwb0rg/lf/t3FB0U1fujH7HRBUCXxpzZPq0IK5RirHm3h0KxHGzM0n8AQ== X-Received: by 2002:a05:6402:b8e:: with SMTP id cf14mr15306760edb.86.1605538946287; Mon, 16 Nov 2020 07:02:26 -0800 (PST) Received: from localhost (nat-35.starnet.cz. [178.255.168.35]) by smtp.gmail.com with ESMTPSA id j6sm10882744edy.87.2020.11.16.07.02.25 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 16 Nov 2020 07:02:25 -0800 (PST) From: Michal Simek To: u-boot@lists.denx.de, git@xilinx.com Cc: Michal Simek Subject: [PATCH v2 1/6] microblaze: Clean config file from ifdef mess Date: Mon, 16 Nov 2020 16:02:14 +0100 Message-Id: <7dcc533b89f9fab0e7f578675dba12a1a2d7aca4.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 A lot of configs has been moved to Kconfig and it ends up in ifdef mess with no bodies. That's why remove all of them. Signed-off-by: Michal Simek --- (no changes since v1) include/configs/microblaze-generic.h | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 2b4124235082..d5b2bd856608 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -67,24 +67,6 @@ # define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of sectors on one chip */ # define CONFIG_SYS_MAX_FLASH_SECT 512 -/* hardware flash protection */ -/* use buffered writes (20x faster) */ -# ifdef RAMENV -# else /* FLASH && !RAMENV */ -/* 128K(one sector) for env */ -# endif /* FLASH && !RAMBOOT */ -#else /* !FLASH */ - -#ifdef SPIFLASH -# ifdef RAMENV -# else /* SPIFLASH && !RAMENV */ -/* 128K(two sectors) for env */ -/* Warning: adjust the offset in respect of other flash content and size */ -# endif /* SPIFLASH && !RAMBOOT */ -#else /* !SPIFLASH */ - -/* ENV in RAM */ -#endif /* !SPIFLASH */ #endif /* !FLASH */ #define XILINX_USE_ICACHE 1 @@ -111,12 +93,6 @@ */ #define CONFIG_BOOTP_BOOTFILESIZE -#if defined(CONFIG_MTD_PARTITIONS) -/* MTD partitions */ - -/* default mtd partition table */ -#endif - /* size of console buffer */ #define CONFIG_SYS_CBSIZE 512 /* max number of command args */ From patchwork Mon Nov 16 15:02:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 1400971 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=aOjXyaQJ; 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 4CZXPk5j9Sz9sTv for ; Tue, 17 Nov 2020 02:03:06 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2CC1E823A9; Mon, 16 Nov 2020 16:02:42 +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="aOjXyaQJ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 64669821F7; Mon, 16 Nov 2020 16:02:32 +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-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) (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 16507821A4 for ; Mon, 16 Nov 2020 16:02:29 +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-x631.google.com with SMTP id f20so24869810ejz.4 for ; Mon, 16 Nov 2020 07:02:29 -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=/ULlKs0Km91gtXlC6Jts7ulk5TKkgx+O3fywZJj4Dvo=; b=aOjXyaQJ6zTgwMqS5WWJO9uvx0aIzDUn+u8/CRX6cGopZ9H9FAugxuD/t6uajHuj9O Kh3IfY7jP5XUyeTZtf4KkUsk/RgKJAqqn3o9tMfwGHHl3KnAZmFlTUbEX/+MFYkdvs2v Dfov+W+M3hR3+v7a3XV0p6GjgMTLCN10LuliWClpYDcoIWB3/zZskRfpKAgKoGNFfxh8 qNzkOW0mqMydVfaonjuoG3j+hzTHHVNFHuPkpGLhCo9Dew5T9ToShpBL5Kp72bAbzEdL 1+rTvNeXVDhK32xUBfpc5/Ot1Aia+n47Tsnj4UPcn5MM8O05SC4SesMDpg/RJlhwPNAz oTGQ== 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=/ULlKs0Km91gtXlC6Jts7ulk5TKkgx+O3fywZJj4Dvo=; b=rZ0s/7w2UpRWzYI0mUL+8aXp+xp931d01RxSZIEbSMvnVwp3wp5ZB833YBOfxu9Ybc bxrpA/YB3z+BzdylRuhUe2y9N3psYDAHtsm2OBno4s/Ap3xDCM2YwFwdQGYQYuvLUrub DFziSu0uhxo7IE4g/dgjwudN4njFSBH1SuujYHmaMfPrt0Zdrd75OT/qh0U24H9ecv4T vytZiOQf0g2FjRi6QUh5sQSz4YcjSkjlB6blF+0An1F2Rv5s2D7YIM5HVMdVdJnqho5t cP1L50af5jbcI4xJywJb4X7LJaQ+jBytuQ0QAEYMWXpIBP6Giqj//P8m0xkBL0L9yehV fyXg== X-Gm-Message-State: AOAM532DpLesG57AbdQNC2kFNCgLf4/oBaH+sCYBEvnrwTqvsy6a/eZa lBXT/LJcDILBoPz+7Y6/Z6+sFUCG97iMDmOu X-Google-Smtp-Source: ABdhPJwEYGSQtbNxI/I7X22pMlo5KeiX5v+78K8uz7NzRduyadm4s4RQVjdYj/DAqea9FhLyyp0VCQ== X-Received: by 2002:a17:906:d784:: with SMTP id pj4mr14464108ejb.78.1605538948200; Mon, 16 Nov 2020 07:02:28 -0800 (PST) Received: from localhost (nat-35.starnet.cz. [178.255.168.35]) by smtp.gmail.com with ESMTPSA id qt21sm10577970ejb.111.2020.11.16.07.02.27 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 16 Nov 2020 07:02:27 -0800 (PST) From: Michal Simek To: u-boot@lists.denx.de, git@xilinx.com Cc: Michal Simek Subject: [PATCH v2 2/6] microblaze: Simplify cache handling Date: Mon, 16 Nov 2020 16:02:15 +0100 Message-Id: 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 Enable caches by default. For now just simplify config file but it should be read from DT or PVRs. Signed-off-by: Michal Simek --- (no changes since v1) include/configs/microblaze-generic.h | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index d5b2bd856608..05ea64b16312 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -69,20 +69,8 @@ # define CONFIG_SYS_MAX_FLASH_SECT 512 #endif /* !FLASH */ -#define XILINX_USE_ICACHE 1 -#define XILINX_USE_DCACHE 1 - -#if defined(XILINX_USE_ICACHE) -# define CONFIG_ICACHE -#else -# undef CONFIG_ICACHE -#endif - -#if defined(XILINX_USE_DCACHE) -# define CONFIG_DCACHE -#else -# undef CONFIG_DCACHE -#endif +#define CONFIG_ICACHE +#define CONFIG_DCACHE #ifndef XILINX_DCACHE_BYTE_SIZE #define XILINX_DCACHE_BYTE_SIZE 32768 From patchwork Mon Nov 16 15:02:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 1400973 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=YcMzIYtd; 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 4CZXQT2h60z9sRK for ; Tue, 17 Nov 2020 02:03:45 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4CC5382563; Mon, 16 Nov 2020 16:02:46 +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="YcMzIYtd"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 50AEA823E1; Mon, 16 Nov 2020 16:02:36 +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-ed1-x544.google.com (mail-ed1-x544.google.com [IPv6:2a00:1450:4864:20::544]) (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 0B89E822D2 for ; Mon, 16 Nov 2020 16:02:31 +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-ed1-x544.google.com with SMTP id k4so2327063edl.0 for ; Mon, 16 Nov 2020 07:02:31 -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=kIbHW40xB1k1aTh9/E5GEtEwU6nFSrLrHZid/Dn2Nfs=; b=YcMzIYtdMSKHgWjSSjroEhzWFeipwXTJjACxhIe7SFV/fyYnKt6M/OVrYXCZjDDWT7 g/qHoaJRIcPmOZLWXSnFKIPZeaQQGLIUYLxa+4UQjKbEKBU1j4+5x2HSswrHMm3/sGBQ NbGOCJyaSOzhDJ20rFBYYPivK5FN0Jho+z9ejua5avtV4PWeMwYTbLVln/UnImkBP8SV Xj4cGYgKTcOvToaQlWR7xRATIkM0Ho7Gq35IUX3T1d1OrK4I5qJowWiRkp+2G1l2klV8 j07X7C8qQDB+e0qYUQwf+S1tJDJne4PGz8V6BxGNsLtZydOgiLRKVPX7bjRQnugD8MGz B6qA== 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=kIbHW40xB1k1aTh9/E5GEtEwU6nFSrLrHZid/Dn2Nfs=; b=gnyvsqQ0n9331Mf89UiLjsiE6IYQGmrDx1WcW6kilwQDaTokiA2P9dwHa9QgVdIukz 0bNebSm33HQLYnXzi37Oy1Wx3CcORi55TpvWv+pys/LDux0Du1bFXLSjD0+6sgCgqvUP MIOKBZX1yFU5WXTHUL2ebKh7ca+w02jrW+IQWh+XRhmanF0THcgG3JSSnr2oz7Xp42v2 dKFAWQ346QrQmPIGKlA5BRtdZ0uesS7FiS4Xe3zaQg+VZ1V0yDyoOBz+YpNxnzxVs0L3 4SPjRo0mo6OWzSsfycEzl3TM/f4tVqp9u1jVpXMLU/bUXj4h/b918wbF5SMpRymXlu/N srDw== X-Gm-Message-State: AOAM531hh7IR92bJ/u4+rI6U7pA9FKIZZzI5LAY0JqHs/SFBCJVcrtdy L/1yVXtQbcFKqaEQsqgDlTRHzmuACSilvCnC X-Google-Smtp-Source: ABdhPJxfJ2yPaUR5EWdvm6KkX1wRjitP+/QUhyAQa+PZJR2SHId54uFooTpvwvG0qWmqxh5hmy7vqw== X-Received: by 2002:a50:d757:: with SMTP id i23mr15925639edj.358.1605538950415; Mon, 16 Nov 2020 07:02:30 -0800 (PST) Received: from localhost (nat-35.starnet.cz. [178.255.168.35]) by smtp.gmail.com with ESMTPSA id m26sm10501841ejb.45.2020.11.16.07.02.29 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 16 Nov 2020 07:02:29 -0800 (PST) From: Michal Simek To: u-boot@lists.denx.de, git@xilinx.com Cc: Michal Simek Subject: [PATCH v2 3/6] microblaze: Get rid of xparameters.h Date: Mon, 16 Nov 2020 16:02:16 +0100 Message-Id: <8075f8815340f3a16280032875b72a9e28c6c69d.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 There is no need to use this file anymore. Include it in main config file and simplify logic based on it. Signed-off-by: Michal Simek --- (no changes since v1) board/xilinx/microblaze-generic/xparameters.h | 18 ------------------ include/configs/microblaze-generic.h | 7 ++++++- 2 files changed, 6 insertions(+), 19 deletions(-) delete mode 100644 board/xilinx/microblaze-generic/xparameters.h diff --git a/board/xilinx/microblaze-generic/xparameters.h b/board/xilinx/microblaze-generic/xparameters.h deleted file mode 100644 index 5e0911faf633..000000000000 --- a/board/xilinx/microblaze-generic/xparameters.h +++ /dev/null @@ -1,18 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * (C) Copyright 2007 Michal Simek - * - * Michal SIMEK - * - * CAUTION: This file is a faked configuration !!! - * There is no real target for the microblaze-generic - * configuration. You have to replace this file with - * the generated file from your Xilinx design flow. - */ - -/* Microblaze is microblaze_0 */ -#define XILINX_FSL_NUMBER 3 - -/* Flash Memory is FLASH_2Mx32 */ -#define XILINX_FLASH_START 0x2c000000 -#define XILINX_FLASH_SIZE 0x00800000 diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 05ea64b16312..2cfcace7b066 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -8,7 +8,12 @@ #ifndef __CONFIG_H #define __CONFIG_H -#include "../board/xilinx/microblaze-generic/xparameters.h" +/* Microblaze is microblaze_0 */ +#define XILINX_FSL_NUMBER 3 + +/* Flash Memory is FLASH_2Mx32 */ +#define XILINX_FLASH_START 0x2c000000 +#define XILINX_FLASH_SIZE 0x00800000 /* MicroBlaze CPU */ #define MICROBLAZE_V5 1 From patchwork Mon Nov 16 15:02:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 1400974 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=2a01:238:438b:c500:173d:9f52:ddab:ee01; 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=SXvbteOS; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (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 4CZXQv1Ssnz9s1l for ; Tue, 17 Nov 2020 02:04:07 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 91A1882564; Mon, 16 Nov 2020 16:02:55 +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="SXvbteOS"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 42B6C82366; Mon, 16 Nov 2020 16:02:39 +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-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) (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 CF74581F67 for ; Mon, 16 Nov 2020 16:02:32 +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-x634.google.com with SMTP id oq3so24849584ejb.7 for ; Mon, 16 Nov 2020 07:02:32 -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=Ryl78gVI1hD4E+u8pHWyXG1jbSAH84Of5ty3MoOQqEI=; b=SXvbteOSYoeBwfs8YJCxRRrZH4dZIVYsFHYDyRR2LaqHBGLt2BtF7YMWYsi0c/DMEj N91M6GAiuTfsFkBgBclsHRO1d3hu68cqhiCYS5tqtOO8c1jK7EwE766djWV6HXAu2saY t2jtKeAsl/ynrXo1YGf9VzL0PrZBbUroaux0jXQxk+oJI90F4E46sg6Y4QiAtm645RtA CCznVAxyLhF7AWwlwYOCOq9Zra744Ab/UI2nskEHDW5tIbgI+sxptSa4jFB78JArcYAf 8eCWxxormKPoNF8wcMp1wZdTByan+HVMeqZiHGuQnXEMO7KBNgn1tV9RqUXVXw5ZugK1 WSgA== 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=Ryl78gVI1hD4E+u8pHWyXG1jbSAH84Of5ty3MoOQqEI=; b=EwukAXzUXXUGiylyOHei825a1VtE7InzeVw42r+V4mN7bzqGqQS2k/ab5msuvsIodZ oU3rfO5Rs82xZqWRY4if71B/bCsdzhBTnQq1DUpM8T03COYoZywZMUPNvi6HssFCe33i r6B9/vvEKVwKAu8moBF+Vo6T0OZGgNQwXSt0RFkam++7vp9dGeHYXJbivDoi8PrrCtkr loi2N3JL+tO38cuVdXgNDhPHLksw0UeB8mH+oQKKR7LfF2SkP55fqrSvZPL8bohsB7tR 2OvMXmM/6C4rhKxyI6InMc8vg3QuLkZcjpd/f0pRrMLamFVPryH3nVNvpxvZtfhkSw5c GXVg== X-Gm-Message-State: AOAM5330J1zYWH4nz0tv+tdD/wyr6QaA3rXmCiVcOLfJ7k047F618UiE RuDx3fs5G3alm7ZFPD/BlONAQb7j5V5YdOUB X-Google-Smtp-Source: ABdhPJzEeIozRoqHu2pjz31YfVG3KrDchn6gjfeghMiYh60n5Z9k84gSKvhcJOfT2Dmr5sIn/7e7yg== X-Received: by 2002:a17:906:4bcb:: with SMTP id x11mr14510041ejv.538.1605538952161; Mon, 16 Nov 2020 07:02:32 -0800 (PST) Received: from localhost (nat-35.starnet.cz. [178.255.168.35]) by smtp.gmail.com with ESMTPSA id i13sm10514933ejv.84.2020.11.16.07.02.31 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 16 Nov 2020 07:02:31 -0800 (PST) From: Michal Simek To: u-boot@lists.denx.de, git@xilinx.com Cc: Adam Ford , Holger Brunck , Marek Vasut , Michal Simek , Patrick Delaunay , Simon Glass , Stefan Roese Subject: [PATCH v2 4/6] microblaze: Remove CONFIG_SYS_FDT_SIZE Date: Mon, 16 Nov 2020 16:02:17 +0100 Message-Id: <4918ef68ae1f5ebe154eb8356666e6827ed98b3c.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 CONFIG_SYS_FDT_SIZE is not use anywhere that's why remove it. Signed-off-by: Michal Simek --- (no changes since v1) include/configs/microblaze-generic.h | 1 - scripts/config_whitelist.txt | 1 - 2 files changed, 2 deletions(-) diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 2cfcace7b066..72550113cefa 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -171,7 +171,6 @@ #define CONFIG_SYS_FDT_BASE (CONFIG_SYS_FLASH_BASE + \ 0x40000) -#define CONFIG_SYS_FDT_SIZE (16 << 10) #define CONFIG_SYS_SPL_ARGS_ADDR (CONFIG_SYS_TEXT_BASE + \ 0x1000000) diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 0aabe7a45165..8b4fcba395a3 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -2170,7 +2170,6 @@ CONFIG_SYS_FCC_PSMR CONFIG_SYS_FDT_BASE CONFIG_SYS_FDT_LOAD_ADDR CONFIG_SYS_FDT_PAD -CONFIG_SYS_FDT_SIZE CONFIG_SYS_FEC0_IOBASE CONFIG_SYS_FEC1_IOBASE CONFIG_SYS_FECI2C 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) From patchwork Mon Nov 16 15:02:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 1400976 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=JhPfXGQU; 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 4CZXRV0Ny8z9s1l for ; Tue, 17 Nov 2020 02:04:37 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 430DA82580; Mon, 16 Nov 2020 16:03:02 +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="JhPfXGQU"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7AA9182563; Mon, 16 Nov 2020 16:02:45 +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-ed1-x543.google.com (mail-ed1-x543.google.com [IPv6:2a00:1450:4864:20::543]) (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 8546082366 for ; Mon, 16 Nov 2020 16:02:41 +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-ed1-x543.google.com with SMTP id y4so13213744edy.5 for ; Mon, 16 Nov 2020 07:02:41 -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=JVDRciUWSTCTnxmSkm+76ANGDEdRKCPD/9gwoZgzryg=; b=JhPfXGQUd21LO7lAfCTJ3KQnvIjJVu/vTj7gzfFcSlmsMLW5cYi8vkYwvbKPHwOKW3 3tsjZR3lxQ1nTCw5CKLMWNcdnZONmwGAKEJO7Fg/TFeGeRmO4UjmpjBzpuq55MOw/2yc tK9Z2MW6Bg2dxABfzC1NTFeFPjikFdFafbHCW3sNP9bPOW5xQ2yqieP0tUtWgBXUSFfb m/fAGOF/viar8y3Ki0upePzZUBPuBsXPoRclYmsl6LuW9H9nBIh5dCEN3THzsLEZVKnQ 3+7YaCwI32oEtrfwbnhDbigjLWSwHq8M5ijwAcjB/iXPa3bnPbFu3lYjV00T8lJ08OT3 HEnw== 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=JVDRciUWSTCTnxmSkm+76ANGDEdRKCPD/9gwoZgzryg=; b=CdWbT+nZ3EOMDc3zzl+JM1n5dkHXXfonrFFiFfwHUdRLGuMdo0O2rkXJbaSTnq9jNc RlaMJWn4kQL/Xgclwqn39f90bk2etZBnjyII7Bc25vBsGioHELx8+8TiBkv8atW7442y 5QwyPw4iffrD0e32TI3UsHbNcA1MJIAPd8PChYBZaUXVsl2IVtDzuCdPINr+vZJatpla 6GHLM7tbjmRT/JnBvwbCba92pgUbtDxR2l2rOUZC+75KPd1SfH/ykkzayFC/wCxD/Hbg ZOcF0AkCJHDyLewD2ZVsmmDBhoL23h8eDxuEgWV25w1OVYKqrPYGwWrziyxOsNWLwrVJ woQg== X-Gm-Message-State: AOAM531ykaOc2x9oC3vV7M6VL42JwhAb6iP7NtXoTGRvvLWdAtcD53XX aSIqtgcf3jLsZv+1yqZLBdQo5pWnV0Zody/e X-Google-Smtp-Source: ABdhPJxTh0+ZLQE2NGXDIvOAScrMFzLAUj8XfAf1RgMO7LbVXMqZ2Upy+GG89BfDBOzA4Ds3EeuC2Q== X-Received: by 2002:aa7:c512:: with SMTP id o18mr15776206edq.357.1605538955746; Mon, 16 Nov 2020 07:02:35 -0800 (PST) Received: from localhost (nat-35.starnet.cz. [178.255.168.35]) by smtp.gmail.com with ESMTPSA id cx6sm11004352edb.61.2020.11.16.07.02.34 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 16 Nov 2020 07:02:34 -0800 (PST) From: Michal Simek To: u-boot@lists.denx.de, git@xilinx.com Cc: Michal Simek Subject: [PATCH v2 6/6] microblaze: Detect NOR flash based on DT Date: Mon, 16 Nov 2020 16:02:19 +0100 Message-Id: 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 Remove fixed configuration and detect flash based on DT. Also increase amount of flash sectors to 2048 because on kc705 flash has 1027 sectors. Bank # 1: CFI conformant flash (16 x 16) Size: 128 MB in 1027 Sectors Intel Extended command set, Manufacturer ID: 0x89, Device ID: 0x8962 Erase timeout: 4096 ms, write timeout: 2 ms Buffer write timeout: 5 ms, buffer size: 1024 bytes Signed-off-by: Michal Simek --- (no changes since v1) configs/microblaze-generic_defconfig | 2 ++ include/configs/microblaze-generic.h | 41 ++-------------------------- 2 files changed, 5 insertions(+), 38 deletions(-) diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig index 08c88856dcd9..761cc65cbfab 100644 --- a/configs/microblaze-generic_defconfig +++ b/configs/microblaze-generic_defconfig @@ -48,8 +48,10 @@ CONFIG_DM_I2C=y CONFIG_LED=y CONFIG_LED_GPIO=y CONFIG_MTD=y +CONFIG_DM_MTD=y CONFIG_MTD_NOR_FLASH=y CONFIG_FLASH_CFI_DRIVER=y +CONFIG_CFI_FLASH=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y CONFIG_FLASH_CFI_MTD=y CONFIG_SYS_FLASH_PROTECTION=y diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index c31a7880743f..bc0bf0497378 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -11,26 +11,11 @@ /* Microblaze is microblaze_0 */ #define XILINX_FSL_NUMBER 3 -/* Flash Memory is FLASH_2Mx32 */ -#define XILINX_FLASH_START 0x2c000000 -#define XILINX_FLASH_SIZE 0x00800000 - /* MicroBlaze CPU */ #define MICROBLAZE_V5 1 #define CONFIG_SYS_BOOTM_LEN (64 * 1024 * 1024) -/* linear and spi flash memory */ -#ifdef XILINX_FLASH_START -#define FLASH -#undef SPIFLASH -#undef RAMENV /* hold environment in flash */ -#else -#undef FLASH -#undef SPIFLASH -#define RAMENV /* hold environment in RAM */ -#endif - /* uart */ /* The following table includes the supported baudrates */ # define CONFIG_SYS_BAUDRATE_TABLE \ @@ -45,34 +30,14 @@ #define CONFIG_SYS_INIT_SP_OFFSET (CONFIG_SYS_TEXT_BASE - \ CONFIG_SYS_MALLOC_F_LEN) -/* - * CFI flash memory layout - Example - * CONFIG_SYS_FLASH_BASE = 0x2200_0000; - * CONFIG_SYS_FLASH_SIZE = 0x0080_0000; 8MB - * - * SECT_SIZE = 0x20000; 128kB is one sector - * CONFIG_ENV_SIZE = SECT_SIZE; 128kB environment store - * - * 0x2200_0000 CONFIG_SYS_FLASH_BASE - * FREE 256kB - * 0x2204_0000 CONFIG_ENV_ADDR - * ENV_AREA 128kB - * 0x2206_0000 - * FREE - * 0x2280_0000 CONFIG_SYS_FLASH_BASE + CONFIG_SYS_FLASH_SIZE - * - */ - -#ifdef FLASH -# define CONFIG_SYS_FLASH_BASE XILINX_FLASH_START -# define CONFIG_SYS_FLASH_SIZE XILINX_FLASH_SIZE +#ifdef CONFIG_CFI_FLASH /* ?empty sector */ # define CONFIG_SYS_FLASH_EMPTY_INFO 1 /* max number of memory banks */ # define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of sectors on one chip */ -# define CONFIG_SYS_MAX_FLASH_SECT 512 -#endif /* !FLASH */ +# define CONFIG_SYS_MAX_FLASH_SECT 2048 +#endif #define CONFIG_ICACHE #define CONFIG_DCACHE