diff options
| author | Tom Rini <trini@ti.com> | 2014-08-31 07:45:55 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-08-31 07:45:55 -0400 |
| commit | 0a64bc20f7f160904d3795536ec70446ad743826 (patch) | |
| tree | b8187d17273524de0d6d9b8f3ae7958aab2b2ae1 /include/configs | |
| parent | 16e16fdde21c9255e338d2eaea339c3ca905da22 (diff) | |
| parent | 857b9cb69ffc2b5a607e55a09325290274c7272e (diff) | |
| download | blackbird-obmc-uboot-0a64bc20f7f160904d3795536ec70446ad743826.tar.gz blackbird-obmc-uboot-0a64bc20f7f160904d3795536ec70446ad743826.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-nios
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/nios2-generic.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/include/configs/nios2-generic.h b/include/configs/nios2-generic.h index 51b1d00d99..6247bf1569 100644 --- a/include/configs/nios2-generic.h +++ b/include/configs/nios2-generic.h @@ -22,7 +22,7 @@ /* * 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 @@ -56,6 +56,9 @@ #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 */ @@ -86,6 +89,10 @@ # 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 @@ -95,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) | \ |
