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>
diff --git a/board/freescale/ls2080ardb/eth_ls2080rdb.c b/board/freescale/ls2080ardb/eth_ls2080rdb.c
index 44d9782..7fc4fec 100644
--- a/board/freescale/ls2080ardb/eth_ls2080rdb.c
+++ b/board/freescale/ls2080ardb/eth_ls2080rdb.c
@@ -12,7 +12,7 @@
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 30ddefe..f398213 100644
--- a/common/console.c
+++ b/common/console.c
@@ -189,6 +189,7 @@
/* 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 @@
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 58dbfd6..6445bd4 100644
--- a/include/asm-generic/global_data.h
+++ b/include/asm-generic/global_data.h
@@ -52,6 +52,11 @@
*/
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 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;