leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

powerpc: Move setup_board_extra() into a PPC file

Browse Source 
We don't need this PPC-specific function in generic code. Move it to
the powerpc directory.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Simon Glass 2017-03-31 08:40:36 -06:00 committed by Tom Rini
parent 056285fd45
commit e5fb573f64
4 changed files with 40 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/powerpc/lib/Makefile
View File

@ -17,6 +17,7 @@ MINIMAL=y
endif
endif
obj-$(CONFIG_SYS_EXTBDINFO) += setup.o
ifdef MINIMAL
obj-y += cache.o time.o
obj-y += ticks.o

32
arch/powerpc/lib/setup.c Normal file
View File

@ -0,0 +1,32 @@
/*
* Copyright (c) 2017 Google, Inc
*
* SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
#include <version.h>
DECLARE_GLOBAL_DATA_PTR;
int setup_board_extra(void)
{
bd_t *bd = gd->bd;
strncpy((char *)bd->bi_s_version, "1.2", sizeof(bd->bi_s_version));
strncpy((char *)bd->bi_r_version, U_BOOT_VERSION,
sizeof(bd->bi_r_version));
bd->bi_procfreq = gd->cpu_clk; /* Processor Speed, In Hz */
bd->bi_plb_busfreq = gd->bus_clk;
#if defined(CONFIG_405GP) || defined(CONFIG_405EP) || \
defined(CONFIG_440EP) || defined(CONFIG_440GR) || \
defined(CONFIG_440EPX) || defined(CONFIG_440GRX)
bd->bi_pci_busfreq = get_PCI_freq();
bd->bi_opbfreq = get_OPB_freq();
#elif defined(CONFIG_XILINX_405)
bd->bi_pci_busfreq = get_PCI_freq();
#endif
return 0;
}

25
common/board_f.c
View File

@ -11,7 +11,6 @@
*/
#include <common.h>
#include <version.h>
#include <console.h>
#include <environment.h>
#include <dm.h>
@ -607,30 +606,6 @@ static int setup_board_part2(void)
}
#endif
#ifdef CONFIG_SYS_EXTBDINFO
static int setup_board_extra(void)
{
bd_t *bd = gd->bd;
strncpy((char *) bd->bi_s_version, "1.2", sizeof(bd->bi_s_version));
strncpy((char *) bd->bi_r_version, U_BOOT_VERSION,
sizeof(bd->bi_r_version));
bd->bi_procfreq = gd->cpu_clk; /* Processor Speed, In Hz */
bd->bi_plb_busfreq = gd->bus_clk;
#if defined(CONFIG_405GP) || defined(CONFIG_405EP) || \
defined(CONFIG_440EP) || defined(CONFIG_440GR) || \
defined(CONFIG_440EPX) || defined(CONFIG_440GRX)
bd->bi_pci_busfreq = get_PCI_freq();
bd->bi_opbfreq = get_OPB_freq();
#elif defined(CONFIG_XILINX_405)
bd->bi_pci_busfreq = get_PCI_freq();
#endif
return 0;
}
#endif
#ifdef CONFIG_POST
static int init_post(void)
{

7
include/common.h
View File

@ -302,6 +302,13 @@ int print_cpuinfo(void);
int update_flash_size(int flash_size);
int arch_early_init_r(void);
/*
* setup_board_extra() - Fill in extra details in the bd_t structure
*
* @return 0 if OK, -ve on error
*/
int setup_board_extra(void);
/**
* arch_fsp_init() - perform firmware support package init
*