diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-08-16 00:11:02 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-08-20 16:54:32 +0300 |
| commit | c1ee8936bfcf467ccf69b5dbfcf358876e76e756 (patch) | |
| tree | 11f78e1251c2a796fc910599e24149e5af83ba67 | |
| parent | fb53e7eb60567dae2181a3d55f51e72e03a2aac6 (diff) | |
| download | u-boot-c1ee8936bfcf467ccf69b5dbfcf358876e76e756.tar.xz | |
common/board_f.c: remove CONFIG_SYS_GENERIC_GLOBAL_DATA
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 <thomas.petazzoni@free-electrons.com>
Reviewed-by: Vladimir Zapolskiy <vz@mleia.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | README | 6 | ||||
| -rw-r--r-- | common/board_f.c | 27 | ||||
| -rw-r--r-- | scripts/config_whitelist.txt | 1 |
3 files changed, 0 insertions, 34 deletions
@@ -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 de5f398a0b..104d144f41 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 b3dac2dceb..6c628c878c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3342,7 +3342,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 |