Merge tag 'tpm-030822' of https://source.denx.de/u-boot/custodians/u-boot-tpm

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

diff --git a/include/configs/pic32mzdask.h b/include/configs/pic32mzdask.h
index cc2e6a7..0a07c9c 100644 (file)
--- a/include/configs/pic32mzdask.h
+++ b/include/configs/pic32mzdask.h
@@ -23,19 +23,12 @@
 #define CONFIG_SYS_INIT_RAM_SIZE       0x10000
 #define CONFIG_SYS_INIT_RAM_ADDR       \
        (CONFIG_SYS_SRAM_BASE + CONFIG_SYS_SRAM_SIZE - CONFIG_SYS_INIT_RAM_SIZE)
-#define CONFIG_SYS_INIT_SP_ADDR                \
-       (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_RAM_SIZE - 1)
 
 /* SDRAM Configuration (for final code, data, stack, heap) */
 #define CONFIG_SYS_SDRAM_BASE          0x88000000
-#define CONFIG_SYS_BOOTPARAMS_LEN      (4 << 10)
 
-#define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_MONITOR_LEN         (192 << 10)
 
-#define CONFIG_SYS_ENV_ADDR            0x88300000
-#define CONFIG_SYS_FDT_ADDR            0x89d00000
-
 /* Memory Test */
 
 /*----------------------------------------------------------------------
@@ -45,19 +38,6 @@
 /*------------------------------------------------------------
  * Console Configuration
  */
-#define CONFIG_SYS_CBSIZE              1024 /* Console I/O Buffer Size   */
-
-/*-----------------------------------------------------------------------
- * Networking Configuration
- */
-#define CONFIG_SYS_RX_ETH_BUFFER       8
-#define CONFIG_NET_RETRY_COUNT         20
-#define CONFIG_ARP_TIMEOUT             500 /* millisec */
-
-/*
- * BOOTP options
- */
-#define CONFIG_BOOTP_BOOTFILESIZE
 
 /*--------------------------------------------------
  * USB Configuration
@@ -70,12 +50,11 @@
 /* ---------------------------------------------------------------------
  * Board boot configuration
  */
-#define CONFIG_TIMESTAMP       /* Print image info with timestamp */
 
 #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"
+       "fdt_addr_r=0x89d00000\0"                               \
+       "scriptaddr=0x88300000\0"                               \
 
 #define CONFIG_LEGACY_BOOTCMD_ENV                                      \
        "legacy_bootcmd= "                                              \