diff options
| author | Siva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com> | 2014-10-28 16:59:32 +0530 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2015-01-26 08:55:58 +0100 |
| commit | f20b37f353a9cb9012076da8dedc13c5903caf42 (patch) | |
| tree | 60df5a7dfa1f72ae2177754fc9756191f21cb856 | |
| parent | dd1c351ffe33dcbfa977f9b8760b8a1fd443fa11 (diff) | |
| download | blackbird-obmc-uboot-f20b37f353a9cb9012076da8dedc13c5903caf42.tar.gz blackbird-obmc-uboot-f20b37f353a9cb9012076da8dedc13c5903caf42.zip | |
ARM: zynq: provide config option to select emio
Dont send always emio value as zero for zynq_gem_initialize
send it based on config.
Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
| -rw-r--r-- | board/xilinx/zynq/board.c | 6 | ||||
| -rw-r--r-- | include/configs/zynq-common.h | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c index e131056545..47f85c7fb4 100644 --- a/board/xilinx/zynq/board.c +++ b/board/xilinx/zynq/board.c @@ -119,11 +119,13 @@ int board_eth_init(bd_t *bis) #if defined(CONFIG_ZYNQ_GEM) # if defined(CONFIG_ZYNQ_GEM0) ret |= zynq_gem_initialize(bis, ZYNQ_GEM_BASEADDR0, - CONFIG_ZYNQ_GEM_PHY_ADDR0, 0); + CONFIG_ZYNQ_GEM_PHY_ADDR0, + CONFIG_ZYNQ_GEM_EMIO0); # endif # if defined(CONFIG_ZYNQ_GEM1) ret |= zynq_gem_initialize(bis, ZYNQ_GEM_BASEADDR1, - CONFIG_ZYNQ_GEM_PHY_ADDR1, 0); + CONFIG_ZYNQ_GEM_PHY_ADDR1, + CONFIG_ZYNQ_GEM_EMIO1); # endif #endif return ret; diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index cbafba1cc3..0359e3de91 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -52,6 +52,12 @@ # define CONFIG_BOOTP_GATEWAY # define CONFIG_BOOTP_HOSTNAME # define CONFIG_BOOTP_MAY_FAIL +# if !defined(CONFIG_ZYNQ_GEM_EMIO0) +# define CONFIG_ZYNQ_GEM_EMIO0 0 +# endif +# if !defined(CONFIG_ZYNQ_GEM_EMIO1) +# define CONFIG_ZYNQ_GEM_EMIO1 0 +# endif #endif /* SPI */ |
