From d9902107027a41fc6a27b10f6e030c5a2465936b Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Wed, 21 Aug 2024 10:19:24 -0600 Subject: [PATCH] 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 --- board/freescale/ls2080ardb/eth_ls2080rdb.c | 2 +- common/console.c | 3 ++- include/asm-generic/global_data.h | 10 +++++----- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/board/freescale/ls2080ardb/eth_ls2080rdb.c b/board/freescale/ls2080ardb/eth_ls2080rdb.c index 44d9782d72..7fc4fecf77 100644 --- a/board/freescale/ls2080ardb/eth_ls2080rdb.c +++ b/board/freescale/ls2080ardb/eth_ls2080rdb.c @@ -12,7 +12,7 @@ DECLARE_GLOBAL_DATA_PTR; 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 * upload application diff --git a/common/console.c b/common/console.c index 30ddefef6b..f39821385b 100644 --- a/common/console.c +++ b/common/console.c @@ -189,6 +189,7 @@ static int console_setfile(int file, struct stdio_dev * dev) /* Assign the new device (leaving the existing one started) */ stdio_devices[file] = dev; +#ifndef CONFIG_SPL_BUILD /* * Update monitor functions * (to use the console stuff by other applications) @@ -206,7 +207,7 @@ static int console_setfile(int file, struct stdio_dev * dev) break; } break; - +#endif default: /* Invalid file ID */ error = -1; } diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h index 58dbfd6fa1..6445bd477d 100644 --- a/include/asm-generic/global_data.h +++ b/include/asm-generic/global_data.h @@ -51,6 +51,11 @@ struct global_data { * @fdt_blob: U-Boot's own device tree, NULL if none */ const void *fdt_blob; + /** + * @cur_serial_dev: current serial device + */ + struct udevice *cur_serial_dev; +#ifndef CONFIG_SPL_BUILD /** * @jt: jump table * @@ -58,11 +63,6 @@ struct global_data { * the jump table is passed to standalone applications. */ 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 */ -- 2.39.5