board/t208xqds: Add support of 2-stage NAND/SPI/SD boot

[karo-tx-uboot.git] / include / common.h

diff --git a/include/common.h b/include/common.h
index 5c9bd08f45f21dda5a14782c34773f8d319dfc80..baf361b3e556e1c112a04ae2ce3ea92a177b827c 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -505,19 +505,8 @@ extern ssize_t spi_read     (uchar *, int, uchar *, int);
 extern ssize_t spi_write (uchar *, int, uchar *, int);
 #endif
 
-#ifdef CONFIG_RPXCLASSIC
-void rpxclassic_init (void);
-#endif
-
 void rpxlite_init (void);
 
-#ifdef CONFIG_MBX
-/* $(BOARD)/mbx8xx.c */
-void   mbx_init (void);
-void   board_serial_init (void);
-void   board_ether_init (void);
-#endif
-
 #ifdef CONFIG_HERMES
 /* $(BOARD)/hermes.c */
 void hermes_start_lxt980 (int speed);
@@ -822,8 +811,7 @@ void        udelay        (unsigned long);
 void mdelay(unsigned long);
 
 /* lib/uuid.c */
-void uuid_str_to_bin(const char *uuid, unsigned char *out);
-int uuid_str_valid(const char *uuid);
+#include <uuid.h>
 
 /* lib/vsprintf.c */
 #include <vsprintf.h>
@@ -835,9 +823,7 @@ char *      strmhz(char *buf, unsigned long hz);
 #include <u-boot/crc.h>
 
 /* lib/rand.c */
-#if defined(CONFIG_RANDOM_MACADDR) || \
-       defined(CONFIG_BOOTP_RANDOM_DELAY) || \
-       defined(CONFIG_CMD_LINK_LOCAL)
+#if defined(CONFIG_LIB_RAND) || defined(CONFIG_LIB_HW_RAND)
 #define RAND_MAX -1U
 void srand(unsigned int seed);
 unsigned int rand(void);