Merge git://www.denx.de/git/u-boot-sunxi

[platform/kernel/u-boot.git] / include / configs / nios2-generic.h

diff --git a/include/configs/nios2-generic.h b/include/configs/nios2-generic.h
index d57d53c..6247bf1 100644 (file)
--- a/include/configs/nios2-generic.h
+++ b/include/configs/nios2-generic.h
@@ -3,23 +3,7 @@
  * 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+
  */
 
 #ifndef __CONFIG_H
@@ -31,12 +15,14 @@
 #include "../board/altera/nios2-generic/custom_fpga.h" /* fpga parameters */
 #define CONFIG_BOARD_NAME "nios2-generic" /* custom board name */
 #define CONFIG_BOARD_EARLY_INIT_F      /* enable early board-spec. init */
+#define CONFIG_DISPLAY_CPUINFO
+#define CONFIG_DISPLAY_BOARDINFO
 #define CONFIG_SYS_NIOS_SYSID_BASE     CONFIG_SYS_SYSID_BASE
 
 /*
  * SERIAL
  */
-#define CONFIG_ALTERA_UART
+#define CONFIG_ALTERA_JTAG_UART
 #if defined(CONFIG_ALTERA_JTAG_UART)
 # define CONFIG_SYS_NIOS_CONSOLE       CONFIG_SYS_JTAG_UART_BASE
 #else
@@ -55,7 +41,6 @@
 #define CONFIG_SYS_LOW_RES_TIMER
 #define CONFIG_SYS_NIOS_TMRBASE        CONFIG_SYS_TIMER_BASE
 #define CONFIG_SYS_NIOS_TMRIRQ         CONFIG_SYS_TIMER_IRQ
-#define CONFIG_SYS_HZ                  1000    /* Always 1000 */
 #define CONFIG_SYS_NIOS_TMRMS          10      /* Desired period (msec)*/
 #define CONFIG_SYS_NIOS_TMRCNT \
        (CONFIG_SYS_NIOS_TMRMS * (CONFIG_SYS_TIMER_FREQ / 1000) - 1)
@@ -63,9 +48,17 @@
 /*
  * STATUS LED
  */
+#define CONFIG_ALTERA_PIO
+#define CONFIG_SYS_ALTERA_PIO_NUM      1
+#define CONFIG_SYS_ALTERA_PIO_GPIO_NUM LED_PIO_WIDTH
+
 #define CONFIG_STATUS_LED              /* Enable status driver */
+#define CONFIG_BOARD_SPECIFIC_LED
 #define CONFIG_GPIO_LED                /* Enable GPIO LED driver */
 #define CONFIG_GPIO                    /* Enable GPIO driver */
+#define LED_PIO_BASE                   USER_LED_PIO_8OUT_BASE
+#define LED_PIO_WIDTH                  8
+#define LED_PIO_RSTVAL                 0xff
 
 #define STATUS_LED_BIT                 0       /* Bit-0 on GPIO */
 #define STATUS_LED_STATE               1       /* Blinking */
@@ -92,11 +85,14 @@
 #undef CONFIG_CMD_XIMG
 
 #ifdef CONFIG_CMD_NET
-# define CONFIG_NET_MULTI
 # define CONFIG_CMD_DHCP
 # define CONFIG_CMD_PING
 #endif
 
+#define CONFIG_OF_LIBFDT
+#define CONFIG_OF_BOARD_SETUP
+#define CONFIG_LMB
+
 /*
  * ENVIRONMENT -- Put environment in sector CONFIG_SYS_MONITOR_LEN above
  * CONFIG_SYS_RESET_ADDR, since we assume the monitor is stored at the
@@ -106,7 +102,7 @@
  */
 #define CONFIG_ENV_IS_IN_FLASH
 
-#define CONFIG_ENV_SIZE                0x10000 /* 64k, 1 sector */
+#define CONFIG_ENV_SIZE                0x20000 /* 128k, 1 sector */
 #define CONFIG_ENV_OVERWRITE           /* Serial change Ok     */
 #define CONFIG_ENV_ADDR                ((CONFIG_SYS_RESET_ADDR + \
                                          CONFIG_SYS_MONITOR_LEN) | \
@@ -114,10 +110,9 @@
 
 /*
  * MEMORY ORGANIZATION
- *     -Monitor at top of sdram.
- *     -The heap is placed below the monitor
- *     -Global data is placed below the heap.
- *     -The stack is placed below global data (&grows down).
+ * -Monitor at top of sdram.
+ * -The heap is placed below the monitor
+ * -The stack is placed below the heap (&grows down).
  */
 #define CONFIG_MONITOR_IS_IN_RAM
 #define CONFIG_SYS_MONITOR_LEN         0x40000 /* Reserve 256k */
@@ -127,15 +122,12 @@
 #define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + 0x20000)
 #define CONFIG_SYS_MALLOC_BASE         (CONFIG_SYS_MONITOR_BASE - \
                                         CONFIG_SYS_MALLOC_LEN)
-#define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_MALLOC_BASE - \
-                                        GENERATED_GBL_DATA_SIZE)
-#define CONFIG_SYS_INIT_SP             CONFIG_SYS_GBL_DATA_OFFSET
+#define CONFIG_SYS_INIT_SP             CONFIG_SYS_MALLOC_BASE
 
 /*
  * MISC
  */
 #define CONFIG_SYS_LONGHELP            /* Provide extended help */
-#define CONFIG_SYS_PROMPT              "==> "  /* Command prompt       */
 #define CONFIG_SYS_CBSIZE              256     /* Console I/O buf size */
 #define CONFIG_SYS_MAXARGS             16      /* Max command args     */
 #define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE /* Bootarg buf size */
@@ -148,6 +140,5 @@
 #define CONFIG_CMDLINE_EDITING
 
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
 
 #endif /* __CONFIG_H */