X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=board%2Ftqc%2Ftqm5200%2Ftqm5200.c;h=4d4f29da74e56580c228c2199b95422a6d2cb77d;hb=361b715bbfbebc96d31c0ee48c34c2e66f049684;hp=a1f56cde2962a96053a289068c412a37096e0325;hpb=3765b3e7bd0f8e46914d417f29cbcb0c72b1acf7;p=oweals%2Fu-boot.git

diff --git a/board/tqc/tqm5200/tqm5200.c b/board/tqc/tqm5200/tqm5200.c
index a1f56cde29..4d4f29da74 100644
--- a/board/tqc/tqm5200/tqm5200.c
+++ b/board/tqc/tqm5200/tqm5200.c
@@ -258,11 +258,6 @@ phys_size_t initdram (int board_type)
 
 int checkboard (void)
 {
-#if defined(CONFIG_AEVFIFO)
-	puts ("Board: AEVFIFO\n");
-	return 0;
-#endif
-
 #if defined(CONFIG_TQM5200S)
 # define MODULE_NAME	"TQM5200S"
 #else
@@ -271,8 +266,6 @@ int checkboard (void)
 
 #if defined(CONFIG_STK52XX)
 # define CARRIER_NAME	"STK52xx"
-#elif defined(CONFIG_TB5200)
-# define CARRIER_NAME	"TB5200"
 #elif defined(CONFIG_CAM5200)
 # define CARRIER_NAME	"CAM5200"
 #elif defined(CONFIG_FO300)
@@ -762,7 +755,7 @@ void video_get_info_str (int line_number, char *info)
 	if (line_number == 1) {
 	strcpy (info, " Board: TQM5200 (TQ-Components GmbH)");
 #if defined (CONFIG_CHARON) || defined (CONFIG_FO300) || \
-	defined(CONFIG_STK52XX) || defined(CONFIG_TB5200)
+	defined(CONFIG_STK52XX)
 	} else if (line_number == 2) {
 #if defined (CONFIG_CHARON)
 		strcpy (info, "        on a CHARON carrier board");
@@ -770,9 +763,6 @@ void video_get_info_str (int line_number, char *info)
 #if defined (CONFIG_STK52XX)
 		strcpy (info, "        on a STK52xx carrier board");
 #endif
-#if defined (CONFIG_TB5200)
-		strcpy (info, "        on a TB5200 carrier board");
-#endif
 #if defined (CONFIG_FO300)
 		strcpy (info, "        on a FO300 carrier board");
 #endif
@@ -863,12 +853,14 @@ int board_get_height (void)
 #endif /* CONFIG_VIDEO_SM501 */
 
 #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
-void ft_board_setup(void *blob, bd_t *bd)
+int ft_board_setup(void *blob, bd_t *bd)
 {
 	ft_cpu_setup(blob, bd);
 #if defined(CONFIG_VIDEO)
 	fdt_add_edid(blob, "smi,sm501", edid_buf);
 #endif
+
+	return 0;
 }
 #endif /* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */