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-fdt
[platform/kernel/u-boot.git]
/
include
/
configs
/
plutux.h
diff --git
a/include/configs/plutux.h
b/include/configs/plutux.h
index
9870590
..
deee237
100644
(file)
--- a/
include/configs/plutux.h
+++ b/
include/configs/plutux.h
@@
-26,20
+26,19
@@
#ifndef __CONFIG_H
#define __CONFIG_H
#ifndef __CONFIG_H
#define __CONFIG_H
-#include "tegra2-common.h"
+#include "tegra2
0
-common.h"
/* Enable fdt support for Plutux. Flash the image in u-boot-dtb.bin */
/* Enable fdt support for Plutux. Flash the image in u-boot-dtb.bin */
-#define CONFIG_DEFAULT_DEVICE_TREE tegra2-plutux
+#define CONFIG_DEFAULT_DEVICE_TREE tegra2
0
-plutux
#define CONFIG_OF_CONTROL
#define CONFIG_OF_SEPARATE
/* High-level configuration options */
#define CONFIG_OF_CONTROL
#define CONFIG_OF_SEPARATE
/* High-level configuration options */
-#define V_PROMPT "Tegra2 (Plutux) # "
-#define CONFIG_TEGRA
2_BOARD_STRING
"Avionic Design Plutux"
+#define V_PROMPT "Tegra2
0
(Plutux) # "
+#define CONFIG_TEGRA
_BOARD_STRING
"Avionic Design Plutux"
/* Board-specific serial config */
/* Board-specific serial config */
-#define CONFIG_SERIAL_MULTI
-#define CONFIG_TEGRA2_ENABLE_UARTD /* UARTD: debug UART */
+#define CONFIG_TEGRA_ENABLE_UARTD /* UARTD: debug UART */
#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE
#define CONFIG_BOARD_EARLY_INIT_F
@@
-78,6
+77,6
@@
"ext2load mmc 0 0x17000000 /boot/uImage;" \
"bootm"
"ext2load mmc 0 0x17000000 /boot/uImage;" \
"bootm"
-#include "tegra
2
-common-post.h"
+#include "tegra-common-post.h"
#endif /* __CONFIG_H */
#endif /* __CONFIG_H */