projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-imx
[platform/kernel/u-boot.git]
/
include
/
configs
/
usbarmory.h
diff --git
a/include/configs/usbarmory.h
b/include/configs/usbarmory.h
index
01a2bd4
..
f725b79
100644
(file)
--- a/
include/configs/usbarmory.h
+++ b/
include/configs/usbarmory.h
@@
-11,10
+11,8
@@
#ifndef __CONFIG_H
#define __CONFIG_H
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_MX53
#define CONFIG_SYS_FSL_CLK
#define CONFIG_MXC_GPIO
#define CONFIG_SYS_FSL_CLK
#define CONFIG_MXC_GPIO
-#define CONFIG_SYS_NO_FLASH
#include <asm/arch/imx-regs.h>
#include <asm/arch/imx-regs.h>
@@
-36,7
+34,6
@@
#define CONFIG_MXC_UART
#define CONFIG_MXC_UART_BASE UART1_BASE
#define CONFIG_CONS_INDEX 1
#define CONFIG_MXC_UART
#define CONFIG_MXC_UART_BASE UART1_BASE
#define CONFIG_CONS_INDEX 1
-#define CONFIG_BAUDRATE 115200
/* SD/MMC */
#define CONFIG_FSL_ESDHC
/* SD/MMC */
#define CONFIG_FSL_ESDHC
@@
-44,7
+41,6
@@
#define CONFIG_SYS_FSL_ESDHC_NUM 1
/* USB */
#define CONFIG_SYS_FSL_ESDHC_NUM 1
/* USB */
-#define CONFIG_USB_EHCI
#define CONFIG_USB_EHCI_MX5
#define CONFIG_MXC_USB_PORT 1
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CONFIG_USB_EHCI_MX5
#define CONFIG_MXC_USB_PORT 1
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)