From patchwork Thu Nov 22 08:19:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yegor Yefremov X-Patchwork-Id: 1001585 X-Patchwork-Delegate: trini@ti.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=quarantine dis=none) header.from=googlemail.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 430spk08Dwz9sC7 for ; Thu, 22 Nov 2018 19:21:17 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id B4248C21F2A; Thu, 22 Nov 2018 08:20:42 +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=FREEMAIL_FROM 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 5A48AC21F48; Thu, 22 Nov 2018 08:19:47 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4A3FAC21EE4; Thu, 22 Nov 2018 08:19:44 +0000 (UTC) Received: from mail.visionsystems.de (mail.visionsystems.de [213.209.99.202]) by lists.denx.de (Postfix) with ESMTP id 04D18C21ED5 for ; Thu, 22 Nov 2018 08:19:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.visionsystems.de (Postfix) with ESMTP id D5E5D370281; Thu, 22 Nov 2018 09:19:43 +0100 (CET) Received: from mail.visionsystems.de ([127.0.0.1]) by localhost (mail.visionsystems.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 09482-08; Thu, 22 Nov 2018 09:19:43 +0100 (CET) Received: from visionsystems.de (kallisto.visionsystems.local [192.168.1.3]) by mail.visionsystems.de (Postfix) with ESMTP id B594B36FD4A; Thu, 22 Nov 2018 09:19:43 +0100 (CET) Received: from development1.visionsystems.de ([192.168.1.36]) by visionsystems.de with Microsoft SMTPSVC(6.0.3790.4675); Thu, 22 Nov 2018 09:19:43 +0100 From: yegorslists@googlemail.com To: u-boot@lists.denx.de Date: Thu, 22 Nov 2018 09:19:32 +0100 Message-Id: <20181122081933.11318-3-yegorslists@googlemail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20181122081933.11318-1-yegorslists@googlemail.com> References: <20181122081933.11318-1-yegorslists@googlemail.com> X-OriginalArrivalTime: 22 Nov 2018 08:19:43.0565 (UTC) FILETIME=[1F512FD0:01D4823C] X-Virus-Scanned: amavisd-new at visionsystems.de Cc: trini@konsulko.com Subject: [U-Boot] [PATCH v2 3/4] arm: baltos: move CONFIG_SYS_NAND_U_BOOT_OFFS to defconfig 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" From: Yegor Yefremov Also get rid of CONFIG_SYS_NAND_SPL_KERNEL_OFFS as SPL_OS_BOOT feature won't be used. Signed-off-by: Yegor Yefremov Reviewed-by: Simon Glass --- configs/am335x_baltos_defconfig | 2 ++ include/configs/baltos.h | 9 +-------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig index 4e68956b7c..74fd487097 100644 --- a/configs/am335x_baltos_defconfig +++ b/configs/am335x_baltos_defconfig @@ -47,6 +47,8 @@ CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y CONFIG_MMC_OMAP_HS_ADMA=y CONFIG_NAND=y +CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y +CONFIG_SYS_NAND_U_BOOT_OFFS=0x00080000 CONFIG_PHY_ADDR_ENABLE=y CONFIG_MII=y CONFIG_DRIVER_TI_CPSW=y diff --git a/include/configs/baltos.h b/include/configs/baltos.h index 006b049d09..7b5f652f7e 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -34,15 +34,8 @@ /* FIT support */ #define CONFIG_SYS_BOOTM_LEN SZ_64M -/* UBI Support */ - -/* I2C configuration */ - #ifdef CONFIG_NAND -#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x00080000 -#ifdef CONFIG_SPL_OS_BOOT -#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00200000 /* kernel offset */ -#endif + #define NANDARGS \ "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \