From 7287d5f091c97a38a8820b45aaee123d6bbef12f Mon Sep 17 00:00:00 2001
From: Marek Vasut <marex@denx.de>
Date: Tue, 30 Dec 2014 21:29:35 +0100
Subject: [PATCH] arm: socfpga: Zap checkboard()

Since all boards now have a DT, instead of hard-coding the board
name into the U-Boot binary, read the board name from DT "model"
property.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Chin Liang See <clsee@opensource.altera.com>
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
Acked-by: Pavel Machek <pavel@denx.de>
Acked-by: Stefan Roese <sr@denx.de>
Cc: Vince Bridgers <vbridger@opensource.altera.com>
---
 board/altera/socfpga/socfpga.c   | 9 ---------
 include/configs/socfpga_common.h | 2 +-
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/board/altera/socfpga/socfpga.c b/board/altera/socfpga/socfpga.c
index 459d82f351..2b2b63df51 100644
--- a/board/altera/socfpga/socfpga.c
+++ b/board/altera/socfpga/socfpga.c
@@ -18,15 +18,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-/*
- * Print Board information
- */
-int checkboard(void)
-{
-	puts("BOARD: Altera SoCFPGA Cyclone5 Board\n");
-	return 0;
-}
-
 /*
  * Initialization function which happen at early stage of c code
  */
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index ee227fef0f..59b7f218a4 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -19,7 +19,7 @@
  * High level configuration
  */
 #define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
+#define CONFIG_DISPLAY_BOARDINFO_LATE
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_ARCH_EARLY_INIT_R
 #define CONFIG_SYS_NO_FLASH