diff options
| author | Tom Rini <trini@konsulko.com> | 2015-04-28 20:48:43 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-04-28 20:48:43 -0400 |
| commit | 536266231a340c0c5e571e1012bf3f8fc835b251 (patch) | |
| tree | 0b0284f73aa8f9f5608fdbc74a238efc4f8d1d23 /board | |
| parent | 4842c58990ac065c2d33b71e1a7fde48f336dac2 (diff) | |
| parent | e5c57eea4f4ac8c27343bde137b069ef816e69d7 (diff) | |
| download | blackbird-obmc-uboot-536266231a340c0c5e571e1012bf3f8fc835b251.tar.gz blackbird-obmc-uboot-536266231a340c0c5e571e1012bf3f8fc835b251.zip | |
Merge branch 'master' of git://www.denx.de/git/u-boot-socfpga
Diffstat (limited to 'board')
| -rw-r--r-- | board/altera/socfpga/pinmux_config.c | 4 | ||||
| -rw-r--r-- | board/altera/socfpga/pll_config.h | 2 | ||||
| -rw-r--r-- | board/altera/socfpga/socfpga.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/board/altera/socfpga/pinmux_config.c b/board/altera/socfpga/pinmux_config.c index 61cdc73fa3..7e7a18484f 100644 --- a/board/altera/socfpga/pinmux_config.c +++ b/board/altera/socfpga/pinmux_config.c @@ -54,8 +54,8 @@ unsigned long sys_mgr_init_table[CONFIG_HPS_PINMUX_NUM] = { 2, /* GENERALIO14 */ 0, /* GENERALIO15 */ 0, /* GENERALIO16 */ - 0, /* GENERALIO17 */ - 0, /* GENERALIO18 */ + 2, /* GENERALIO17 */ + 2, /* GENERALIO18 */ 0, /* GENERALIO19 */ 0, /* GENERALIO20 */ 0, /* GENERALIO21 */ diff --git a/board/altera/socfpga/pll_config.h b/board/altera/socfpga/pll_config.h index 8130fa4744..7cd25df614 100644 --- a/board/altera/socfpga/pll_config.h +++ b/board/altera/socfpga/pll_config.h @@ -36,7 +36,7 @@ /* Peripheral PLL */ #define CONFIG_HPS_PERPLLGRP_VCO_DENOM (1) -#define CONFIG_HPS_PERPLLGRP_VCO_NUMER (39) +#define CONFIG_HPS_PERPLLGRP_VCO_NUMER (79) /* * To tell where is the VCOs source: * 0 = EOSC1 diff --git a/board/altera/socfpga/socfpga.c b/board/altera/socfpga/socfpga.c index 20d221641b..a1dbc492c9 100644 --- a/board/altera/socfpga/socfpga.c +++ b/board/altera/socfpga/socfpga.c @@ -18,6 +18,8 @@ DECLARE_GLOBAL_DATA_PTR; +void s_init(void) {} + /* * Miscellaneous platform dependent initialisations */ |
