Skip to content

Commit

Permalink
common/board_f.c: remove CONFIG_SYS_GENERIC_GLOBAL_DATA
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
tpetazzoni authored and trini committed Aug 20, 2017
1 parent fb53e7e commit c1ee893
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 34 deletions.
6 changes: 0 additions & 6 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
27 changes: 0 additions & 27 deletions common/board_f.c
Original file line number Diff line number Diff line change
Expand Up @@ -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__)
Expand Down Expand Up @@ -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;

Expand Down
1 change: 0 additions & 1 deletion scripts/config_whitelist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit c1ee893

Please sign in to comment.