From patchwork Tue Apr 9 18:52:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Goldschmidt X-Patchwork-Id: 1082624 X-Patchwork-Delegate: marek.vasut@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=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="QH5WmJKW"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44dxJv0dnTz9sSQ for ; Wed, 10 Apr 2019 04:53:51 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id BB716C21E13; Tue, 9 Apr 2019 18:53:24 +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, RCVD_IN_MSPIKE_H2, 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 5261CC21E07; Tue, 9 Apr 2019 18:53:10 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id EA6B5C21DA2; Tue, 9 Apr 2019 18:53:08 +0000 (UTC) Received: from mail-ed1-f65.google.com (mail-ed1-f65.google.com [209.85.208.65]) by lists.denx.de (Postfix) with ESMTPS id 9F920C21C4A for ; Tue, 9 Apr 2019 18:53:08 +0000 (UTC) Received: by mail-ed1-f65.google.com with SMTP id o26so2605822edv.12 for ; Tue, 09 Apr 2019 11:53:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=oz8znVv34zhl8QUCgrOK32RvRfJo0KH9OIo7Mnt1eDQ=; b=QH5WmJKWe1UkjzE41xLf3lKHeKHG7x9/6EYRr6xJDFGKNfCrlXm4O/0nZ0R6t9RrAe QEmzGPzvkqD2pHVJ59lWGf0wlUql6t85QtCzwT+9PjOMerjBfCOUPymWyfp00ricQOeS ORPA3vcoVPigs2kCIU2GSH7HurQ5u7f+Y/zdcWQORHer9v+ukQaUSb5qctxiSucUyVHR ltOYo6tuLHj7n8P5gdulBaXfCGBWus7x/4K+4BYQ1qtL7SReSR0Nx1dSqGqMWqqCv1EF s9WdD2CvUTgl0HF+OIIpDItBwx1P8u+urpZqkgrtl76tYJMJeUXWSCj44jma1tMk3x6S 3T7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=oz8znVv34zhl8QUCgrOK32RvRfJo0KH9OIo7Mnt1eDQ=; b=Os3lTaHiwpC50jhiUPy7ru6K76FDPdeH1iwYvsXvo1Dy6Hz42GDRq+W1bPiAaIvoLk jF0QYZfaFpLqjEm0WeDybak3elWrq15coEAFaNg7FIsN60iAV+NIm1jzmkNWZ7JLvuew pltEchs8JDBM28RjYRBV0lvrzz72D6RQbMfcS3WnRKDNOjYI0dpk08hAWDuM9Ra7aUoa DjuW3o8irrkF8j+KtoNQd+pO0QVGaQ1+jfSXrUmFSWpm3S3Jj1/5fOC43TJhFVn2b7rU kl7VE/AqOzOCFaFkSbNNFmty92eJJuK7jYLNOhsX9HViYBKZGTXwN+NE7BWUUnqZlAr+ oFrw== X-Gm-Message-State: APjAAAWC8rQQ6voRqjx1W4/OAgJEWsDcZEbvMjYf1Kh3rjhDFJOB8jVk KybrqAA8/tPmmeVgVj8f9No= X-Google-Smtp-Source: APXvYqyu3oPQ1ZFGwgm7Lf7robD0MqhCIhWZgIlKTYxte+OILh9fRCgUheI7PXroK6JadXIHoC5pWA== X-Received: by 2002:a17:906:b6c8:: with SMTP id ec8mr20912245ejb.89.1554835988352; Tue, 09 Apr 2019 11:53:08 -0700 (PDT) Received: from ubuntu.home (HSI-KBW-046-005-136-229.hsi8.kabel-badenwuerttemberg.de. [46.5.136.229]) by smtp.gmail.com with ESMTPSA id c4sm1544989edl.63.2019.04.09.11.53.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Apr 2019 11:53:07 -0700 (PDT) From: Simon Goldschmidt To: Marek Vasut , u-boot@lists.denx.de Date: Tue, 9 Apr 2019 20:52:56 +0200 Message-Id: <20190409185259.19052-2-simon.k.r.goldschmidt@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190409185259.19052-1-simon.k.r.goldschmidt@gmail.com> References: <20190409185259.19052-1-simon.k.r.goldschmidt@gmail.com> Cc: Tien Fong Chee , Tom Rini , Joe Hershberger , Stefan Roese Subject: [U-Boot] [PATCH v2 1/4] arm: socfpga: move vining_fpga to DM_I2C 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" All socfpga boards except for vining_fpga use DM_I2C. Enable DM_I2C for this board and set the EEPROM defines via Kconfig (enabling CONFIG_I2C_EEPROM from MISC). Signed-off-by: Simon Goldschmidt --- Changes in v2: - added (this) patch to move socfpga_vining to DM_I2C configs/socfpga_vining_fpga_defconfig | 8 +++++++- include/configs/socfpga_common.h | 26 -------------------------- include/configs/socfpga_vining_fpga.h | 9 --------- 3 files changed, 7 insertions(+), 36 deletions(-) diff --git a/configs/socfpga_vining_fpga_defconfig b/configs/socfpga_vining_fpga_defconfig index 7b47b111b7..4a7f775337 100644 --- a/configs/socfpga_vining_fpga_defconfig +++ b/configs/socfpga_vining_fpga_defconfig @@ -16,8 +16,8 @@ CONFIG_VERSION_VARIABLE=y CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_SPI_LOAD=y CONFIG_CMD_ASKENV=y -CONFIG_CMD_GREPENV=y CONFIG_CMD_EEPROM=y +CONFIG_CMD_GREPENV=y CONFIG_CMD_DFU=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y @@ -44,6 +44,7 @@ CONFIG_DFU_RAM=y CONFIG_DFU_SF=y CONFIG_DM_GPIO=y CONFIG_DWAPB_GPIO=y +CONFIG_DM_I2C=y CONFIG_LED_STATUS=y CONFIG_LED_STATUS_GPIO=y CONFIG_LED_STATUS0=y @@ -55,6 +56,11 @@ CONFIG_LED_STATUS_BIT2=54 CONFIG_LED_STATUS3=y CONFIG_LED_STATUS_BIT3=65 CONFIG_LED_STATUS_CMD=y +CONFIG_MISC=y +CONFIG_I2C_EEPROM=y +CONFIG_SYS_I2C_EEPROM_ADDR=0x50 +CONFIG_SYS_EEPROM_PAGE_WRITE_BITS=3 +CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=70 CONFIG_DM_MMC=y CONFIG_MMC_DW=y CONFIG_MTD_DEVICE=y diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index a501b5209f..a65fc804e3 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -149,32 +149,6 @@ #define CONFIG_SYS_NAND_DATA_BASE SOCFPGA_NANDDATA_ADDRESS #endif -/* - * I2C support - */ -#ifndef CONFIG_DM_I2C -#define CONFIG_SYS_I2C -#define CONFIG_SYS_I2C_BASE SOCFPGA_I2C0_ADDRESS -#define CONFIG_SYS_I2C_BASE1 SOCFPGA_I2C1_ADDRESS -#define CONFIG_SYS_I2C_BASE2 SOCFPGA_I2C2_ADDRESS -#define CONFIG_SYS_I2C_BASE3 SOCFPGA_I2C3_ADDRESS -/* Using standard mode which the speed up to 100Kb/s */ -#define CONFIG_SYS_I2C_SPEED 100000 -#define CONFIG_SYS_I2C_SPEED1 100000 -#define CONFIG_SYS_I2C_SPEED2 100000 -#define CONFIG_SYS_I2C_SPEED3 100000 -/* Address of device when used as slave */ -#define CONFIG_SYS_I2C_SLAVE 0x02 -#define CONFIG_SYS_I2C_SLAVE1 0x02 -#define CONFIG_SYS_I2C_SLAVE2 0x02 -#define CONFIG_SYS_I2C_SLAVE3 0x02 -#ifndef __ASSEMBLY__ -/* Clock supplied to I2C controller in unit of MHz */ -unsigned int cm_get_l4_sp_clk_hz(void); -#define IC_CLK (cm_get_l4_sp_clk_hz() / 1000000) -#endif -#endif /* CONFIG_DM_I2C */ - /* * QSPI support */ diff --git a/include/configs/socfpga_vining_fpga.h b/include/configs/socfpga_vining_fpga.h index 5517ed722d..0e547a1295 100644 --- a/include/configs/socfpga_vining_fpga.h +++ b/include/configs/socfpga_vining_fpga.h @@ -16,15 +16,6 @@ #define CONFIG_LOADADDR 0x01000000 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -/* I2C EEPROM */ -#ifdef CONFIG_CMD_EEPROM -#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 -#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 -#define CONFIG_SYS_I2C_EEPROM_BUS 0 -#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3 -#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 70 -#endif - /* * Status LEDs: * 0 ... Top Green From patchwork Tue Apr 9 18:52:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Goldschmidt X-Patchwork-Id: 1082626 X-Patchwork-Delegate: marek.vasut@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=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="UHvYw/In"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44dxKH3jtTz9sSQ for ; Wed, 10 Apr 2019 04:54:11 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 07E8FC21D8A; Tue, 9 Apr 2019 18:53:37 +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, RCVD_IN_MSPIKE_H2, 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 EBCCCC21E2C; Tue, 9 Apr 2019 18:53:11 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 01B7FC21DED; Tue, 9 Apr 2019 18:53:09 +0000 (UTC) Received: from mail-ed1-f67.google.com (mail-ed1-f67.google.com [209.85.208.67]) by lists.denx.de (Postfix) with ESMTPS id 9F7C7C21DA2 for ; Tue, 9 Apr 2019 18:53:09 +0000 (UTC) Received: by mail-ed1-f67.google.com with SMTP id x61so3236629edc.9 for ; Tue, 09 Apr 2019 11:53:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=rlS8cfxDWr5J3aMX3csZRJaZr0v/tKEIN3ZO7Ckfhqw=; b=UHvYw/InWaafHy+nRiDO4rKee7D5z5bHz6FlUXvzLRAMRdn/o01bveNZXmtxrXCkNa ruC8zdqGWsg3eBZTmFjeCPhhpfsh3reFsELB6LhuiKJ2Z/+LwM2Bgmxuaz4HN1dvvaqG ytp3RpOGX5tDkSvF1OepLYykNKasDJgXQT+Gl/ridwpBfH/L1uQLJONGUmrKvouGVAgK fRowA8s3sgRryTmiYaQRvesFCRK1BT+/QJPE6/dluLqs8JEUvE/MN7lCT3uprKYh7+fa gHgP7TlrkHRARdPu+C1ZvyteT3pijirVUrFrSg9Mq4P60yWVsYTqOENnzso/3mHUA/9G ITpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=rlS8cfxDWr5J3aMX3csZRJaZr0v/tKEIN3ZO7Ckfhqw=; b=mG/eyB9FczrV9Jhqq0KgbZmojmwpcaFsVIbATt4HuAPYCiNPutB08thVDN2sThtYex O5qJuA9kvDYP2OcPOQDd97XyJTFQzRx/dSZnxtX0ktuzMJYTuI5reO44GxXqLv8yVO3S ZJbtsVI2fGJ1VhlhAFoGOagZ+hCmiaw/eCnR7V2TzQdlqOy/eEu8Oei1fD3e5OyfUkAm chP7L3cWJ1nKxAM6ZZxwuCPyjmdJXWcgvuhd31QgwdUqk2f70dxDgYAkz5jgXUIILPL/ CP2SvPV0kGRS0hskewg0+UmIt9I9OlVvcUz7pPlVYQfZ/p9LIAcJFvtZmwa4X8+riW/m aUKA== X-Gm-Message-State: APjAAAUhsrPMabavuuKhYGxZpikecxl3krr5xKTO+oPJ5Qxt4YfDY/nq jHerfHOH6JqpfCtckJGJTqs= X-Google-Smtp-Source: APXvYqzEczhyP6ixN6ZGiJnpRG1rG8YtmCbhr2aEz3B0Ps6s8BuuLNWGJNmB6EKdwZCNMTaK+f6AKQ== X-Received: by 2002:a17:906:6a82:: with SMTP id p2mr21927912ejr.212.1554835989330; Tue, 09 Apr 2019 11:53:09 -0700 (PDT) Received: from ubuntu.home (HSI-KBW-046-005-136-229.hsi8.kabel-badenwuerttemberg.de. [46.5.136.229]) by smtp.gmail.com with ESMTPSA id c4sm1544989edl.63.2019.04.09.11.53.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Apr 2019 11:53:08 -0700 (PDT) From: Simon Goldschmidt To: Marek Vasut , u-boot@lists.denx.de Date: Tue, 9 Apr 2019 20:52:57 +0200 Message-Id: <20190409185259.19052-3-simon.k.r.goldschmidt@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190409185259.19052-1-simon.k.r.goldschmidt@gmail.com> References: <20190409185259.19052-1-simon.k.r.goldschmidt@gmail.com> Cc: Tien Fong Chee , Tom Rini , Stefan Roese Subject: [U-Boot] [PATCH v2 2/4] arm: socfpga: clean up socfpga_common.h 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" Remove outdated defines (not used any more, outdated due to DM conversion) from socfpga_common.h. Signed-off-by: Simon Goldschmidt --- Changes in v2: - remove even more outdated things include/configs/socfpga_common.h | 40 -------------------------------- 1 file changed, 40 deletions(-) diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index a65fc804e3..5b5e5f5d43 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -72,29 +72,12 @@ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot argument buffer size */ -#ifndef CONFIG_SYS_HOSTNAME -#define CONFIG_SYS_HOSTNAME CONFIG_SYS_BOARD -#endif - /* * Cache */ #define CONFIG_SYS_L2_PL310 #define CONFIG_SYS_PL310_BASE SOCFPGA_MPUL2_ADDRESS -/* - * EPCS/EPCQx1 Serial Flash Controller - */ -#ifdef CONFIG_ALTERA_SPI -/* - * The base address is configurable in QSys, each board must specify the - * base address based on it's particular FPGA configuration. Please note - * that the address here is incremented by 0x400 from the Base address - * selected in QSys, since the SPI registers are at offset +0x400. - * #define CONFIG_SYS_SPI_BASE 0xff240400 - */ -#endif - /* * Ethernet on SoC (EMAC) */ @@ -162,15 +145,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void); #define CONFIG_CQSPI_REF_CLK cm_get_qspi_controller_clk_hz() #endif -/* - * Designware SPI support - */ - -/* - * Serial Driver - */ -#define CONFIG_SYS_NS16550_SERIAL - /* * USB */ @@ -206,20 +180,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void); #define CONFIG_ENV_SECT_SIZE (64 * 1024) #endif -/* - * mtd partitioning for serial NOR flash - * - * device nor0 , # parts = 6 - * #: name size offset mask_flags - * 0: u-boot 0x00100000 0x00000000 0 - * 1: env1 0x00040000 0x00100000 0 - * 2: env2 0x00040000 0x00140000 0 - * 3: UBI 0x03e80000 0x00180000 0 - * 4: boot 0x00e80000 0x00180000 0 - * 5: rootfs 0x01000000 0x01000000 0 - * - */ - /* * SPL * From patchwork Tue Apr 9 18:52:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Goldschmidt X-Patchwork-Id: 1082628 X-Patchwork-Delegate: marek.vasut@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=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="iV2iGyej"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44dxLh2LSpz9sSR for ; Wed, 10 Apr 2019 04:55:24 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 5A5C8C21E2B; Tue, 9 Apr 2019 18:54:03 +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, RCVD_IN_MSPIKE_H2, 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 082C9C21E7D; Tue, 9 Apr 2019 18:53:29 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B75DFC21E30; Tue, 9 Apr 2019 18:53:14 +0000 (UTC) Received: from mail-ed1-f65.google.com (mail-ed1-f65.google.com [209.85.208.65]) by lists.denx.de (Postfix) with ESMTPS id CF17BC21E29 for ; Tue, 9 Apr 2019 18:53:10 +0000 (UTC) Received: by mail-ed1-f65.google.com with SMTP id x61so3236712edc.9 for ; Tue, 09 Apr 2019 11:53:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=sZ3VWlnT3GxF+v4IUiQM9NSNN1rMtYRTELKBqhdSGK0=; b=iV2iGyejJXpTxvzXz0D4Dn50+00Ngon2Qru+s5W6fZCpP0ksh199qUhRuyl/RSZqcJ FcrXOedKRojnSN146LqwBYMouRZOGm0o7y5oGdVt4Vw5f9/mKqsPFWq5kLMupJAdIfVC yaKWxMaSmacUk3EydXS29T+hMhd/+Yv+WaJZfmhtKx2MZsXoRdhu2XIZw3xa5LYv6shC HVl2Yp+FngeW5DlU+EDJZ9wk1dGdx06PNACcvuiuh5BC1iYAH6fbeTbYPuaEUP1TUOW/ KDq7Q1MbaTOUMlDLKmgt3j2X5HS01txT//OYkC6YrUGlLZMmbk0Xcc49Pct6JsZE6Sju VR8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=sZ3VWlnT3GxF+v4IUiQM9NSNN1rMtYRTELKBqhdSGK0=; b=k6m41e2VbF03xjp3SR3yVnq/s4atuLvMLfxoo/1QUA0ORZ7vTWwV0ddH0nIj0hnjDH 821sMUyEWpmBxv7u77HHDvhrp5M21hj8ndCIhkbd9umZH9SUEUzRi750Z2s/Ic4j2o4j 0Rvq/4s6R/G3TZHdGFNoSXQnax7ei5SFJw+6JCFEVgxEcs/JaBgF3rVGqIk+/TPRpKAl fo4C1/g63P5+PcOO7BhMEKc8aqXJCm9qQdX3UXB+dXGx8mo3d6ilpGhrBjaAuHKiVvlD 6/XqvcuSNPGbCauHEpIGP259A9yWOmU0pj2WlP65l4RJ0ICvE3xEvDF2GcaZhv3OmwhV HCIw== X-Gm-Message-State: APjAAAVWnTD6eRayx4uKpiDCo0cfyG72rNSiC9I3v6VRIPkxYol/3p8v THzKCh6Uy3Aj9vdFq6JvlgY= X-Google-Smtp-Source: APXvYqxOoM8bHC/7P8TIikxBFA6wtdixq5OVr1Ro/1tgS6AF3ZP8wbTfG26N9aeDDeW2q2WGP2/bnw== X-Received: by 2002:a17:906:d503:: with SMTP id ge3mr21112572ejb.2.1554835990572; Tue, 09 Apr 2019 11:53:10 -0700 (PDT) Received: from ubuntu.home (HSI-KBW-046-005-136-229.hsi8.kabel-badenwuerttemberg.de. [46.5.136.229]) by smtp.gmail.com with ESMTPSA id c4sm1544989edl.63.2019.04.09.11.53.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Apr 2019 11:53:09 -0700 (PDT) From: Simon Goldschmidt To: Marek Vasut , u-boot@lists.denx.de Date: Tue, 9 Apr 2019 20:52:58 +0200 Message-Id: <20190409185259.19052-4-simon.k.r.goldschmidt@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190409185259.19052-1-simon.k.r.goldschmidt@gmail.com> References: <20190409185259.19052-1-simon.k.r.goldschmidt@gmail.com> Cc: Tien Fong Chee , Tom Rini , Joe Hershberger , Stefan Roese Subject: [U-Boot] [PATCH v2 3/4] arm: socfpga: remove CONFIG_SYS_BOOTMAPSZ 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" socfpga_common.h defines CONFIG_SYS_BOOTMAPSZ to 64 MiB. Since having this define overrides the 'bootm_size' env variable for the whole socfpga platform, let's remove this define from socfpga_common.h and instead rely on the 'bootm_size' env variable (which is initialized to 160 MiB in the same file's default env). This gives users the chance to override it in their own environment. Signed-off-by: Simon Goldschmidt Acked-by: Marek Vasut --- Changes in v2: None include/configs/socfpga_common.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 5b5e5f5d43..5eccb01d1d 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -10,8 +10,6 @@ */ #define CONFIG_CLOCKS -#define CONFIG_SYS_BOOTMAPSZ (64 * 1024 * 1024) - #define CONFIG_TIMESTAMP /* Print image info with timestamp */ /* From patchwork Tue Apr 9 18:52:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Goldschmidt X-Patchwork-Id: 1082627 X-Patchwork-Delegate: marek.vasut@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=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ghTkrnxL"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44dxKY1Js7z9sSQ for ; Wed, 10 Apr 2019 04:54:24 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 8C052C21E3E; Tue, 9 Apr 2019 18:53:49 +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, RCVD_IN_MSPIKE_H2, 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 8FC17C21E60; Tue, 9 Apr 2019 18:53:23 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 9C5AAC21E60; Tue, 9 Apr 2019 18:53:15 +0000 (UTC) Received: from mail-ed1-f65.google.com (mail-ed1-f65.google.com [209.85.208.65]) by lists.denx.de (Postfix) with ESMTPS id 18197C21E30 for ; Tue, 9 Apr 2019 18:53:12 +0000 (UTC) Received: by mail-ed1-f65.google.com with SMTP id s16so15935891edr.3 for ; Tue, 09 Apr 2019 11:53:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=rvRNVfgTDR/5lMOvNJwRunhiikrkzkywip967zwIbOU=; b=ghTkrnxLrWon3oMsguOtgWvKnzGADy6rMdeU4mxx/wUL3AJ/ObvWCBXqDU/TKDUqUf HuMmWCVkWjVd7/M9ghnUhhkqAS3h8o4FGzOiz9vcZGw50M3A5ddFxIZLfBSBH/EI1P2Z 4uJpMscU/Fj88OWHBDDqbo8AkFOyipXS6K/C/VMIlpGe2zmszrkqg60CJM9lBY+vgTGE qvFKrBz62ydInq++JeLN9T3KIEXFOfGbG0ITt/ZTPdx8OnAr1QWY+2og8HiHNkCEPDjC qXXc7mnv8fUtgagwU63zEgX7cMDLMomIBzV4VIJJCBwVqtafA3kz7FxQpk6zFHcLL5kl JUEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=rvRNVfgTDR/5lMOvNJwRunhiikrkzkywip967zwIbOU=; b=FXUIEwifIB5Ji9iF9Ce5kPS4cJJ26u/SEYwAySTh/CpCJ+vFyWHZAqq0gKIh77cQwD Xlie0xz+dxPIfPh1ktwHKPcrfsgkkzknvibSZptY3mvIYl6OJYcYpN0v1bat7Z4cAtLX l3/N2mn5uxWLRiDjWMoByXha88Ez9WSGd1phI4mUI7PV71ndIS5SGVEgqMyPYNOolAcq lS80NVA8Qn6b580tuDhmhOAOrhlHNnF/sByGgNy4fHx4es3yX2OdpNCoUShu0JVFRBER buU0kuhvs0NtaP0NQgVyNBTywh4ESrPbQSEr5P4cvI3pXfn6TxTFgYKF/K4B0Mv3JxCz x71w== X-Gm-Message-State: APjAAAVUw2P8I5ERZQXiZlfdpcnOfcBtMwDdHx058mbV2JEn2SCQiDgs e+vN8W+KLreHbRqki+FcRWQ= X-Google-Smtp-Source: APXvYqyydn1tTrbFLMTAUrMd5Hvo9Sg1jXlgmzb9kB5aA8HnIXw9xjXaRMM+PrbZkl4i+bviu8BYSw== X-Received: by 2002:a17:906:950b:: with SMTP id u11mr21231482ejx.154.1554835991701; Tue, 09 Apr 2019 11:53:11 -0700 (PDT) Received: from ubuntu.home (HSI-KBW-046-005-136-229.hsi8.kabel-badenwuerttemberg.de. [46.5.136.229]) by smtp.gmail.com with ESMTPSA id c4sm1544989edl.63.2019.04.09.11.53.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Apr 2019 11:53:11 -0700 (PDT) From: Simon Goldschmidt To: Marek Vasut , u-boot@lists.denx.de Date: Tue, 9 Apr 2019 20:52:59 +0200 Message-Id: <20190409185259.19052-5-simon.k.r.goldschmidt@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190409185259.19052-1-simon.k.r.goldschmidt@gmail.com> References: <20190409185259.19052-1-simon.k.r.goldschmidt@gmail.com> Cc: Tom Rini , Stefan Roese , Pavel Machek , Chin-Liang See Subject: [U-Boot] [PATCH v2 4/4] arm: socfpga: clean up board config files 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" Remove outdated defines (not used any more, outdated due to DM conversion) from various socfpga files in include/config. Signed-off-by: Simon Goldschmidt Acked-by: Marek Vasut --- Changes in v2: - added (this) patch with further cleanups to the socfpga board config files include/configs/socfpga_arria10_socdk.h | 6 ------ include/configs/socfpga_arria5_socdk.h | 2 -- include/configs/socfpga_cyclone5_socdk.h | 2 -- include/configs/socfpga_de0_nano_soc.h | 2 -- include/configs/socfpga_de10_nano.h | 2 -- include/configs/socfpga_de1_soc.h | 2 -- include/configs/socfpga_is1.h | 2 -- include/configs/socfpga_sockit.h | 2 -- include/configs/socfpga_socrates.h | 2 -- include/configs/socfpga_sr1500.h | 11 ----------- include/configs/socfpga_vining_fpga.h | 9 --------- 11 files changed, 42 deletions(-) diff --git a/include/configs/socfpga_arria10_socdk.h b/include/configs/socfpga_arria10_socdk.h index 0f116fbf2d..92630c5e6e 100644 --- a/include/configs/socfpga_arria10_socdk.h +++ b/include/configs/socfpga_arria10_socdk.h @@ -19,12 +19,6 @@ /* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x40000000 -/* Ethernet on SoC (EMAC) */ - -/* - * U-Boot environment configurations - */ - /* * Serial / UART configurations */ diff --git a/include/configs/socfpga_arria5_socdk.h b/include/configs/socfpga_arria5_socdk.h index 24fcdd8b5a..af6137aeb1 100644 --- a/include/configs/socfpga_arria5_socdk.h +++ b/include/configs/socfpga_arria5_socdk.h @@ -14,8 +14,6 @@ #define CONFIG_LOADADDR 0x01000000 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -/* Ethernet on SoC (EMAC) */ - /* The rest of the configuration is shared */ #include diff --git a/include/configs/socfpga_cyclone5_socdk.h b/include/configs/socfpga_cyclone5_socdk.h index 18da8496ef..028db2a09e 100644 --- a/include/configs/socfpga_cyclone5_socdk.h +++ b/include/configs/socfpga_cyclone5_socdk.h @@ -14,8 +14,6 @@ #define CONFIG_LOADADDR 0x01000000 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -/* Ethernet on SoC (EMAC) */ - /* The rest of the configuration is shared */ #include diff --git a/include/configs/socfpga_de0_nano_soc.h b/include/configs/socfpga_de0_nano_soc.h index d3224d5bd3..21108e3447 100644 --- a/include/configs/socfpga_de0_nano_soc.h +++ b/include/configs/socfpga_de0_nano_soc.h @@ -14,8 +14,6 @@ #define CONFIG_LOADADDR 0x01000000 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -/* Ethernet on SoC (EMAC) */ - /* The rest of the configuration is shared */ #include diff --git a/include/configs/socfpga_de10_nano.h b/include/configs/socfpga_de10_nano.h index 2fcabff8af..d85f98fbd4 100644 --- a/include/configs/socfpga_de10_nano.h +++ b/include/configs/socfpga_de10_nano.h @@ -14,8 +14,6 @@ #define CONFIG_LOADADDR 0x01000000 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -/* Ethernet on SoC (EMAC) */ - /* The rest of the configuration is shared */ #include diff --git a/include/configs/socfpga_de1_soc.h b/include/configs/socfpga_de1_soc.h index f37099c58f..9919d292dc 100644 --- a/include/configs/socfpga_de1_soc.h +++ b/include/configs/socfpga_de1_soc.h @@ -14,8 +14,6 @@ #define CONFIG_LOADADDR 0x01000000 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -/* Ethernet on SoC (EMAC) */ - /* The rest of the configuration is shared */ #include diff --git a/include/configs/socfpga_is1.h b/include/configs/socfpga_is1.h index c233c208a5..c4da5947f3 100644 --- a/include/configs/socfpga_is1.h +++ b/include/configs/socfpga_is1.h @@ -19,8 +19,6 @@ /* Ethernet on SoC (EMAC) */ #if defined(CONFIG_CMD_NET) #define CONFIG_ARP_TIMEOUT 500UL - -/* PHY */ #endif /* The rest of the configuration is shared */ diff --git a/include/configs/socfpga_sockit.h b/include/configs/socfpga_sockit.h index 3a7f354914..972999949a 100644 --- a/include/configs/socfpga_sockit.h +++ b/include/configs/socfpga_sockit.h @@ -14,8 +14,6 @@ #define CONFIG_LOADADDR 0x01000000 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -/* Ethernet on SoC (EMAC) */ - /* The rest of the configuration is shared */ #include diff --git a/include/configs/socfpga_socrates.h b/include/configs/socfpga_socrates.h index f0d9347891..7faea150a9 100644 --- a/include/configs/socfpga_socrates.h +++ b/include/configs/socfpga_socrates.h @@ -14,8 +14,6 @@ #define CONFIG_LOADADDR 0x01000000 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -/* Ethernet on SoC (EMAC) */ - /* The rest of the configuration is shared */ #include diff --git a/include/configs/socfpga_sr1500.h b/include/configs/socfpga_sr1500.h index b6a98611c0..3a8ccc3021 100644 --- a/include/configs/socfpga_sr1500.h +++ b/include/configs/socfpga_sr1500.h @@ -19,8 +19,6 @@ /* The PHY is autodetected, so no MII PHY address is needed here */ #define PHY_ANEG_TIMEOUT 8000 -/* Environment */ - /* Enable SPI NOR flash reset, needed for SPI booting */ #define CONFIG_SPI_N25Q256A_RESET @@ -36,15 +34,6 @@ #define CONFIG_ENV_OFFSET 0x000e0000 #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SECT_SIZE) -/* - * The QSPI NOR flash layout on SR1500: - * - * 0000.0000 - 0003.ffff: SPL (4 times) - * 0004.0000 - 000d.ffff: U-Boot - * 000e.0000 - 000e.ffff: env1 - * 000f.0000 - 000f.ffff: env2 - */ - /* The rest of the configuration is shared */ #include diff --git a/include/configs/socfpga_vining_fpga.h b/include/configs/socfpga_vining_fpga.h index 0e547a1295..29a92b9146 100644 --- a/include/configs/socfpga_vining_fpga.h +++ b/include/configs/socfpga_vining_fpga.h @@ -16,18 +16,9 @@ #define CONFIG_LOADADDR 0x01000000 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -/* - * Status LEDs: - * 0 ... Top Green - * 1 ... Top Red - * 2 ... Bottom Green - * 3 ... Bottom Red - */ - /* Ethernet on SoC (EMAC) */ #if defined(CONFIG_CMD_NET) #define CONFIG_BOOTP_SEND_HOSTNAME -/* PHY */ #endif /* Extra Environment */