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 'u-boot-samsung/master' into 'u-boot-arm/master'
[platform/kernel/u-boot.git]
/
include
/
configs
/
whistler.h
diff --git
a/include/configs/whistler.h
b/include/configs/whistler.h
index
3235718
..
9542c7e
100644
(file)
--- a/
include/configs/whistler.h
+++ b/
include/configs/whistler.h
@@
-34,12
+34,11
@@
/* High-level configuration options */
#define V_PROMPT "Tegra20 (Whistler) # "
/* High-level configuration options */
#define V_PROMPT "Tegra20 (Whistler) # "
-#define CONFIG_TEGRA
20_BOARD_STRING
"NVIDIA Whistler"
+#define CONFIG_TEGRA
_BOARD_STRING
"NVIDIA Whistler"
/* Board-specific serial config */
/* Board-specific serial config */
-#define CONFIG_SERIAL_MULTI
-#define CONFIG_TEGRA20_ENABLE_UARTA
-#define CONFIG_TEGRA20_UARTA_UAA_UAB
+#define CONFIG_TEGRA_ENABLE_UARTA
+#define CONFIG_TEGRA_UARTA_UAA_UAB
#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
#define CONFIG_MACH_TYPE MACH_TYPE_WHISTLER
#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
#define CONFIG_MACH_TYPE MACH_TYPE_WHISTLER
@@
-60,11
+59,6
@@
#define CONFIG_TEGRA_MMC
#define CONFIG_CMD_MMC
#define CONFIG_TEGRA_MMC
#define CONFIG_CMD_MMC
-#define CONFIG_DOS_PARTITION
-#define CONFIG_EFI_PARTITION
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_FAT
-
/*
* Environment in eMMC, at the end of 2nd "boot sector". Note: This assumes
* the user plugged the standard 8MB MoviNAND card into J29/HSMMC/POP. If
/*
* Environment in eMMC, at the end of 2nd "boot sector". Note: This assumes
* the user plugged the standard 8MB MoviNAND card into J29/HSMMC/POP. If
@@
-90,6
+84,6
@@
#define CONFIG_CMD_NET
#define CONFIG_CMD_DHCP
#define CONFIG_CMD_NET
#define CONFIG_CMD_DHCP
-#include "tegra
20
-common-post.h"
+#include "tegra-common-post.h"
#endif /* __CONFIG_H */
#endif /* __CONFIG_H */