Merge branch 'master' of git://git.denx.de/u-boot-arc

[karo-tx-uboot.git] / board / altera / nios2-generic / nios2-generic.c

diff --git a/board/altera/nios2-generic/nios2-generic.c b/board/altera/nios2-generic/nios2-generic.c
index 89848cf041f4e43f4b8da87bc3da92bcdc2c7cf8..834cbeb2d5e7396827ff9656db3c1f3eae059609 100644 (file)
--- a/board/altera/nios2-generic/nios2-generic.c
+++ b/board/altera/nios2-generic/nios2-generic.c
@@ -3,33 +3,42 @@
  * Scott McNutt <smcnutt@psyent.com>
  * (C) Copyright 2010, Thomas Chou <thomas@wytron.com.tw>
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
 #include <netdev.h>
+#if defined(CONFIG_CFI_FLASH_MTD)
+#include <mtd/cfi_flash.h>
+#endif
+#include <asm/io.h>
+#include <asm/gpio.h>
 
-void text_base_hook(void); /* nop hook for text_base.S */
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR) && \
+    defined(CONFIG_CFI_FLASH_MTD)
+static void __early_flash_cmd_reset(void)
+{
+       /* reset flash before we read env */
+       writeb(AMD_CMD_RESET, CONFIG_ENV_ADDR);
+       writeb(FLASH_CMD_RESET, CONFIG_ENV_ADDR);
+}
+void early_flash_cmd_reset(void)
+       __attribute__((weak,alias("__early_flash_cmd_reset")));
+#endif
 
 int board_early_init_f(void)
 {
-       text_base_hook();
+#ifdef CONFIG_ALTERA_PIO
+#ifdef LED_PIO_BASE
+       altera_pio_init(LED_PIO_BASE, LED_PIO_WIDTH, 'o',
+                       LED_PIO_RSTVAL, (1 << LED_PIO_WIDTH) - 1,
+                       "led");
+#endif
+#endif
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR) && \
+    defined(CONFIG_CFI_FLASH_MTD)
+       early_flash_cmd_reset();
+#endif
        return 0;
 }
 
@@ -58,7 +67,15 @@ int board_eth_init(bd_t *bis)
        rc += altera_tse_initialize(0,
                                    CONFIG_SYS_ALTERA_TSE_MAC_BASE,
                                    CONFIG_SYS_ALTERA_TSE_SGDMA_RX_BASE,
-                                   CONFIG_SYS_ALTERA_TSE_SGDMA_TX_BASE);
+                                   CONFIG_SYS_ALTERA_TSE_SGDMA_TX_BASE,
+#if defined(CONFIG_SYS_ALTERA_TSE_SGDMA_DESC_BASE) && \
+       (CONFIG_SYS_ALTERA_TSE_SGDMA_DESC_SIZE > 0)
+                                   CONFIG_SYS_ALTERA_TSE_SGDMA_DESC_BASE,
+                                   CONFIG_SYS_ALTERA_TSE_SGDMA_DESC_SIZE);
+#else
+                                   0,
+                                   0);
+#endif
 #endif
 #ifdef CONFIG_ETHOC
        rc += ethoc_initialize(0, CONFIG_SYS_ETHOC_BASE);