From patchwork Wed Jul 18 11:28:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 945673 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=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=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.b="w+juLVKW"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41Vvzg6h6Hz9s0n for ; Wed, 18 Jul 2018 21:28:47 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 76183C21DF9; Wed, 18 Jul 2018 11:28:44 +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_H3, RCVD_IN_MSPIKE_WL, 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 5302BC21C27; Wed, 18 Jul 2018 11:28:41 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D2F63C21C27; Wed, 18 Jul 2018 11:28:39 +0000 (UTC) Received: from mail-wm0-f54.google.com (mail-wm0-f54.google.com [74.125.82.54]) by lists.denx.de (Postfix) with ESMTPS id 7A020C21BE5 for ; Wed, 18 Jul 2018 11:28:39 +0000 (UTC) Received: by mail-wm0-f54.google.com with SMTP id s14-v6so2510371wmc.1 for ; Wed, 18 Jul 2018 04:28:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:subject:date:message-id; bh=390xdIrV3AYm3BnrDlyCj4pod/fb8V45at9kdiYdIBI=; b=w+juLVKWkrh20YaeYPPZ7CokhkRld99qrs2gFY8jlQeTX4wSd9J0t7G5eEIz/IQDZP 9mU6NLv7+qQUDyFfkH+iIOmGPrbnXAOvozrCRUUM/hfUkMqRQahV0pfBH4ND7R8LQoYe TkSTBolGFcmaSt8eRr4dx02x287p+ght2BolevCvubF1ms6BK4Tc9pIymgkeQTm0g5pV KWwJIUjB8k9fi6gZ87vsbJNrofyrH/r6M/CuHYSdUASP9Q0JrA9GsNdTzyBRKJMMNg20 t00SVUxo2+2bgtPb7+1LvEBz10tPeNyQnbvjcIE6X2l/jtbh2RIfhIdqM3xrCh38m0XS o3XA== 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:subject:date:message-id; bh=390xdIrV3AYm3BnrDlyCj4pod/fb8V45at9kdiYdIBI=; b=iKqUmeBzEsGJcWnvF6yoSa+gz0G+3Z/T7wq4GOdRXp817heguPWeUIH3yAPjMbtsjT g3shDKgrRk+mNtc+R/ERuOmpcIa1e1Cxt9QgO+e9PYCNdzSocgAYA5OyYiv9pdjDuhgn gk8Xj9QUz7L5j6IySH05JHPDiDEcqJfaCpJK4w4BOd4KXzZdAGN1Q8CSDRT4VZf6jWck fUTXbr9zkehuM+CG3XLmrws6RXF0VTA+It13RwjLe1ZXw6OMgFgONLCi+EDO/uVP6/n3 yQaY3+nedfopjad6Z9COMEm3w3/UZSKtLhaJFkmuSDVQkslELZIQIrn3u8PgAIgILV0S vR8Q== X-Gm-Message-State: AOUpUlGQOvT+H9bnTbYYikdt0hPid6AD+oBnGaQvVnHNH9VkqoC5pTUf QuXmocEsPjuu4+e214PGsK6kg2/8h7E= X-Google-Smtp-Source: AAOMgpe7QC57yms7mNqj4jW3SL9q3Ut5tt+EgwvyWbtvQ2uZ0jO4vUm2MPQw5vPVeE0UkUuOrCA37w== X-Received: by 2002:a1c:5e08:: with SMTP id s8-v6mr1427224wmb.88.1531913318874; Wed, 18 Jul 2018 04:28:38 -0700 (PDT) Received: from localhost (nat-35.starnet.cz. [178.255.168.35]) by smtp.gmail.com with ESMTPSA id z18-v6sm2572721wrr.76.2018.07.18.04.28.38 for (version=TLS1_2 cipher=AES128-SHA bits=128/128); Wed, 18 Jul 2018 04:28:38 -0700 (PDT) From: Michal Simek To: u-boot@lists.denx.de Date: Wed, 18 Jul 2018 13:28:37 +0200 Message-Id: X-Mailer: git-send-email 1.9.1 Subject: [U-Boot] [PATCH] arm64: zynqmp: Setup ENV_SIZE via Kconfig for mini targets 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" Mini targets are using different ENV_SIZE then standard one that's why defconfigs should be updated to simplify config files. Signed-off-by: Michal Simek --- Based on: https://lists.denx.de/pipermail/u-boot/2018-July/335126.html and https://lists.denx.de/pipermail/u-boot/2018-July/335152.html --- configs/xilinx_zynqmp_mini_emmc0_defconfig | 1 + configs/xilinx_zynqmp_mini_emmc1_defconfig | 1 + configs/xilinx_zynqmp_mini_nand_defconfig | 1 + configs/xilinx_zynqmp_mini_qspi_defconfig | 1 + include/configs/xilinx_zynqmp_mini.h | 1 - include/configs/xilinx_zynqmp_mini_emmc.h | 1 - include/configs/xilinx_zynqmp_mini_nand.h | 1 - include/configs/xilinx_zynqmp_mini_qspi.h | 1 - 8 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/xilinx_zynqmp_mini_emmc0_defconfig b/configs/xilinx_zynqmp_mini_emmc0_defconfig index ffb9693c10f3..65a72b7f9947 100644 --- a/configs/xilinx_zynqmp_mini_emmc0_defconfig +++ b/configs/xilinx_zynqmp_mini_emmc0_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_mini_emmc" CONFIG_ARCH_ZYNQMP=y CONFIG_SYS_TEXT_BASE=0x10000 +CONFIG_ENV_SIZE=0x10000 # CONFIG_CMD_ZYNQMP is not set CONFIG_DEFAULT_DEVICE_TREE="zynqmp-mini-emmc0" CONFIG_ENV_VARS_UBOOT_CONFIG=y diff --git a/configs/xilinx_zynqmp_mini_emmc1_defconfig b/configs/xilinx_zynqmp_mini_emmc1_defconfig index edca32d28e2c..c32ba73b1f1a 100644 --- a/configs/xilinx_zynqmp_mini_emmc1_defconfig +++ b/configs/xilinx_zynqmp_mini_emmc1_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_mini_emmc" CONFIG_ARCH_ZYNQMP=y CONFIG_SYS_TEXT_BASE=0x10000 +CONFIG_ENV_SIZE=0x10000 # CONFIG_CMD_ZYNQMP is not set CONFIG_DEFAULT_DEVICE_TREE="zynqmp-mini-emmc1" CONFIG_ENV_VARS_UBOOT_CONFIG=y diff --git a/configs/xilinx_zynqmp_mini_nand_defconfig b/configs/xilinx_zynqmp_mini_nand_defconfig index 4c8c2fcee6d0..3117770263df 100644 --- a/configs/xilinx_zynqmp_mini_nand_defconfig +++ b/configs/xilinx_zynqmp_mini_nand_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_mini_nand" CONFIG_ARCH_ZYNQMP=y CONFIG_SYS_TEXT_BASE=0x10000 +CONFIG_ENV_SIZE=0x10000 # CONFIG_CMD_ZYNQMP is not set CONFIG_DEFAULT_DEVICE_TREE="zynqmp-mini-nand" CONFIG_ENV_VARS_UBOOT_CONFIG=y diff --git a/configs/xilinx_zynqmp_mini_qspi_defconfig b/configs/xilinx_zynqmp_mini_qspi_defconfig index 8b3282912404..a4bc89503001 100644 --- a/configs/xilinx_zynqmp_mini_qspi_defconfig +++ b/configs/xilinx_zynqmp_mini_qspi_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_mini_qspi" CONFIG_ARCH_ZYNQMP=y CONFIG_SYS_TEXT_BASE=0xFFFC0000 +CONFIG_ENV_SIZE=0x578 CONFIG_SYS_MEM_RSVD_FOR_MMU=y CONFIG_ZYNQMP_NO_DDR=y # CONFIG_CMD_ZYNQMP is not set diff --git a/include/configs/xilinx_zynqmp_mini.h b/include/configs/xilinx_zynqmp_mini.h index 118779a0a026..8ba91d0d1dda 100644 --- a/include/configs/xilinx_zynqmp_mini.h +++ b/include/configs/xilinx_zynqmp_mini.h @@ -17,7 +17,6 @@ /* Undef unneeded configs */ #undef CONFIG_EXTRA_ENV_SETTINGS #undef CONFIG_SYS_MALLOC_LEN -#undef CONFIG_ENV_SIZE #undef CONFIG_ZLIB #undef CONFIG_GZIP #undef CONFIG_CMD_ENV diff --git a/include/configs/xilinx_zynqmp_mini_emmc.h b/include/configs/xilinx_zynqmp_mini_emmc.h index dc81c66c641d..6531599c79d9 100644 --- a/include/configs/xilinx_zynqmp_mini_emmc.h +++ b/include/configs/xilinx_zynqmp_mini_emmc.h @@ -14,7 +14,6 @@ #define CONFIG_SYS_ICACHE_OFF #define CONFIG_NR_DRAM_BANKS 1 -#define CONFIG_ENV_SIZE 0x10000 #define CONFIG_SYS_INIT_SP_ADDR CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MALLOC_LEN 0x800000 diff --git a/include/configs/xilinx_zynqmp_mini_nand.h b/include/configs/xilinx_zynqmp_mini_nand.h index 4434e6ab3291..00db44964847 100644 --- a/include/configs/xilinx_zynqmp_mini_nand.h +++ b/include/configs/xilinx_zynqmp_mini_nand.h @@ -16,7 +16,6 @@ #define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_SIZE 0x1000000 #define CONFIG_SYS_SDRAM_BASE 0x0 -#define CONFIG_ENV_SIZE 0x10000 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x40000) #define CONFIG_SYS_MALLOC_LEN 0x800000 diff --git a/include/configs/xilinx_zynqmp_mini_qspi.h b/include/configs/xilinx_zynqmp_mini_qspi.h index 6fb05200ce24..229132675ee3 100644 --- a/include/configs/xilinx_zynqmp_mini_qspi.h +++ b/include/configs/xilinx_zynqmp_mini_qspi.h @@ -14,7 +14,6 @@ #define CONFIG_SYS_ICACHE_OFF #define CONFIG_NR_DRAM_BANKS 1 -#define CONFIG_ENV_SIZE 1400 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + 0x20000) #define CONFIG_SYS_MALLOC_LEN 0x2000