Merge branch 'master' of git://www.denx.de/git/u-boot-imx

[platform/kernel/u-boot.git] / include / configs / pic32mzdask.h

diff --git a/include/configs/pic32mzdask.h b/include/configs/pic32mzdask.h
index 5ba2a19..ffd1b28 100644 (file)
--- a/include/configs/pic32mzdask.h
+++ b/include/configs/pic32mzdask.h
@@ -10,8 +10,6 @@
 #define __PIC32MZDASK_CONFIG_H
 
 /* System Configuration */
-#define CONFIG_SYS_TEXT_BASE           0x9d004000 /* .text */
-#define CONFIG_DISPLAY_BOARDINFO
 
 /*--------------------------------------------
  * CPU configuration
@@ -46,6 +44,7 @@
 
 #define CONFIG_SYS_LOAD_ADDR           0x88500000 /* default load address */
 #define CONFIG_SYS_ENV_ADDR            0x88300000
+#define CONFIG_SYS_FDT_ADDR            0x89d00000
 
 /* Memory Test */
 #define CONFIG_SYS_MEMTEST_START       0x88000000
@@ -72,10 +71,38 @@
                (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_CMDLINE_EDITING         1
 
+/*-----------------------------------------------------------------------
+ * Networking Configuration
+ */
+#define CONFIG_MII
+#define CONFIG_PHY_SMSC
+#define CONFIG_SYS_RX_ETH_BUFFER       8
+#define CONFIG_NET_RETRY_COUNT         20
+#define CONFIG_ARP_TIMEOUT             500 /* millisec */
+
 /*
- * Handover flattened device tree (dtb file) to Linux kernel
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+/*--------------------------------------------------
+ * USB Configuration
  */
-#define CONFIG_OF_LIBFDT       1
+#define CONFIG_USB_MUSB_PIO_ONLY
+
+/*-----------------------------------------------------------------------
+ * File System Configuration
+ */
+/* FAT FS */
+#define CONFIG_SUPPORT_VFAT
+#define CONFIG_FS_FAT
+#define CONFIG_FAT_WRITE
+
+/* EXT4 FS */
+#define CONFIG_FS_EXT4
 
 /* -------------------------------------------------
  * Environment
@@ -87,7 +114,35 @@
  * Board boot configuration
  */
 #define CONFIG_TIMESTAMP       /* Print image info with timestamp */
-#define CONFIG_BOOTDELAY       5 /* autoboot after X seconds     */
-#undef CONFIG_BOOTARGS
+
+#define MEM_LAYOUT_ENV_SETTINGS                                        \
+       "kernel_addr_r="__stringify(CONFIG_SYS_LOAD_ADDR)"\0"   \
+       "fdt_addr_r="__stringify(CONFIG_SYS_FDT_ADDR)"\0"       \
+       "scriptaddr="__stringify(CONFIG_SYS_ENV_ADDR)"\0"
+
+#define CONFIG_LEGACY_BOOTCMD_ENV                                      \
+       "legacy_bootcmd= "                                              \
+               "if load mmc 0 ${scriptaddr} uEnv.txt; then "           \
+                       "env import -tr ${scriptaddr} ${filesize}; "    \
+                       "if test -n \"${bootcmd_uenv}\" ; then "        \
+                               "echo Running bootcmd_uenv ...; "       \
+                               "run bootcmd_uenv; "                    \
+                       "fi; "                                          \
+               "fi; \0"
+
+#define BOOT_TARGET_DEVICES(func)      \
+       func(MMC, mmc, 0)               \
+       func(USB, usb, 0)               \
+       func(DHCP, dhcp, na)
+
+#include <config_distro_bootcmd.h>
+
+#define CONFIG_EXTRA_ENV_SETTINGS      \
+       MEM_LAYOUT_ENV_SETTINGS         \
+       CONFIG_LEGACY_BOOTCMD_ENV       \
+       BOOTENV
+
+#undef CONFIG_BOOTCOMMAND
+#define CONFIG_BOOTCOMMAND     "run distro_bootcmd || run legacy_bootcmd"
 
 #endif /* __PIC32MZDASK_CONFIG_H */