Merge branch '2019-05-03-master-imports'

[oweals/u-boot.git] / board / siemens / taurus / taurus.c

diff --git a/board/siemens/taurus/taurus.c b/board/siemens/taurus/taurus.c
index 8390bdd5f812f60004a0262b0b1ee67dfc29b3fb..6ea97eb4e87ccb8ab982096d709799a3bd9ba074 100644 (file)
--- a/board/siemens/taurus/taurus.c
+++ b/board/siemens/taurus/taurus.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Board functions for Siemens TAURUS (AT91SAM9G20) based boards
  * (C) Copyright Siemens AG
@@ -8,8 +9,6 @@
  * (C) Copyright 2007-2008
  * Stelian Pop <stelian@popies.net>
  * Lead Tech Design <www.leadtechdesign.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <command.h>
@@ -26,7 +25,7 @@
 #include <asm/arch/atmel_serial.h>
 #include <asm/arch/clk.h>
 #include <asm/gpio.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <atmel_mci.h>
 #include <asm/arch/at91_spi.h>
 #include <spi.h>
@@ -198,11 +197,11 @@ void mem_init(void)
 
        /* Mirrors at A15 on ATMEL G20 SDRAM Controller with 64MB*/
        if (ram_size == 0x800) {
-               printf("\n\r 64MB");
+               printf("\n\r 64MB\n");
                sdramc_configure(AT91_SDRAMC_NC_9);
        } else {
                /* Size already initialized */
-               printf("\n\r 128MB");
+               printf("\n\r 128MB\n");
        }
 }
 #endif
@@ -283,21 +282,6 @@ int board_early_init_f(void)
        return 0;
 }
 
-int spi_cs_is_valid(unsigned int bus, unsigned int cs)
-{
-       return bus == 0 && cs == 0;
-}
-
-void spi_cs_activate(struct spi_slave *slave)
-{
-       at91_set_gpio_value(TAURUS_SPI_CS_PIN, 0);
-}
-
-void spi_cs_deactivate(struct spi_slave *slave)
-{
-       at91_set_gpio_value(TAURUS_SPI_CS_PIN, 1);
-}
-
 #ifdef CONFIG_USB_GADGET_AT91
 #include <linux/usb/at91_udc.h>
 
@@ -345,17 +329,6 @@ int dram_init(void)
        return 0;
 }
 
-#ifndef CONFIG_DM_ETH
-int board_eth_init(bd_t *bis)
-{
-       int rc = 0;
-#ifdef CONFIG_MACB
-       rc = macb_eth_initialize(0, (void *)ATMEL_BASE_EMAC0, 0x00);
-#endif
-       return rc;
-}
-#endif
-
 #if !defined(CONFIG_SPL_BUILD)
 #if defined(CONFIG_BOARD_AXM)
 /*