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 4aa8d6486904cf37c0006414acb630cb52beefc2..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,13 +9,12 @@
  * (C) Copyright 2007-2008
  * Stelian Pop <stelian@popies.net>
  * Lead Tech Design <www.leadtechdesign.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <command.h>
 #include <common.h>
 #include <dm.h>
+#include <environment.h>
 #include <asm/io.h>
 #include <asm/arch/at91sam9260_matrix.h>
 #include <asm/arch/at91sam9_smc.h>
@@ -25,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>
@@ -197,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
@@ -282,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>
 
@@ -344,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)
 /*
@@ -376,36 +350,36 @@ static int upgrade_failure_fallback(void)
        char *kern_size;
        char *kern_size_fb;
 
-       partitionset_active = getenv("partitionset_active");
+       partitionset_active = env_get("partitionset_active");
        if (partitionset_active) {
                if (partitionset_active[0] == 'A')
-                       setenv("partitionset_active", "B");
+                       env_set("partitionset_active", "B");
                else
-                       setenv("partitionset_active", "A");
+                       env_set("partitionset_active", "A");
        } else {
                printf("partitionset_active missing.\n");
                return -ENOENT;
        }
 
-       rootfs = getenv("rootfs");
-       rootfs_fallback = getenv("rootfs_fallback");
-       setenv("rootfs", rootfs_fallback);
-       setenv("rootfs_fallback", rootfs);
+       rootfs = env_get("rootfs");
+       rootfs_fallback = env_get("rootfs_fallback");
+       env_set("rootfs", rootfs_fallback);
+       env_set("rootfs_fallback", rootfs);
 
-       kern_size = getenv("kernel_size");
-       kern_size_fb = getenv("kernel_size_fallback");
-       setenv("kernel_size", kern_size_fb);
-       setenv("kernel_size_fallback", kern_size);
+       kern_size = env_get("kernel_size");
+       kern_size_fb = env_get("kernel_size_fallback");
+       env_set("kernel_size", kern_size_fb);
+       env_set("kernel_size_fallback", kern_size);
 
-       kern_off = getenv("kernel_Off");
-       kern_off_fb = getenv("kernel_Off_fallback");
-       setenv("kernel_Off", kern_off_fb);
-       setenv("kernel_Off_fallback", kern_off);
+       kern_off = env_get("kernel_Off");
+       kern_off_fb = env_get("kernel_Off_fallback");
+       env_set("kernel_Off", kern_off_fb);
+       env_set("kernel_Off_fallback", kern_off);
 
-       setenv("bootargs", '\0');
-       setenv("upgrade_available", '\0');
-       setenv("boot_retries", '\0');
-       saveenv();
+       env_set("bootargs", '\0');
+       env_set("upgrade_available", '\0');
+       env_set("boot_retries", '\0');
+       env_save();
 
        return 0;
 }
@@ -417,14 +391,14 @@ static int do_upgrade_available(cmd_tbl_t *cmdtp, int flag, int argc,
        unsigned long boot_retry = 0;
        char boot_buf[10];
 
-       upgrade_available = simple_strtoul(getenv("upgrade_available"), NULL,
+       upgrade_available = simple_strtoul(env_get("upgrade_available"), NULL,
                                           10);
        if (upgrade_available) {
-               boot_retry = simple_strtoul(getenv("boot_retries"), NULL, 10);
+               boot_retry = simple_strtoul(env_get("boot_retries"), NULL, 10);
                boot_retry++;
                sprintf(boot_buf, "%lx", boot_retry);
-               setenv("boot_retries", boot_buf);
-               saveenv();
+               env_set("boot_retries", boot_buf);
+               env_save();
 
                /*
                 * Here the boot_retries count is checked, and if the