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

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

diff --git a/include/configs/bk4r1.h b/include/configs/bk4r1.h
index 2575a0d..300b9c7 100644 (file)
--- a/include/configs/bk4r1.h
+++ b/include/configs/bk4r1.h
@@ -57,12 +57,6 @@
                                                "saveenv; " \
                                                "fi; "
 
-/* Autoboot options */
-#define CONFIG_AUTOBOOT_KEYED
-#define CONFIG_AUTOBOOT_PROMPT \
-       "Enter passphrase to stop autoboot, booting in %d seconds\n"
-#define CONFIG_AUTOBOOT_STOP_STR "123"
-
 #include <asm/arch/imx-regs.h>
 #include <linux/sizes.h>
 
@@ -241,9 +235,6 @@
 
 /* Miscellaneous configurable options */
 
-#define CONFIG_SYS_MEMTEST_START       0x80010000
-#define CONFIG_SYS_MEMTEST_END         0x87C00000
-
 #define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
 
 /* Physical memory map */
@@ -259,11 +250,4 @@
 #define CONFIG_SYS_INIT_SP_ADDR \
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
-#ifdef CONFIG_ENV_IS_IN_NAND
-#define CONFIG_ENV_SECT_SIZE   (SZ_128K)
-#define CONFIG_ENV_SIZE                (SZ_8K)
-#define CONFIG_ENV_OFFSET      0x200000
-#define CONFIG_ENV_OFFSET_REDUND       0x220000
-#endif
-
 #endif /* __CONFIG_H */