  #ifdef CONFIG_CMD_USB
  	sama5d3_xplained_usb_hw_init();
  #endif
- #ifdef CONFIG_GENERIC_ATMEL_MCI
+-#ifdef CONFIG_GENERIC_ATMEL_MCI
 -	sama5d3_xplained_mci0_hw_init();
-+	//sama5d3_xplained_mci0_hw_init();
- #endif
+-#endif
  	return 0;
  }
+ 
+@@ -122,9 +4402,6 @@
+ void spl_board_init(void)
+ {
+ #ifdef CONFIG_SD_BOOT
+-#ifdef CONFIG_GENERIC_ATMEL_MCI
+-	sama5d3_xplained_mci0_hw_init();
+-#endif
+ #elif CONFIG_NAND_BOOT
+ 	sama5d3_xplained_nand_hw_init();
+ #endif

+	return 0;
+}
+
 #ifdef CONFIG_NAND_ATMEL
 void sama5d3_xplained_nand_hw_init(void)
 {
@@ -59,13 +4340,6 @@ static void sama5d3_xplained_usb_hw_init(void)
 }
 #endif
 

 #ifdef CONFIG_DEBUG_UART_BOARD_INIT
 void board_debug_uart_init(void)
 {
@@ -100,12 +4373,19 @@
 #ifdef CONFIG_NAND_ATMEL
 	sama5d3_xplained_nand_hw_init();
 #endif
+
+#ifdef CONFIG_LCD
+    thor_lcd_hw_init();
+#endif /* ifdef CONFIG_LCD */
+
+#ifdef CONFIG_ATMEL_SPI
