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://www.denx.de/git/u-boot-imx
[platform/kernel/u-boot.git]
/
include
/
configs
/
tqma6_mba6.h
diff --git
a/include/configs/tqma6_mba6.h
b/include/configs/tqma6_mba6.h
index
88c0067
..
265aa4a
100644
(file)
--- a/
include/configs/tqma6_mba6.h
+++ b/
include/configs/tqma6_mba6.h
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2013
, 2014
Markus Niebel <Markus.Niebel@tq-group.com>
+ * Copyright (C) 2013
- 2015
Markus Niebel <Markus.Niebel@tq-group.com>
*
* Configuration settings for the TQ Systems TQMa6<Q,S> module.
*
*
* Configuration settings for the TQ Systems TQMa6<Q,S> module.
*
@@
-9,12
+9,6
@@
#ifndef __CONFIG_TQMA6_MBA6_H
#define __CONFIG_TQMA6_MBA6_H
#ifndef __CONFIG_TQMA6_MBA6_H
#define __CONFIG_TQMA6_MBA6_H
-#if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S)
-#define CONFIG_DEFAULT_FDT_FILE "imx6dl-mba6x.dtb"
-#elif defined(CONFIG_MX6Q) || defined(CONFIG_MX6Q)
-#define CONFIG_DEFAULT_FDT_FILE "imx6q-mba6x.dtb"
-#endif
-
#define CONFIG_DTT_SENSORS { 0, 1 }
#define CONFIG_FEC_XCV_TYPE RGMII
#define CONFIG_DTT_SENSORS { 0, 1 }
#define CONFIG_FEC_XCV_TYPE RGMII
@@
-25,6
+19,6
@@
#define CONFIG_PHY_KSZ9031
#define CONFIG_MXC_UART_BASE UART2_BASE
#define CONFIG_PHY_KSZ9031
#define CONFIG_MXC_UART_BASE UART2_BASE
-#define CON
FIG_CONSOLE_DEV
"ttymxc1"
+#define CON
SOLE_DEV
"ttymxc1"
#endif /* __CONFIG_TQMA6_MBA6_H */
#endif /* __CONFIG_TQMA6_MBA6_H */