X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=common%2Fexports.c;h=333107c74c3c68f9244eea3cdbd44a6f0c1c2802;hb=81a66446c319225c4a8f0c4c0d9cf4ee10f8c2b9;hp=9858217ae0c3db1b0e28df5be9b41a995b39f52a;hpb=4f7cb08ee7b48a511a9cd2398fd4a243ca2733c7;p=people%2Fms%2Fu-boot.git

diff --git a/common/exports.c b/common/exports.c
index 9858217ae0..333107c74c 100644
--- a/common/exports.c
+++ b/common/exports.c
@@ -1,7 +1,11 @@
 #include <common.h>
 #include <exports.h>
+#include <spi.h>
+#include <i2c.h>
 
-static void dummy(void)
+DECLARE_GLOBAL_DATA_PTR;
+
+__attribute__((unused)) static void dummy(void)
 {
 }
 
@@ -10,26 +14,10 @@ unsigned long get_version(void)
 	return XF_VERSION;
 }
 
-void jumptable_init (void)
-{
-	DECLARE_GLOBAL_DATA_PTR;
-	int i;
-
-	gd->jt = (void **) malloc (XF_MAX * sizeof (void *));
-	for (i = 0; i < XF_MAX; i++)
-		gd->jt[i] = (void *) dummy;
+#define EXPORT_FUNC(f, a, x, ...)  gd->jt->x = f;
 
-	gd->jt[XF_get_version] = (void *) get_version;
-	gd->jt[XF_malloc] = (void *) malloc;
-	gd->jt[XF_free] = (void *) free;
-	gd->jt[XF_get_timer] = (void *)get_timer;
-	gd->jt[XF_udelay] = (void *)udelay;
-#if defined(CONFIG_I386) || defined(CONFIG_PPC)
-	gd->jt[XF_install_hdlr] = (void *) irq_install_handler;
-	gd->jt[XF_free_hdlr] = (void *) irq_free_handler;
-#endif	/* I386 || PPC */
-#if (CONFIG_COMMANDS & CFG_CMD_I2C)
-	gd->jt[XF_i2c_write] = (void *) i2c_write;
-	gd->jt[XF_i2c_read] = (void *) i2c_read;
-#endif	/* CFG_CMD_I2C */
+void jumptable_init(void)
+{
+	gd->jt = malloc(sizeof(struct jt_funcs));
+#include <_exports.h>
 }