Skip to content
Snippets Groups Projects
Commit b6c18092 authored by Thomas Chou's avatar Thomas Chou
Browse files

nios2: move altera_pio_init to board_early_init_r


As altera_pio_init() uses BSS, it should be moved to
board_early_init_r().

Signed-off-by: default avatarThomas Chou <thomas@wytron.com.tw>
Acked-by: default avatarMarek Vasut <marex@denx.de>
parent a03377b6
No related merge requests found
...@@ -28,16 +28,21 @@ void early_flash_cmd_reset(void) ...@@ -28,16 +28,21 @@ void early_flash_cmd_reset(void)
int board_early_init_f(void) int board_early_init_f(void)
{ {
#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR) && \
defined(CONFIG_CFI_FLASH_MTD)
early_flash_cmd_reset();
#endif
return 0;
}
int board_early_init_r(void)
{
#ifdef CONFIG_ALTERA_PIO #ifdef CONFIG_ALTERA_PIO
#ifdef LED_PIO_BASE #ifdef LED_PIO_BASE
altera_pio_init(LED_PIO_BASE, LED_PIO_WIDTH, 'o', altera_pio_init(LED_PIO_BASE, LED_PIO_WIDTH, 'o',
LED_PIO_RSTVAL, (1 << LED_PIO_WIDTH) - 1, LED_PIO_RSTVAL, (1 << LED_PIO_WIDTH) - 1,
"led"); "led");
#endif #endif
#endif
#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR) && \
defined(CONFIG_CFI_FLASH_MTD)
early_flash_cmd_reset();
#endif #endif
return 0; return 0;
} }
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include "../board/altera/nios2-generic/custom_fpga.h" /* fpga parameters */ #include "../board/altera/nios2-generic/custom_fpga.h" /* fpga parameters */
#define CONFIG_BOARD_NAME "nios2-generic" /* custom board name */ #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_F /* enable early board-spec. init */
#define CONFIG_BOARD_EARLY_INIT_R
#define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_CPUINFO
#define CONFIG_DISPLAY_BOARDINFO #define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_SYS_NIOS_SYSID_BASE CONFIG_SYS_SYSID_BASE #define CONFIG_SYS_NIOS_SYSID_BASE CONFIG_SYS_SYSID_BASE
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment