Merge tag 'tpm-030822' of https://source.denx.de/u-boot/custodians/u-boot-tpm

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

diff --git a/board/siemens/taurus/taurus.c b/board/siemens/taurus/taurus.c
index 927ef59..6c44afb 100644 (file)
--- a/board/siemens/taurus/taurus.c
+++ b/board/siemens/taurus/taurus.c
@@ -15,8 +15,8 @@
 #include <common.h>
 #include <dm.h>
 #include <env.h>
-#include <flash.h>
 #include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/at91sam9260_matrix.h>
 #include <asm/arch/at91sam9_smc.h>
@@ -263,7 +263,7 @@ static void taurus_macb_hw_init(void)
 #endif
 
 #ifdef CONFIG_GENERIC_ATMEL_MCI
-int board_mmc_init(bd_t *bd)
+int board_mmc_init(struct bd_info *bd)
 {
        at91_mci_hw_init();
 
@@ -393,10 +393,9 @@ static int do_upgrade_available(struct cmd_tbl *cmdtp, int flag, int argc,
        unsigned long boot_retry = 0;
        char boot_buf[10];
 
-       upgrade_available = simple_strtoul(env_get("upgrade_available"), NULL,
-                                          10);
+       upgrade_available = dectoul(env_get("upgrade_available"), NULL);
        if (upgrade_available) {
-               boot_retry = simple_strtoul(env_get("boot_retries"), NULL, 10);
+               boot_retry = dectoul(env_get("boot_retries"), NULL);
                boot_retry++;
                sprintf(boot_buf, "%lx", boot_retry);
                env_set("boot_retries", boot_buf);