From patchwork Fri Jun 2 12:24:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sekhar Nori X-Patchwork-Id: 101241 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp365936qge; Fri, 2 Jun 2017 05:26:31 -0700 (PDT) X-Received: by 10.80.152.112 with SMTP id h45mr5940061edb.103.1496406391690; Fri, 02 Jun 2017 05:26:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496406391; cv=none; d=google.com; s=arc-20160816; b=rcCTd5q3KXLNoyMWax+eU8E9eDMhbAcHjn8glLyI3XLX5VWgo40SHKEz3cEAeuMLyO q0sgq8Uev+ENnMg7frVSvbeK9CDy7yyTH5ADd+DH8/pBqe0t5I30w5y+6nWburERgOtk F4j+LogOvmrFz5MmfTjyMOAx514PjJS61kM2sMTKOqHZdDC+riugo1kJ0cCYyvQBhcs7 8CCTetFrhAJcVi0xWM+4CYjmd5vT7/N82DnnzzSy4DCkVB0/bSgzKd3kb1KkK/wuZS4d MH5TgcgSO2cIb7Ath++QNOh4rtPM8zepzMrcwpil541R0L2+2YvTT08BL65Hf6k5WEb1 JewQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :cc:mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:arc-authentication-results; bh=hQrmdiJctVEmoslMqLUgXlSBnePzCGyTna676mTKV/Y=; b=yv+4dVc48LZNjF48oyjK09CRi8P46BREqutlBBqSZEEIGqvEOaEgTjD/QTy9RkGQbr C5Y4+LFPYHEbQ7gjVc7+p3fihpmcgsmmom4eA244Fec12/UA9gsikNUqBF25V5ExjbmE 185dDUqzCHyGWPkwSLvls1TrLz11pL/MYZRno2dEZFaT9yDMMe3VvGy9kmHqkr6jKxw9 J6x6IFph4+SRlbK0N1237dc/X4xi7w/G/w3/sORfm2mznGncKFbU/CzgQt3CVhVVORn/ MlUIF4mLzTBe1eiqAOMNyp7WqpnzZlJOzqefIyCB7tz+CewPW4ctUsG7GAk4Wt7CnTf3 j86w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@ti.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id x34si22606700ede.162.2017.06.02.05.26.31; Fri, 02 Jun 2017 05:26:31 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@ti.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: by lists.denx.de (Postfix, from userid 105) id 3FEE4C21CCB; Fri, 2 Jun 2017 12:24:51 +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_DNSWL_NONE, 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 342B1C21CBE; Fri, 2 Jun 2017 12:24:43 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 94A25C21C86; Fri, 2 Jun 2017 12:24:20 +0000 (UTC) Received: from lelnx194.ext.ti.com (lelnx194.ext.ti.com [198.47.27.80]) by lists.denx.de (Postfix) with ESMTPS id 4B603C21CAE for ; Fri, 2 Jun 2017 12:24:17 +0000 (UTC) Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by lelnx194.ext.ti.com (8.15.1/8.15.1) with ESMTP id v52COFEK017990; Fri, 2 Jun 2017 07:24:15 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1496406255; bh=pEF14RJzi1QeegCF1YfY5CtNTdTtMBKTNOkeOkYue98=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=tXLiugf47/hIIrWucZWqpW6wNGLf5aQUZbpMTUjq8n7v0WJfCeuHrRVyQYxYb/Uo7 AzK71PoqLWT8G01lK136H5H85ek4/GNe9LdYUwim5whxnbUy75JoNDexwbpBO2AOOZ NdVgY8eL2poTp+ewuyCKKpO5VtpqdcgzVtsScPGs= Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id v52COE3Q018711; Fri, 2 Jun 2017 07:24:14 -0500 Received: from dflp32.itg.ti.com (10.64.6.15) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.3.294.0; Fri, 2 Jun 2017 07:24:14 -0500 Received: from psplinux063.india.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id v52CO6IU010502; Fri, 2 Jun 2017 07:24:12 -0500 From: Sekhar Nori To: Tom Rini Date: Fri, 2 Jun 2017 17:54:00 +0530 Message-ID: <20170602122405.18983-3-nsekhar@ti.com> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170602122405.18983-1-nsekhar@ti.com> References: <20170602122405.18983-1-nsekhar@ti.com> MIME-Version: 1.0 Cc: Vitaly Andrianov , u-boot@lists.denx.de, Roger Meier , Peter Howard Subject: [U-Boot] [PATCH 2/7] configs: k2*_evm: let each board decide env location 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" Not all TI Keystone2 EVMs want environment in NAND flash. K2G EVM which has an MMC/SD slot, keep environment in a FAT partition on SD card. Since ti_armv7_keystone2.h defines environment is in NAND, boards which do not follow that have to #undef'ine that configuration. This leads to ugly ordering issues around where exactly the include of ti_armv7_keystone2.h can come in within the k2*_evm.h files. Move environment location to config file of each board. This should make it easy to change it for any one board without affecting all other boards. Signed-off-by: Sekhar Nori Reviewed-by: Tom Rini --- include/configs/k2e_evm.h | 4 ++++ include/configs/k2g_evm.h | 2 +- include/configs/k2hk_evm.h | 4 ++++ include/configs/k2l_evm.h | 4 ++++ include/configs/ti_armv7_keystone2.h | 3 --- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/include/configs/k2e_evm.h b/include/configs/k2e_evm.h index 3a7993e8290c..b186bfc89151 100644 --- a/include/configs/k2e_evm.h +++ b/include/configs/k2e_evm.h @@ -27,6 +27,10 @@ "name_uboot=u-boot-spi-k2e-evm.gph\0" \ "name_fs=arago-console-image-k2e-evm.cpio.gz\0" +#define CONFIG_ENV_SIZE (256 << 10) /* 256 KiB */ +#define CONFIG_ENV_IS_IN_NAND +#define CONFIG_ENV_OFFSET 0x100000 + #include /* SPL SPI Loader Configuration */ diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h index bee1be794baf..9a07eacb8e7a 100644 --- a/include/configs/k2g_evm.h +++ b/include/configs/k2g_evm.h @@ -63,8 +63,8 @@ #define CONFIG_PHY_MICREL #define PHY_ANEG_TIMEOUT 10000 /* PHY needs longer aneg time */ -#undef CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_IS_IN_FAT +#define CONFIG_ENV_SIZE (256 << 10) /* 256 KiB */ #define FAT_ENV_INTERFACE "mmc" #define FAT_ENV_DEVICE_AND_PART "0:1" #define FAT_ENV_FILE "uboot.env" diff --git a/include/configs/k2hk_evm.h b/include/configs/k2hk_evm.h index 202167bdef79..9598bc6976e9 100644 --- a/include/configs/k2hk_evm.h +++ b/include/configs/k2hk_evm.h @@ -27,6 +27,10 @@ "name_uboot=u-boot-spi-k2hk-evm.gph\0" \ "name_fs=arago-console-image-k2hk-evm.cpio.gz\0" +#define CONFIG_ENV_SIZE (256 << 10) /* 256 KiB */ +#define CONFIG_ENV_IS_IN_NAND +#define CONFIG_ENV_OFFSET 0x100000 + #include /* SPL SPI Loader Configuration */ diff --git a/include/configs/k2l_evm.h b/include/configs/k2l_evm.h index a7ccdd117cd2..d054276e61eb 100644 --- a/include/configs/k2l_evm.h +++ b/include/configs/k2l_evm.h @@ -27,6 +27,10 @@ "name_uboot=u-boot-spi-k2l-evm.gph\0" \ "name_fs=arago-console-image-k2l-evm.cpio.gz\0" +#define CONFIG_ENV_SIZE (256 << 10) /* 256 KiB */ +#define CONFIG_ENV_IS_IN_NAND +#define CONFIG_ENV_OFFSET 0x100000 + #include /* SPL SPI Loader Configuration */ diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index 3161c50abb14..512c28a5f075 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -185,9 +185,6 @@ #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_MAX_CHIPS 1 #define CONFIG_SYS_NAND_NO_SUBPAGE_WRITE -#define CONFIG_ENV_SIZE (256 << 10) /* 256 KiB */ -#define CONFIG_ENV_IS_IN_NAND -#define CONFIG_ENV_OFFSET 0x100000 #define CONFIG_MTD_PARTITIONS #define CONFIG_RBTREE #define CONFIG_LZO