diff options
author | Tom Rini <trini@ti.com> | 2014-02-26 16:49:58 -0500 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2014-02-26 16:49:58 -0500 |
commit | eeb72e67619b98d2502fe634a3a5d9953de92ad0 (patch) | |
tree | edea4b04062ec956158c163b13c9a31fcfdccde8 /board/htkw/mcx/mcx.h | |
parent | 715b56fe2b47e073e6f2425e0cedba0e92a4014d (diff) | |
parent | 1551df35f296f0a8df32f4f2054254f46e8be252 (diff) | |
download | u-boot-imx-eeb72e67619b98d2502fe634a3a5d9953de92ad0.zip u-boot-imx-eeb72e67619b98d2502fe634a3a5d9953de92ad0.tar.gz u-boot-imx-eeb72e67619b98d2502fe634a3a5d9953de92ad0.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts:
arch/arm/cpu/armv7/config.mk
board/ti/am43xx/mux.c
include/configs/am43xx_evm.h
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'board/htkw/mcx/mcx.h')
-rw-r--r-- | board/htkw/mcx/mcx.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/board/htkw/mcx/mcx.h b/board/htkw/mcx/mcx.h index 703dbec..17c122c 100644 --- a/board/htkw/mcx/mcx.h +++ b/board/htkw/mcx/mcx.h @@ -325,8 +325,6 @@ const omap3_sysinfo sysinfo = { MUX_VAL(CP(SYS_32K), (IEN | PTD | EN | M4)) \ MUX_VAL(CP(SYS_CLKREQ), (IEN | PTD | DIS | M0)) \ MUX_VAL(CP(SYS_NIRQ), (IEN | PTD | EN | M4)) \ - MUX_VAL(CP(SYS_NRESWARM), (IEN | PTU | DIS | M4)) \ - /* SYS_nRESWARM */\ MUX_VAL(CP(SYS_BOOT0), (IEN | PTD | DIS | M4)) \ MUX_VAL(CP(SYS_BOOT1), (IEN | PTD | DIS | M4)) \ MUX_VAL(CP(SYS_BOOT2), (IEN | PTD | DIS | M4)) \ |