From patchwork Tue Aug 15 21:11:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 801780 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=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xX4sR345Mz9sRW for ; Wed, 16 Aug 2017 07:11:23 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 24595C21DB9; Tue, 15 Aug 2017 21:11:19 +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=none 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 0CE66C21C54; Tue, 15 Aug 2017 21:11:17 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 2493BC21C54; Tue, 15 Aug 2017 21:11:15 +0000 (UTC) Received: from mail.free-electrons.com (mail.free-electrons.com [62.4.15.54]) by lists.denx.de (Postfix) with ESMTP id C30AAC21C41 for ; Tue, 15 Aug 2017 21:11:14 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 110) id 318452080D; Tue, 15 Aug 2017 23:11:14 +0200 (CEST) Received: from localhost (132.230.147.77.rev.sfr.net [77.147.230.132]) by mail.free-electrons.com (Postfix) with ESMTPSA id C338420760; Tue, 15 Aug 2017 23:11:03 +0200 (CEST) From: Thomas Petazzoni To: Simon Glass , Bin Meng , u-boot@lists.denx.de Date: Tue, 15 Aug 2017 23:11:02 +0200 Message-Id: <20170815211102.28447-1-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 2.9.4 Cc: Thomas Petazzoni Subject: [U-Boot] [PATCH] common/board_f.c: remove CONFIG_SYS_GENERIC_GLOBAL_DATA 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" CONFIG_SYS_GENERIC_GLOBAL_DATA is no longer used by any board or platform, so support for it can be dropped. Signed-off-by: Thomas Petazzoni Reviewed-by: Vladimir Zapolskiy Reviewed-by: Simon Glass --- README | 6 ------ common/board_f.c | 27 --------------------------- scripts/config_whitelist.txt | 1 - 3 files changed, 34 deletions(-) diff --git a/README b/README index 3fdb89c..15ac00d 100644 --- a/README +++ b/README @@ -404,12 +404,6 @@ The following options need to be configured: supported, core will start to execute uboot when wakes up. - Generic CPU options: - CONFIG_SYS_GENERIC_GLOBAL_DATA - Defines global data is initialized in generic board board_init_f(). - If this macro is defined, global data is created and cleared in - generic board board_init_f(). Without this macro, architecture/board - should initialize global data before calling board_init_f(). - CONFIG_SYS_BIG_ENDIAN, CONFIG_SYS_LITTLE_ENDIAN Defines the endianess of the CPU. Implementation of those diff --git a/common/board_f.c b/common/board_f.c index 5915e50..37bbf5a 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -211,14 +211,6 @@ static int init_func_spi(void) } #endif -__maybe_unused -static int zero_global_data(void) -{ - memset((void *)gd, '\0', sizeof(gd_t)); - - return 0; -} - static int setup_mon_len(void) { #if defined(__ARM__) || defined(__MICROBLAZE__) @@ -910,25 +902,6 @@ static const init_fnc_t init_sequence_f[] = { void board_init_f(ulong boot_flags) { -#ifdef CONFIG_SYS_GENERIC_GLOBAL_DATA - /* - * For some architectures, global data is initialized and used before - * calling this function. The data should be preserved. For others, - * CONFIG_SYS_GENERIC_GLOBAL_DATA should be defined and use the stack - * here to host global data until relocation. - */ - gd_t data; - - gd = &data; - - /* - * Clear global data before it is accessed at debug print - * in initcall_run_list. Otherwise the debug print probably - * get the wrong value of gd->have_console. - */ - zero_global_data(); -#endif - gd->flags = boot_flags; gd->have_console = 0; diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index db28457..2df02d0 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3341,7 +3341,6 @@ CONFIG_SYS_GBIT_MII_BUSNAME CONFIG_SYS_GBL_DATA_OFFSET CONFIG_SYS_GBL_DATA_SIZE CONFIG_SYS_GENERIC_BOARD -CONFIG_SYS_GENERIC_GLOBAL_DATA CONFIG_SYS_GIC400_ADDR CONFIG_SYS_GP1DIR CONFIG_SYS_GP1ODR