diff options
| author | Tom Rini <trini@ti.com> | 2014-10-27 09:05:43 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-10-27 09:05:43 -0400 |
| commit | 5aa7bece1045c28806ce919099616ebe8fa63325 (patch) | |
| tree | c19240d9c85e3f4f839596e5197c619d872021be /board/logicpd | |
| parent | 674ca84d11391cd2e7faf8f638fc25ed4b782a91 (diff) | |
| parent | b5ff205cdb0da6eff8a02653bf5192ea8d661faa (diff) | |
| download | blackbird-obmc-uboot-5aa7bece1045c28806ce919099616ebe8fa63325.tar.gz blackbird-obmc-uboot-5aa7bece1045c28806ce919099616ebe8fa63325.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-ti
Diffstat (limited to 'board/logicpd')
| -rw-r--r-- | board/logicpd/am3517evm/am3517evm.h | 2 | ||||
| -rw-r--r-- | board/logicpd/omap3som/omap3logic.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/board/logicpd/am3517evm/am3517evm.h b/board/logicpd/am3517evm/am3517evm.h index d407d66ae6..a6a55eef49 100644 --- a/board/logicpd/am3517evm/am3517evm.h +++ b/board/logicpd/am3517evm/am3517evm.h @@ -333,7 +333,7 @@ const omap3_sysinfo sysinfo = { MUX_VAL(CP(SYS_CLKOUT1), (IEN | PTD | DIS | M0)) \ MUX_VAL(CP(SYS_CLKOUT2), (IEN | PTU | EN | M0)) \ /* JTAG */\ - MUX_VAL(CP(JTAG_nTRST), (IEN | PTD | DIS | M0)) \ + MUX_VAL(CP(JTAG_NTRST), (IEN | PTD | DIS | M0)) \ MUX_VAL(CP(JTAG_TCK), (IEN | PTD | DIS | M0)) \ MUX_VAL(CP(JTAG_TMS), (IEN | PTD | DIS | M0)) \ MUX_VAL(CP(JTAG_TDI), (IEN | PTD | DIS | M0)) \ diff --git a/board/logicpd/omap3som/omap3logic.c b/board/logicpd/omap3som/omap3logic.c index 075fe949ae..1fd9f2cf01 100644 --- a/board/logicpd/omap3som/omap3logic.c +++ b/board/logicpd/omap3som/omap3logic.c @@ -230,6 +230,6 @@ void set_muxconf_regs(void) MUX_VAL(CP(SYS_OFF_MODE), (IEN | PTD | DIS | M0)); MUX_VAL(CP(SYS_CLKOUT1), (IEN | PTD | DIS | M0)); MUX_VAL(CP(SYS_CLKOUT2), (IEN | PTU | EN | M0)); - MUX_VAL(CP(JTAG_nTRST), (IEN | PTD | DIS | M0)); + MUX_VAL(CP(JTAG_NTRST), (IEN | PTD | DIS | M0)); MUX_VAL(CP(SDRC_CKE0), (IDIS | PTU | EN | M0)); } |
