Merge tag 'xilinx-for-v2020.10' of https://gitlab.denx.de/u-boot/custodians/u-boot...

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

diff --git a/include/configs/apf27.h b/include/configs/apf27.h
index 044ce44..cecd485 100644 (file)
--- a/include/configs/apf27.h
+++ b/include/configs/apf27.h
@@ -9,6 +9,8 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
+#include <linux/stringify.h>
+
 #define CONFIG_ENV_VERSION     10
 #define CONFIG_BOARD_NAME apf27
 
@@ -54,8 +56,6 @@
 #define PHYS_SDRAM_2                   0xB0000000
 #define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
 #define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + (512<<10))
-#define CONFIG_SYS_MEMTEST_START       0xA0000000      /* memtest test area  */
-#define CONFIG_SYS_MEMTEST_END         0xA0300000      /* 3 MiB RAM test */
 
 #define CONFIG_SYS_INIT_SP_ADDR        (CONFIG_SYS_SDRAM_BASE  \
                + PHYS_SDRAM_1_SIZE - 0x0100000)
@@ -66,12 +66,7 @@
 #define        ACFG_MONITOR_OFFSET             0x00000000
 #define        CONFIG_SYS_MONITOR_LEN          0x00100000      /* 1MiB */
 #define        CONFIG_ENV_OVERWRITE
-#define        CONFIG_ENV_OFFSET               0x00100000      /* NAND offset */
-#define        CONFIG_ENV_SIZE                 0x00020000      /* 128kB  */
 #define CONFIG_ENV_RANGE               0X00080000      /* 512kB */
-#define        CONFIG_ENV_OFFSET_REDUND        \
-               (CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE)  /* +512kB */
-#define        CONFIG_ENV_SIZE_REDUND          CONFIG_ENV_SIZE /* 512kB */
 #define        CONFIG_FIRMWARE_OFFSET          0x00200000
 #define        CONFIG_FIRMWARE_SIZE            0x00080000      /* 512kB  */
 #define        CONFIG_KERNEL_OFFSET            0x00300000