Merge tag 'mips-pull-2020-06-29' of https://gitlab.denx.de/u-boot/custodians/u-boot...

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

diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h
index 8029ae9..ea8d54a 100644 (file)
--- a/include/configs/hrcon.h
+++ b/include/configs/hrcon.h
@@ -8,6 +8,8 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
+#include <linux/stringify.h>
+
 /*
  * High Level Configuration Options
  */
@@ -90,8 +92,6 @@
 /*
  * Memory test
  */
-#define CONFIG_SYS_MEMTEST_START       0x00001000 /* memtest region */
-#define CONFIG_SYS_MEMTEST_END         0x07f00000
 
 /*
  * The reserved memory
@@ -129,14 +129,6 @@
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000 /* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500 /* Flash Write Timeout (ms) */
 
-/*
- * FPGA
- */
-#define CONFIG_SYS_FPGA0_BASE          0xE0600000
-#define CONFIG_SYS_FPGA0_SIZE          1 /* FPGA size is 1M */
-
-
-#define CONFIG_SYS_FPGA_BASE(k)                CONFIG_SYS_FPGA0_BASE
 #define CONFIG_SYS_FPGA_DONE(k)                0x0010
 
 #define CONFIG_SYS_FPGA_COUNT          1
@@ -301,7 +293,6 @@ void fpga_control_clear(unsigned int bus, int pin);
 /*
  * Software (bit-bang) MII driver configuration
  */
-#define CONFIG_BITBANGMII              /* bit-bang MII PHY management */
 #define CONFIG_BITBANGMII_MULTI
 
 /*
@@ -359,25 +350,11 @@ void fpga_control_clear(unsigned int bus, int pin);
 /*
  * Environment
  */
-#if 1
-#define CONFIG_ENV_ADDR                (CONFIG_SYS_MONITOR_BASE + \
-                                CONFIG_SYS_MONITOR_LEN)
-#define CONFIG_ENV_SECT_SIZE   0x10000 /* 64K(one sector) for env */
-#define CONFIG_ENV_SIZE                0x2000
-#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
-#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
-#else
-#define CONFIG_ENV_SIZE                0x2000          /* 8KB */
-#endif
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE   1       /* allow baudrate change */
 
 /*
- * Command line configuration.
- */
-
-/*
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_LOAD_ADDR           0x2000000 /* default load address */
@@ -411,8 +388,6 @@ void fpga_control_clear(unsigned int bus, int pin);
 #define CONFIG_ROOTPATH                "/opt/nfsroot"
 #define CONFIG_BOOTFILE                "uImage"
 
-#define CONFIG_PREBOOT         /* enable preboot variable */
-
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        "netdev=eth0\0"                                                 \
        "consoledev=ttyS1\0"                                            \