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 'agust@denx.de' of git://git.denx.de/u-boot-staging
[platform/kernel/u-boot.git]
/
include
/
configs
/
trimslice.h
diff --git
a/include/configs/trimslice.h
b/include/configs/trimslice.h
index
34be8a9
..
eeb0dbe
100644
(file)
--- a/
include/configs/trimslice.h
+++ b/
include/configs/trimslice.h
@@
-25,21
+25,20
@@
#define __CONFIG_H
#include <asm/sizes.h>
#define __CONFIG_H
#include <asm/sizes.h>
-#include "tegra2-common.h"
+#include "tegra2
0
-common.h"
/* Enable fdt support for TrimSlice. Flash the image in u-boot-dtb.bin */
/* Enable fdt support for TrimSlice. Flash the image in u-boot-dtb.bin */
-#define CONFIG_DEFAULT_DEVICE_TREE tegra2-trimslice
+#define CONFIG_DEFAULT_DEVICE_TREE tegra2
0
-trimslice
#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 (TrimSlice) # "
-#define CONFIG_TEGRA
2_BOARD_STRING
"Compulab Trimslice"
+#define V_PROMPT "Tegra2
0
(TrimSlice) # "
+#define CONFIG_TEGRA
_BOARD_STRING
"Compulab Trimslice"
/* Board-specific serial config */
/* Board-specific serial config */
-#define CONFIG_SERIAL_MULTI
-#define CONFIG_TEGRA2_ENABLE_UARTA
-#define CONFIG_TEGRA2_UARTA_GPU
+#define CONFIG_TEGRA_ENABLE_UARTA
+#define CONFIG_TEGRA_UARTA_GPU
#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
#define CONFIG_MACH_TYPE MACH_TYPE_TRIMSLICE
#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
#define CONFIG_MACH_TYPE MACH_TYPE_TRIMSLICE
@@
-94,6
+93,6
@@
#define CONFIG_CMD_NET
#define CONFIG_CMD_DHCP
#define CONFIG_CMD_NET
#define CONFIG_CMD_DHCP
-#include "tegra
2
-common-post.h"
+#include "tegra-common-post.h"
#endif /* __CONFIG_H */
#endif /* __CONFIG_H */