Merge branch 'master' of git://git.denx.de/u-boot-socfpga

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

diff --git a/include/configs/amcore.h b/include/configs/amcore.h
index b9fc5b5d084d68a9e5a868efe3e4b89cdc8acf3e..bc1fc8c7b015df141f0f1fe0f1ba4042a32c9f3f 100644 (file)
--- a/include/configs/amcore.h
+++ b/include/configs/amcore.h
@@ -1,15 +1,14 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Sysam AMCORE board configuration
  *
  * (C) Copyright 2016  Angelo Dureghello <angelo@sysam.it>
- *
- * SPDX-License-Identifier:     GPL-2.0+
  */
 
 #ifndef __AMCORE_CONFIG_H
 #define __AMCORE_CONFIG_H
 
-#define CONFIG_HOSTNAME                        AMCORE
+#define CONFIG_HOSTNAME                        "AMCORE"
 
 #define CONFIG_MCFTMR
 #define CONFIG_MCFUART
@@ -30,10 +29,6 @@
                "cp.b 0x20000 0xfff00000 ${filesize}\0"
 
 /* undef to save memory        */
-#undef CONFIG_SYS_LONGHELP
-
-#define CONFIG_AUTO_COMPLETE           1 /* add autocompletion support */
-#define CONFIG_MX_CYCLIC               1 /* enable mdc/mwc commands    */
 
 #define CONFIG_SYS_LOAD_ADDR           0x20000 /* default load address */
 
@@ -61,9 +56,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 */
@@ -72,11 +64,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*);