nios2: Split timer code into timer.c

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

diff --git a/include/configs/nios2-generic.h b/include/configs/nios2-generic.h
index 3e18357ee76f678806beae3702ee8f2cfa30919a..3d29a1f7af8b8e33a08de3cae572373e40afbf47 100644 (file)
--- a/include/configs/nios2-generic.h
+++ b/include/configs/nios2-generic.h
@@ -15,12 +15,15 @@
 #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_BOARD_EARLY_INIT_R
+#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
@@ -36,13 +39,7 @@
 /*
  * TIMER
  */
-#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)
+#define CONFIG_SYS_TIMER_RATE          CONFIG_SYS_TIMER_FREQ
 
 /*
  * STATUS LED
@@ -55,10 +52,13 @@
 #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 */
-#define STATUS_LED_PERIOD      (500 / CONFIG_SYS_NIOS_TMRMS) /* 500 msec */
+#define STATUS_LED_PERIOD      (CONFIG_SYS_HZ / 2)     /* 500 msec */
 
 /*
  * BOOTP options
@@ -69,21 +69,11 @@
 #define CONFIG_BOOTP_HOSTNAME
 
 /*
- * Command line configuration.
+ * FDT options
  */
-#include <config_cmd_default.h>
-#undef CONFIG_CMD_BOOTD
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_IMLS
-#undef CONFIG_CMD_ITEST
-#undef CONFIG_CMD_NFS
-#undef CONFIG_CMD_SETGETDCR
-#undef CONFIG_CMD_XIMG
-
-#ifdef CONFIG_CMD_NET
-# 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
@@ -94,7 +84,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) | \
@@ -131,6 +121,4 @@
 #define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_INIT_SP - 0x20000)
 #define CONFIG_CMDLINE_EDITING
 
-#define CONFIG_SYS_HUSH_PARSER
-
 #endif /* __CONFIG_H */