From patchwork Thu Nov 30 23:06:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nobuhiro Iwamatsu X-Patchwork-Id: 843223 X-Patchwork-Delegate: iwamatsu@nigauri.org 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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=nigauri-org.20150623.gappssmtp.com header.i=@nigauri-org.20150623.gappssmtp.com header.b="baJ10C/M"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3yntP03jVdz9sNV for ; Fri, 1 Dec 2017 10:08:20 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 352E9C21ECE; Thu, 30 Nov 2017 23:07:47 +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_BLOCKED, 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 57C81C21EE4; Thu, 30 Nov 2017 23:07:38 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 565E3C21ECE; Thu, 30 Nov 2017 23:07:26 +0000 (UTC) Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by lists.denx.de (Postfix) with ESMTPS id 3BB23C21E97 for ; Thu, 30 Nov 2017 23:07:21 +0000 (UTC) Received: by mail-pf0-f194.google.com with SMTP id c204so3772529pfc.13 for ; Thu, 30 Nov 2017 15:07:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nigauri-org.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=2xeYpqw7FTda/0oCiN2opUGm/H2OSrM9GsVl6C8P/2k=; b=baJ10C/MCgbmpKbnm6PELfJr5rZYJNmvLMCxCzUi33h4zphwkT2OzSyQATtR3kRPuf u6BQigNaCX6dMa7SglYVoI9/BAlNHYFnrjlRxtDHsOs9SK5Z/CwbQ8fGoXI9nmxucyM/ oAvOn9FpcHYbywZoHdsWyIeAs2fkmzaRK4aaQLBNauTYjwtZ/SNEAMvx+JAAhhg7DaAg IZD2nCYrUH/fGFjXhgWHlWEZ7dNVAY3fXxMvqpPNSBhAd1FvFLa3xD0LOTJMB2OnYAyO WopGw5QbrkH4gEU13A+9+mvW7JalBItdXbknuua9gK23J0r2jqP3Gy4/7IxYmomn6P/q vCyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=2xeYpqw7FTda/0oCiN2opUGm/H2OSrM9GsVl6C8P/2k=; b=cT2RSGNMJpSr3OKNVRh3KRsRPbF02W5RW9b7YlT1+ncmDLiQ2GWT0LV0Nmuel3/+V3 iThvInUu8NyWM8H6pp/y8y21Yq64rSXS2bylPr1Nuov1N2ULpZ0ghA3aGRbDihslL1Ho NCMWJmySopggNyPX2UN1R8UY8pdCsHFV6XOsUQT3JPbGk0lDRVMvpySBrJVDe1DNWCx7 lA/3XyIjeA0rQOYVwnNZAMwPoaDegMTc08uZbebYsPQQvhLolUGtzSEDfw8fnNT7N25e RFaysD2vsU48rY95WAzfmT8LCgfw/BlApLZDYdy1cIzWfA+cra/A/PhF3y0hdeN7KViN /sUw== X-Gm-Message-State: AJaThX7pKvdHOZevEl05ns7PX8zYZnBUXtyST5QDo3L6RXmgHYQv+6zw gJ7uhl8mR1WN9FAeE4T5BAy5USY= X-Google-Smtp-Source: AGs4zMZLCsivIoey2HTMFkE1dd0OrqO/oRriA6tBdCuOMxf4lkXeZIiG5372vgt11HjPl4JHrGw9NA== X-Received: by 10.98.66.77 with SMTP id p74mr8103652pfa.183.1512083239398; Thu, 30 Nov 2017 15:07:19 -0800 (PST) Received: from chimu ([2405:6581:5360:1800:acc6:1cf0:e7a4:d7e8]) by smtp.gmail.com with ESMTPSA id r9sm7727100pgp.93.2017.11.30.15.07.16 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 30 Nov 2017 15:07:18 -0800 (PST) Received: by chimu (sSMTP sendmail emulation); Fri, 01 Dec 2017 08:07:15 +0900 From: Nobuhiro Iwamatsu To: u-boot@lists.denx.de, Nobuhiro Iwamatsu Date: Fri, 1 Dec 2017 08:06:56 +0900 Message-Id: <20171130230657.14496-2-iwamatsu@nigauri.org> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20171130230657.14496-1-iwamatsu@nigauri.org> References: <20171130230657.14496-1-iwamatsu@nigauri.org> Subject: [U-Boot] [PATCH 2/3] ARM: rmobile: Move CONFIG_SYS_TEXT_BASE 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" Signed-off-by: Nobuhiro Iwamatsu --- board/atmark-techno/armadillo-800eva/Kconfig | 2 ++ board/kmc/kzm9g/Kconfig | 3 +++ board/renesas/alt/Kconfig | 4 ++++ board/renesas/blanche/Kconfig | 4 ++++ board/renesas/gose/Kconfig | 4 ++++ board/renesas/koelsch/Kconfig | 4 ++++ board/renesas/lager/Kconfig | 4 ++++ board/renesas/porter/Kconfig | 4 ++++ board/renesas/silk/Kconfig | 4 ++++ board/renesas/stout/Kconfig | 4 ++++ include/configs/alt.h | 6 ------ include/configs/armadillo-800eva.h | 1 - include/configs/blanche.h | 2 -- include/configs/gose.h | 6 ------ include/configs/koelsch.h | 6 ------ include/configs/kzm9g.h | 1 - include/configs/lager.h | 6 ------ include/configs/porter.h | 6 ------ include/configs/silk.h | 6 ------ include/configs/stout.h | 6 ------ 20 files changed, 37 insertions(+), 46 deletions(-) diff --git a/board/atmark-techno/armadillo-800eva/Kconfig b/board/atmark-techno/armadillo-800eva/Kconfig index cd37dd4861..68ee5efa93 100644 --- a/board/atmark-techno/armadillo-800eva/Kconfig +++ b/board/atmark-techno/armadillo-800eva/Kconfig @@ -9,4 +9,6 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "armadillo-800eva" +config SYS_TEXT_BASE + default 0xE80C0000 endif diff --git a/board/kmc/kzm9g/Kconfig b/board/kmc/kzm9g/Kconfig index f163efd989..7d7e6ac244 100644 --- a/board/kmc/kzm9g/Kconfig +++ b/board/kmc/kzm9g/Kconfig @@ -9,4 +9,7 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "kzm9g" +config SYS_TEXT_BASE + default 0x00000000 + endif diff --git a/board/renesas/alt/Kconfig b/board/renesas/alt/Kconfig index 39d53c185b..a7ed87ecf0 100644 --- a/board/renesas/alt/Kconfig +++ b/board/renesas/alt/Kconfig @@ -9,6 +9,10 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "alt" +config SYS_TEXT_BASE + default 0x70000000 if RMOBILE_EXTRAM_BOOT + default 0xE6304000 + config R8A7794_ETHERNET_B bool "Use ethernet B function" depends on TARGET_ALT diff --git a/board/renesas/blanche/Kconfig b/board/renesas/blanche/Kconfig index ac4730a62f..ed72638870 100644 --- a/board/renesas/blanche/Kconfig +++ b/board/renesas/blanche/Kconfig @@ -9,4 +9,8 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "blanche" +config SYS_TEXT_BASE + default 0x00000000 if MTD_NOR_FLASH + default 0x40000000 + endif diff --git a/board/renesas/gose/Kconfig b/board/renesas/gose/Kconfig index 930a44559e..5111507dbd 100644 --- a/board/renesas/gose/Kconfig +++ b/board/renesas/gose/Kconfig @@ -9,4 +9,8 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "gose" +config SYS_TEXT_BASE + default 0x70000000 if RMOBILE_EXTRAM_BOOT + default 0xE6304000 + endif diff --git a/board/renesas/koelsch/Kconfig b/board/renesas/koelsch/Kconfig index 6475f02b66..503da62284 100644 --- a/board/renesas/koelsch/Kconfig +++ b/board/renesas/koelsch/Kconfig @@ -9,4 +9,8 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "koelsch" +config SYS_TEXT_BASE + default 0x70000000 if RMOBILE_EXTRAM_BOOT + default 0xE6304000 + endif diff --git a/board/renesas/lager/Kconfig b/board/renesas/lager/Kconfig index e990c2019c..0a5e86ded6 100644 --- a/board/renesas/lager/Kconfig +++ b/board/renesas/lager/Kconfig @@ -9,4 +9,8 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "lager" +config SYS_TEXT_BASE + default 0xB0000000 if RMOBILE_EXTRAM_BOOT + default 0xE8080000 + endif diff --git a/board/renesas/porter/Kconfig b/board/renesas/porter/Kconfig index a6f621b73f..b9ed2f7308 100644 --- a/board/renesas/porter/Kconfig +++ b/board/renesas/porter/Kconfig @@ -9,4 +9,8 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "porter" +config SYS_TEXT_BASE + default 0x70000000 if RMOBILE_EXTRAM_BOOT + default 0xE6304000 + endif diff --git a/board/renesas/silk/Kconfig b/board/renesas/silk/Kconfig index 07aee0e50f..56b1faa742 100644 --- a/board/renesas/silk/Kconfig +++ b/board/renesas/silk/Kconfig @@ -9,4 +9,8 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "silk" +config SYS_TEXT_BASE + default 0x70000000 if RMOBILE_EXTRAM_BOOT + default 0xE6304000 + endif diff --git a/board/renesas/stout/Kconfig b/board/renesas/stout/Kconfig index cbbc6dd9e4..06a0d26a2d 100644 --- a/board/renesas/stout/Kconfig +++ b/board/renesas/stout/Kconfig @@ -9,4 +9,8 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "stout" +config SYS_TEXT_BASE + default 0xB0000000 if RMOBILE_EXTRAM_BOOT + default 0xE8080000 + endif diff --git a/include/configs/alt.h b/include/configs/alt.h index 4021910bb3..d1bb984984 100644 --- a/include/configs/alt.h +++ b/include/configs/alt.h @@ -15,12 +15,6 @@ #include "rcar-gen2-common.h" -#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT) -#define CONFIG_SYS_TEXT_BASE 0x70000000 -#else -#define CONFIG_SYS_TEXT_BASE 0xE6304000 -#endif - #if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT) #define CONFIG_SYS_INIT_SP_ADDR 0x7003FFFC #else diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h index 135619ef31..ca058bf1a1 100644 --- a/include/configs/armadillo-800eva.h +++ b/include/configs/armadillo-800eva.h @@ -62,7 +62,6 @@ #define CONFIG_SYS_MONITOR_LEN (256 * 1024) #define CONFIG_SYS_MALLOC_LEN (1 * 1024 * 1024) #define CONFIG_SYS_BOOTMAPSZ (8 * 1024 * 1024) -#define CONFIG_SYS_TEXT_BASE 0xE80C0000 /* FLASH */ #define CONFIG_SYS_FLASH_CFI diff --git a/include/configs/blanche.h b/include/configs/blanche.h index 7f9cc71af3..ee5143cb87 100755 --- a/include/configs/blanche.h +++ b/include/configs/blanche.h @@ -38,12 +38,10 @@ /* FLASH */ #if !defined(CONFIG_MTD_NOR_FLASH) -#define CONFIG_SYS_TEXT_BASE 0x40000000 #define CONFIG_SPI #define CONFIG_SH_QSPI #define CONFIG_SH_QSPI_BASE 0xE6B10000 #else -#define CONFIG_SYS_TEXT_BASE 0x00000000 #define CONFIG_SYS_FLASH_CFI #define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT #define CONFIG_FLASH_CFI_DRIVER diff --git a/include/configs/gose.h b/include/configs/gose.h index c94f7bf252..2f171d358b 100644 --- a/include/configs/gose.h +++ b/include/configs/gose.h @@ -14,12 +14,6 @@ #include "rcar-gen2-common.h" -#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT) -#define CONFIG_SYS_TEXT_BASE 0x70000000 -#else -#define CONFIG_SYS_TEXT_BASE 0xE6304000 -#endif - /* STACK */ #if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT) #define CONFIG_SYS_INIT_SP_ADDR 0x7003FFFC diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h index a0cab809b1..89680b7c8d 100644 --- a/include/configs/koelsch.h +++ b/include/configs/koelsch.h @@ -14,12 +14,6 @@ #include "rcar-gen2-common.h" -#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT) -#define CONFIG_SYS_TEXT_BASE 0x70000000 -#else -#define CONFIG_SYS_TEXT_BASE 0xE6304000 -#endif - /* STACK */ #if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT) #define CONFIG_SYS_INIT_SP_ADDR 0x7003FFFC diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h index 4eb90db7f2..25e2f79c92 100644 --- a/include/configs/kzm9g.h +++ b/include/configs/kzm9g.h @@ -67,7 +67,6 @@ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128 * 1024) #define CONFIG_SYS_BOOTMAPSZ (8 * 1024 * 1024) -#define CONFIG_SYS_TEXT_BASE 0x00000000 #define CONFIG_STANDALONE_LOAD_ADDR 0x41000000 /* FLASH */ diff --git a/include/configs/lager.h b/include/configs/lager.h index 162828b787..f7ea95fce6 100644 --- a/include/configs/lager.h +++ b/include/configs/lager.h @@ -15,12 +15,6 @@ #include "rcar-gen2-common.h" -#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT) -#define CONFIG_SYS_TEXT_BASE 0xB0000000 -#else -#define CONFIG_SYS_TEXT_BASE 0xE8080000 -#endif - /* STACK */ #if defined(CONFIGF_RMOBILE_EXTRAM_BOOT) #define CONFIG_SYS_INIT_SP_ADDR 0xB003FFFC diff --git a/include/configs/porter.h b/include/configs/porter.h index a479566146..a966cf3c76 100644 --- a/include/configs/porter.h +++ b/include/configs/porter.h @@ -16,12 +16,6 @@ #include "rcar-gen2-common.h" -#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT) -#define CONFIG_SYS_TEXT_BASE 0x70000000 -#else -#define CONFIG_SYS_TEXT_BASE 0xE6304000 -#endif - #if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT) #define CONFIG_SYS_INIT_SP_ADDR 0x7003FFFC #else diff --git a/include/configs/silk.h b/include/configs/silk.h index 60a51dc282..18c53e6b8c 100644 --- a/include/configs/silk.h +++ b/include/configs/silk.h @@ -16,12 +16,6 @@ #include "rcar-gen2-common.h" -#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT) -#define CONFIG_SYS_TEXT_BASE 0x70000000 -#else -#define CONFIG_SYS_TEXT_BASE 0xE6304000 -#endif - #if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT) #define CONFIG_SYS_INIT_SP_ADDR 0x7003FFFC #else diff --git a/include/configs/stout.h b/include/configs/stout.h index b5de336aa1..92b9f85f92 100644 --- a/include/configs/stout.h +++ b/include/configs/stout.h @@ -17,12 +17,6 @@ #include "rcar-gen2-common.h" -#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT) -#define CONFIG_SYS_TEXT_BASE 0xB0000000 -#else -#define CONFIG_SYS_TEXT_BASE 0xE8080000 -#endif - /* STACK */ #if defined(CONFIGF_RMOBILE_EXTRAM_BOOT) #define CONFIG_SYS_INIT_SP_ADDR 0xB003FFFC