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 1f93ae9..0a07c9c 100644 (file)
--- a/include/configs/pic32mzdask.h
+++ b/include/configs/pic32mzdask.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (c) 2015 Purna Chandra Mandal <purna.mandal@microchip.com>
  *
- * SPDX-License-Identifier:    GPL-2.0+
- *
  * Microchip PIC32MZ[DA] Starter Kit.
  */
 
@@ -17,90 +16,45 @@
 /* CPU Timer rate */
 #define CONFIG_SYS_MIPS_TIMER_FREQ     100000000
 
-/* Cache Configuration */
-#define CONFIG_SYS_MIPS_CACHE_MODE     CONF_CM_CACHABLE_NONCOHERENT
-
 /*----------------------------------------------------------------------
  * Memory Layout
  */
-#define CONFIG_SYS_SRAM_BASE           0x80000000
-#define CONFIG_SYS_SRAM_SIZE           0x00080000 /* 512K */
-
 /* Initial RAM for temporary stack, global data */
 #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_MALLOC_LEN          (256 << 10)
-#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_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
-#define CONFIG_SYS_MEMTEST_END         0x88080000
 
 /*----------------------------------------------------------------------
  * Commands
  */
-#define CONFIG_SYS_LONGHELP            /* undef to save memory */
 
 /*------------------------------------------------------------
  * Console Configuration
  */
-#define CONFIG_SYS_CBSIZE              1024 /* Console I/O Buffer Size   */
-#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 */
-
-/*
- * BOOTP options
- */
-#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
 
 /*--------------------------------------------------
  * USB Configuration
  */
 
-/*-----------------------------------------------------------------------
- * File System Configuration
- */
-/* FAT FS */
-#define CONFIG_SUPPORT_VFAT
-
 /* -------------------------------------------------
  * Environment
  */
-#define CONFIG_ENV_SIZE                0x4000
 
 /* ---------------------------------------------------------------------
  * 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= "                                              \
@@ -124,7 +78,4 @@
        CONFIG_LEGACY_BOOTCMD_ENV       \
        BOOTENV
 
-#undef CONFIG_BOOTCOMMAND
-#define CONFIG_BOOTCOMMAND     "run distro_bootcmd || run legacy_bootcmd"
-
 #endif /* __PIC32MZDASK_CONFIG_H */