From patchwork Fri Jul 14 12:55:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mario Six X-Patchwork-Id: 788471 X-Patchwork-Delegate: mario.six@gdsys.cc Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3x8CfR3QZkz9s76 for ; Fri, 14 Jul 2017 23:07:59 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 44043C21F13; Fri, 14 Jul 2017 13:05:45 +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.7 required=5.0 tests=RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS 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 79B77C21FF5; Fri, 14 Jul 2017 12:56:32 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B01DCC21FCB; Fri, 14 Jul 2017 12:56:22 +0000 (UTC) Received: from smtprelay04.ispgateway.de (smtprelay04.ispgateway.de [80.67.18.16]) by lists.denx.de (Postfix) with ESMTPS id DF223C21F54 for ; Fri, 14 Jul 2017 12:56:08 +0000 (UTC) Received: from [87.191.40.34] (helo=bob3.testumgebung.local) by smtprelay04.ispgateway.de with esmtpa (Exim 4.89) (envelope-from ) id 1dW08e-00062X-B5; Fri, 14 Jul 2017 14:56:08 +0200 From: Mario Six To: U-Boot Mailing List , Simon Glass , Dirk Eibach , Heiko Schocher , Stefan Roese , Joe Hershberger , Tom Rini Date: Fri, 14 Jul 2017 14:55:10 +0200 Message-Id: <20170714125537.14895-25-mario.six@gdsys.cc> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170714125537.14895-1-mario.six@gdsys.cc> References: <20170714125537.14895-1-mario.six@gdsys.cc> X-Df-Sender: bWFyaW8uc2l4QGdkc3lzLmNj Subject: [U-Boot] [PATCH 24/51] gdsys: mpc8308: Move SYS_FPGA{0, 1}_{BASE, SIZE} 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" Move CONFIG_SYS_FPGA0_BASE, CONFIG_SYS_FPGA0_SIZE, CONFIG_SYS_FPGA1_BASE, and CONFIG_SYS_FPGA1_SIZE to Kconfig. Signed-off-by: Mario Six Reviewed-by: Simon Glass --- board/gdsys/mpc8308/Kconfig | 23 +++++++++++++++++++++++ include/configs/hrcon.h | 7 ------- include/configs/strider.h | 7 ------- scripts/config_whitelist.txt | 2 -- 4 files changed, 23 insertions(+), 16 deletions(-) diff --git a/board/gdsys/mpc8308/Kconfig b/board/gdsys/mpc8308/Kconfig index cb29c25c65..c0247214a9 100644 --- a/board/gdsys/mpc8308/Kconfig +++ b/board/gdsys/mpc8308/Kconfig @@ -1,3 +1,26 @@ + +config SYS_FPGA0_BASE + hex + default E0600000 + help + The base address of the first FPGA's register map. + +config SYS_FPGA0_SIZE + hex + default 1 + help + The base address of the first FPGA's register map. + +config SYS_FPGA1_BASE + hex + help + The base address of the second FPGA's register map. + +config SYS_FPGA1_SIZE + hex + help + The base address of the second FPGA's register map. + if TARGET_HRCON config SYS_BOARD diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h index 405129b7e2..5db623d28e 100644 --- a/include/configs/hrcon.h +++ b/include/configs/hrcon.h @@ -243,12 +243,6 @@ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ -/* - * FPGA - */ -#define CONFIG_SYS_FPGA0_BASE 0xE0600000 -#define CONFIG_SYS_FPGA0_SIZE 1 /* FPGA size is 1M */ - /* Window base at FPGA base */ #define CONFIG_SYS_LBLAWBAR1_PRELIM CONFIG_SYS_FPGA0_BASE #define CONFIG_SYS_LBLAWAR1_PRELIM (LBLAWAR_EN | LBLAWAR_1MB) @@ -266,7 +260,6 @@ | OR_GPCM_TRLX_SET \ | OR_GPCM_EHTR_SET) -#define CONFIG_SYS_FPGA_BASE(k) CONFIG_SYS_FPGA0_BASE #define CONFIG_SYS_FPGA_DONE(k) 0x0010 #define CONFIG_SYS_FPGA_COUNT 1 diff --git a/include/configs/strider.h b/include/configs/strider.h index 994ac73e13..8487a188a7 100644 --- a/include/configs/strider.h +++ b/include/configs/strider.h @@ -243,12 +243,6 @@ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ -/* - * FPGA - */ -#define CONFIG_SYS_FPGA0_BASE 0xE0600000 -#define CONFIG_SYS_FPGA0_SIZE 1 /* FPGA size is 1M */ - /* Window base at FPGA base */ #define CONFIG_SYS_LBLAWBAR1_PRELIM CONFIG_SYS_FPGA0_BASE #define CONFIG_SYS_LBLAWAR1_PRELIM (LBLAWAR_EN | LBLAWAR_1MB) @@ -265,7 +259,6 @@ | OR_GPCM_TRLX_CLEAR \ | OR_GPCM_EHTR_CLEAR) -#define CONFIG_SYS_FPGA_BASE(k) CONFIG_SYS_FPGA0_BASE #define CONFIG_SYS_FPGA_DONE(k) 0x0010 #define CONFIG_SYS_FPGA_COUNT 1 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 4c136a6502..64a4b1190e 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3086,8 +3086,6 @@ CONFIG_SYS_FORM_PMC CONFIG_SYS_FORM_PMC_XMC CONFIG_SYS_FORM_VME CONFIG_SYS_FORM_XMC -CONFIG_SYS_FPGA0_BASE -CONFIG_SYS_FPGA0_SIZE CONFIG_SYS_FPGAREG_DATE CONFIG_SYS_FPGAREG_DIPSW CONFIG_SYS_FPGAREG_FREQ