Merge branch 'next'

[karo-tx-uboot.git] / include / configs / plutux.h

diff --git a/include/configs/plutux.h b/include/configs/plutux.h
index 9870590bd663f5e8043ac1580fdea9bac0f5b2ef..25ee83a6cf3f16cdb23843bc09e981a2bfe194d9 100644 (file)
--- a/include/configs/plutux.h
+++ b/include/configs/plutux.h
@@ -26,25 +26,23 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#include "tegra2-common.h"
+#include "tegra20-common.h"
 
 /* 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     tegra20-plutux
 #define CONFIG_OF_CONTROL
 #define CONFIG_OF_SEPARATE
 
 /* High-level configuration options */
-#define V_PROMPT                       "Tegra2 (Plutux) # "
-#define CONFIG_TEGRA2_BOARD_STRING     "Avionic Design Plutux"
+#define V_PROMPT                       "Tegra20 (Plutux) # "
+#define CONFIG_TEGRA_BOARD_STRING      "Avionic Design Plutux"
 
 /* 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_ENV_IS_NOWHERE
+#define CONFIG_BOARD_LATE_INIT
 
 /* SD/MMC */
 #define CONFIG_MMC
@@ -52,6 +50,15 @@
 #define CONFIG_TEGRA_MMC
 #define CONFIG_CMD_MMC
 
+/* NAND support */
+#define CONFIG_CMD_NAND
+#define CONFIG_TEGRA_NAND
+#define CONFIG_SYS_MAX_NAND_DEVICE     1
+
+/* Environment in NAND, aligned to start of last sector */
+#define CONFIG_ENV_IS_IN_NAND
+#define CONFIG_ENV_OFFSET              (SZ_512M - SZ_128K) /* 128K sectors */
+
 /* USB host support */
 #define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_TEGRA
@@ -66,18 +73,9 @@
 #define CONFIG_CMD_NET
 #define CONFIG_CMD_DHCP
 
-#define CONFIG_DOS_PARTITION
-#define CONFIG_EFI_PARTITION
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_FAT
-
+/* support the new (FDT-based) image format */
 #define CONFIG_FIT
 
-#define CONFIG_BOOTCOMMAND                             \
-       "mmc rescan;"                                   \
-       "ext2load mmc 0 0x17000000 /boot/uImage;"       \
-       "bootm"
-
-#include "tegra2-common-post.h"
+#include "tegra-common-post.h"
 
 #endif /* __CONFIG_H */