diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-06-08 14:35:10 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-06-08 14:35:10 +0200 |
| commit | 10e167329b029890a4c704f094822da5f259b886 (patch) | |
| tree | c0950b7cb928ee26b07c39348e4539602ce3aec9 /board/boundary | |
| parent | dbc000bfb51eb30d786521e6b8e29048c36cbefa (diff) | |
| parent | 4a1c7b13ae104d4526d3176793b7f6b06694df15 (diff) | |
| download | talos-obmc-uboot-10e167329b029890a4c704f094822da5f259b886.tar.gz talos-obmc-uboot-10e167329b029890a4c704f094822da5f259b886.zip | |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Conflicts:
drivers/serial/Makefile
Diffstat (limited to 'board/boundary')
| -rw-r--r-- | board/boundary/nitrogen6x/nitrogen6x.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/board/boundary/nitrogen6x/nitrogen6x.c b/board/boundary/nitrogen6x/nitrogen6x.c index e155556ce2..8f0f9b8de2 100644 --- a/board/boundary/nitrogen6x/nitrogen6x.c +++ b/board/boundary/nitrogen6x/nitrogen6x.c @@ -336,7 +336,6 @@ iomux_v3_cfg_t const ecspi1_pads[] = { void setup_spi(void) { - gpio_direction_output(CONFIG_SF_DEFAULT_CS, 1); imx_iomux_v3_setup_multiple_pads(ecspi1_pads, ARRAY_SIZE(ecspi1_pads)); } |
