diff options
| author | Simon Glass <sjg@chromium.org> | 2024-08-21 10:19:24 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-08-26 14:06:08 -0600 |
| commit | d9902107027a41fc6a27b10f6e030c5a2465936b (patch) | |
| tree | 796bf831ba512656f477ee6a1d6c46b519298452 | |
| parent | b9c396ca4972decf82d4b5896ea8e72c3f8929a9 (diff) | |
| download | u-boot-d9902107027a41fc6a27b10f6e030c5a2465936b.tar.gz | |
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>
| -rw-r--r-- | board/freescale/ls2080ardb/eth_ls2080rdb.c | 2 | ||||
| -rw-r--r-- | common/console.c | 3 | ||||
| -rw-r--r-- | 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 44d9782d729..7fc4fecf774 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 30ddefef6b1..f39821385bb 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 58dbfd6fa14..6445bd477d4 100644 --- a/include/asm-generic/global_data.h +++ b/include/asm-generic/global_data.h @@ -52,6 +52,11 @@ struct global_data { */ const void *fdt_blob; /** + * @cur_serial_dev: current serial device + */ + struct udevice *cur_serial_dev; +#ifndef CONFIG_SPL_BUILD + /** * @jt: jump table * * The jump table contains pointers to exported functions. A pointer to @@ -59,11 +64,6 @@ struct global_data { */ 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 */ struct board_f *boardf; |