Merge branch '2020-05-07-more-kconfig-migrations'

[oweals/u-boot.git] / include / configs / amcore.h

diff --git a/include/configs/amcore.h b/include/configs/amcore.h
index ea04f91d0c13fd3ab46078e750593ca25067b39c..641d8fdbd53dbc8546ba1014796b7f094ab8b916 100644 (file)
--- a/include/configs/amcore.h
+++ b/include/configs/amcore.h
@@ -30,13 +30,8 @@
 
 /* undef to save memory        */
 
-#define CONFIG_MX_CYCLIC               1 /* enable mdc/mwc commands    */
-
 #define CONFIG_SYS_LOAD_ADDR           0x20000 /* default load address */
 
-#define CONFIG_SYS_MEMTEST_START       0x0
-#define CONFIG_SYS_MEMTEST_END         0x1000000
-
 #define CONFIG_SYS_HZ                  1000
 
 #define CONFIG_SYS_CLK                 45000000
@@ -58,9 +53,6 @@
 #define CONFIG_SYS_MAX_FLASH_SECT      1024
 #define CONFIG_SYS_FLASH_ERASE_TOUT    1000
 
-#define CONFIG_SYS_FLASH_CFI
-#define CONFIG_FLASH_CFI_DRIVER
-#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
 /* amcore design has flash data bytes wired swapped */
 #define CONFIG_SYS_WRITE_SWAPPED_DATA
 /* reserve 128-4KB */
@@ -69,11 +61,6 @@
 #define CONFIG_SYS_MALLOC_LEN          (1 * 1024 * 1024)
 #define CONFIG_SYS_BOOTPARAMS_LEN      (64 * 1024)
 
-#define CONFIG_ENV_ADDR                        (CONFIG_SYS_FLASH_BASE + \
-                                        CONFIG_SYS_MONITOR_LEN)
-#define CONFIG_ENV_SIZE                        0x1000
-#define CONFIG_ENV_SECT_SIZE           0x1000
-
 #define LDS_BOARD_TEXT \
        . = DEFINED(env_offset) ? env_offset : .; \
        env/embedded.o(.text*);