From patchwork Wed Jan 16 16:11:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Brodkin X-Patchwork-Id: 1026001 X-Patchwork-Delegate: alexey.brodkin@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=synopsys.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=synopsys.com header.i=@synopsys.com header.b="bc6ktb+/"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43fsf36vMhz9sBZ for ; Thu, 17 Jan 2019 03:11:35 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id AF7CFC220F5; Wed, 16 Jan 2019 16:11:29 +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=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 B0C78C21C57; Wed, 16 Jan 2019 16:11:26 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 827E3C21C57; Wed, 16 Jan 2019 16:11:24 +0000 (UTC) Received: from smtprelay.synopsys.com (us01smtprelay-2.synopsys.com [198.182.47.9]) by lists.denx.de (Postfix) with ESMTPS id C7866C21C29 for ; Wed, 16 Jan 2019 16:11:23 +0000 (UTC) Received: from mailhost.synopsys.com (mailhost3.synopsys.com [10.12.238.238]) by smtprelay.synopsys.com (Postfix) with ESMTP id 9B84424E229D; Wed, 16 Jan 2019 08:11:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=synopsys.com; s=mail; t=1547655081; bh=Un7ScyRLZ04fZ+dONTMED2dk3Qm+WjcN1U4cwbb7JKA=; h=From:To:Cc:Subject:Date:From; b=bc6ktb+/F9R7HcCFY26Q3aG0K67nebHXKxLwGPvitDhfLgbubZCDpU6QyXUQnU/lT EcAylXBSEBohmGqBly5Si960EuFzDML8unTcSRlk1tgXYVpvlIU2KxR1nA6jFZdepD pRrj0G9csopmY9ZmZGq8nLj+ThdqkQW8sccO/OxOLQwAHLA2oRTmgcGbYsDye1fxGU IB3kPiABdBwBlo4WLZYECSbJucokksoYOaS0+ZNGG6d8WUtuoTSIx+G4YTOs1rgX58 DLejWKPmCKeYUcQGQlmrk49KkNJc6+Eteuo2lFQ+/fluvASWGHJBud0rB0pavtgPAh ol7mYDv8y7tnA== Received: from ru20arcgnu1.internal.synopsys.com (ru20arcgnu1.internal.synopsys.com [10.121.9.48]) by mailhost.synopsys.com (Postfix) with ESMTP id D235738E2; Wed, 16 Jan 2019 08:11:17 -0800 (PST) From: Alexey Brodkin To: u-boot@lists.denx.de Date: Wed, 16 Jan 2019 19:11:15 +0300 Message-Id: <20190116161115.21136-1-abrodkin@synopsys.com> X-Mailer: git-send-email 2.16.2 Cc: Tom Rini , Alexey Brodkin , Michal Simek , uboot-snps-arc@synopsys.com Subject: [U-Boot] [PATCH] ARC: Move ENV_SIZE and ENV_OFFSET to Kconfig 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" Join the party of some ARM boards and drop more items from include/configs/xxx.h. Signed-off-by: Alexey Brodkin Cc: Michal Simek Cc: Simon Glass Cc: Tom Rini --- configs/emsdp_defconfig | 1 + configs/iot_devkit_defconfig | 1 + configs/tb100_defconfig | 1 + env/Kconfig | 4 +++- include/configs/axs10x.h | 1 - include/configs/emsdp.h | 1 - include/configs/hsdk.h | 2 -- include/configs/iot_devkit.h | 1 - include/configs/nsim.h | 6 ------ include/configs/tb100.h | 6 ------ 10 files changed, 6 insertions(+), 18 deletions(-) diff --git a/configs/emsdp_defconfig b/configs/emsdp_defconfig index 273334b05d..64281d0529 100644 --- a/configs/emsdp_defconfig +++ b/configs/emsdp_defconfig @@ -3,6 +3,7 @@ CONFIG_ISA_ARCV2=y CONFIG_CPU_ARCEM6=y CONFIG_TARGET_EMSDP=y CONFIG_SYS_TEXT_BASE=0x00000000 +CONFIG_ENV_SIZE=0x1000 CONFIG_SYS_CLK_FREQ=40000000 # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set CONFIG_VERSION_VARIABLE=y diff --git a/configs/iot_devkit_defconfig b/configs/iot_devkit_defconfig index 1b6dd9e55a..24bbe3fc5d 100644 --- a/configs/iot_devkit_defconfig +++ b/configs/iot_devkit_defconfig @@ -5,6 +5,7 @@ CONFIG_SYS_ICACHE_OFF=y CONFIG_SYS_DCACHE_OFF=y CONFIG_TARGET_IOT_DEVKIT=y CONFIG_SYS_TEXT_BASE=0x00000000 +CONFIG_ENV_SIZE=0x1000 CONFIG_SYS_CLK_FREQ=16000000 CONFIG_LOCALVERSION="-iotdk-1.0" # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set diff --git a/configs/tb100_defconfig b/configs/tb100_defconfig index f30053d4de..e3837d92e7 100644 --- a/configs/tb100_defconfig +++ b/configs/tb100_defconfig @@ -1,6 +1,7 @@ CONFIG_ARC=y CONFIG_TARGET_TB100=y CONFIG_SYS_TEXT_BASE=0x84000000 +CONFIG_ENV_SIZE=0x800 CONFIG_SYS_CLK_FREQ=500000000 CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y diff --git a/env/Kconfig b/env/Kconfig index 9011109b47..8beaa7249a 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -431,7 +431,7 @@ config ENV_EXT4_FILE It's a string of the EXT4 file name. This file use to store the environment (explicit path to the file) -if ARCH_ROCKCHIP || ARCH_SUNXI || ARCH_ZYNQ || ARCH_ZYNQMP || ARCH_VERSAL +if ARCH_ROCKCHIP || ARCH_SUNXI || ARCH_ZYNQ || ARCH_ZYNQMP || ARCH_VERSAL || ARC config ENV_OFFSET hex "Environment Offset" @@ -441,6 +441,7 @@ config ENV_OFFSET default 0x88000 if ARCH_SUNXI default 0xE0000 if ARCH_ZYNQ default 0x1E00000 if ARCH_ZYNQMP + default 0 help Offset from the start of the device (or partition) @@ -449,6 +450,7 @@ config ENV_SIZE default 0x40000 if ENV_IS_IN_SPI_FLASH && ARCH_ZYNQMP default 0x20000 if ARCH_SUNXI || ARCH_ZYNQ default 0x8000 if ARCH_ROCKCHIP || ARCH_ZYNQMP || ARCH_VERSAL + default 0x4000 if ARC help Size of the environment storage area diff --git a/include/configs/axs10x.h b/include/configs/axs10x.h index 9452b06771..24afbc8fe5 100644 --- a/include/configs/axs10x.h +++ b/include/configs/axs10x.h @@ -62,7 +62,6 @@ /* * Environment settings */ -#define CONFIG_ENV_SIZE SZ_16K #define CONFIG_EXTRA_ENV_SETTINGS \ "upgrade=if mmc rescan && " \ "fatload mmc 0:1 ${loadaddr} u-boot-update.img && " \ diff --git a/include/configs/emsdp.h b/include/configs/emsdp.h index 9a205edc7c..44614138f8 100644 --- a/include/configs/emsdp.h +++ b/include/configs/emsdp.h @@ -24,7 +24,6 @@ /* * Environment */ -#define CONFIG_ENV_SIZE SZ_4K #define CONFIG_BOOTFILE "app.bin" #define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR diff --git a/include/configs/hsdk.h b/include/configs/hsdk.h index 94c88b29f1..4755567a2d 100644 --- a/include/configs/hsdk.h +++ b/include/configs/hsdk.h @@ -57,8 +57,6 @@ /* * Environment settings */ -#define CONFIG_ENV_SIZE SZ_16K - #define CONFIG_EXTRA_ENV_SETTINGS \ "upgrade=if mmc rescan && " \ "fatload mmc 0:1 ${loadaddr} u-boot-update.scr && " \ diff --git a/include/configs/iot_devkit.h b/include/configs/iot_devkit.h index 4ffe1141d9..4b110bb9d8 100644 --- a/include/configs/iot_devkit.h +++ b/include/configs/iot_devkit.h @@ -77,7 +77,6 @@ /* * Environment */ -#define CONFIG_ENV_SIZE SZ_4K #define CONFIG_BOOTFILE "app.bin" #define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR diff --git a/include/configs/nsim.h b/include/configs/nsim.h index c3f34a91e4..61217bbe79 100644 --- a/include/configs/nsim.h +++ b/include/configs/nsim.h @@ -24,12 +24,6 @@ #define CONFIG_SYS_BOOTM_LEN SZ_32M #define CONFIG_SYS_LOAD_ADDR 0x82000000 -/* - * Environment settings - */ -#define CONFIG_ENV_SIZE SZ_512 -#define CONFIG_ENV_OFFSET 0 - /* * Environment configuration */ diff --git a/include/configs/tb100.h b/include/configs/tb100.h index 96e5b6315c..a761c37335 100644 --- a/include/configs/tb100.h +++ b/include/configs/tb100.h @@ -52,12 +52,6 @@ * Command line configuration */ -/* - * Environment settings - */ -#define CONFIG_ENV_SIZE SZ_2K -#define CONFIG_ENV_OFFSET 0 - /* * Environment configuration */