mirror of
https://github.com/u-boot/u-boot.git
synced 2025-04-26 15:28:50 +00:00
global_data: Remove jump table in SPL
SPL builds don't use the jump table since they cannot run apps. Drop it, moving it together with boardf. Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
parent
b9c396ca49
commit
d990210702
3 changed files with 8 additions and 7 deletions
|
@ -12,7 +12,7 @@ DECLARE_GLOBAL_DATA_PTR;
|
||||||
int board_eth_init(struct bd_info *bis)
|
int board_eth_init(struct bd_info *bis)
|
||||||
{
|
{
|
||||||
|
|
||||||
#ifdef CONFIG_PHY_AQUANTIA
|
#if defined(CONFIG_PHY_AQUANTIA) && !defined(CONFIG_SPL_BUILD)
|
||||||
/*
|
/*
|
||||||
* Export functions to be used by AQ firmware
|
* Export functions to be used by AQ firmware
|
||||||
* upload application
|
* upload application
|
||||||
|
|
|
@ -189,6 +189,7 @@ static int console_setfile(int file, struct stdio_dev * dev)
|
||||||
/* Assign the new device (leaving the existing one started) */
|
/* Assign the new device (leaving the existing one started) */
|
||||||
stdio_devices[file] = dev;
|
stdio_devices[file] = dev;
|
||||||
|
|
||||||
|
#ifndef CONFIG_SPL_BUILD
|
||||||
/*
|
/*
|
||||||
* Update monitor functions
|
* Update monitor functions
|
||||||
* (to use the console stuff by other applications)
|
* (to use the console stuff by other applications)
|
||||||
|
@ -206,7 +207,7 @@ static int console_setfile(int file, struct stdio_dev * dev)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
#endif
|
||||||
default: /* Invalid file ID */
|
default: /* Invalid file ID */
|
||||||
error = -1;
|
error = -1;
|
||||||
}
|
}
|
||||||
|
|
|
@ -51,6 +51,11 @@ struct global_data {
|
||||||
* @fdt_blob: U-Boot's own device tree, NULL if none
|
* @fdt_blob: U-Boot's own device tree, NULL if none
|
||||||
*/
|
*/
|
||||||
const void *fdt_blob;
|
const void *fdt_blob;
|
||||||
|
/**
|
||||||
|
* @cur_serial_dev: current serial device
|
||||||
|
*/
|
||||||
|
struct udevice *cur_serial_dev;
|
||||||
|
#ifndef CONFIG_SPL_BUILD
|
||||||
/**
|
/**
|
||||||
* @jt: jump table
|
* @jt: jump table
|
||||||
*
|
*
|
||||||
|
@ -58,11 +63,6 @@ struct global_data {
|
||||||
* the jump table is passed to standalone applications.
|
* the jump table is passed to standalone applications.
|
||||||
*/
|
*/
|
||||||
struct jt_funcs *jt;
|
struct jt_funcs *jt;
|
||||||
/**
|
|
||||||
* @cur_serial_dev: current serial device
|
|
||||||
*/
|
|
||||||
struct udevice *cur_serial_dev;
|
|
||||||
#ifndef CONFIG_SPL_BUILD
|
|
||||||
/**
|
/**
|
||||||
* @boardf: information only used before relocation
|
* @boardf: information only used before relocation
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Add table
Reference in a new issue