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 45fd265d6770a3a0d36eadcb3a9ff1f4233e3ad9..bc1fc8c7b015df141f0f1fe0f1ba4042a32c9f3f 100644 (file)
--- a/include/configs/amcore.h
+++ b/include/configs/amcore.h
@@ -1,53 +1,34 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Sysam AMCORE board configuration
  *
- * (C) Copyright 2015  Angelo Dureghello <angelo@sysam.it>
- *
- * SPDX-License-Identifier:     GPL-2.0+
+ * (C) Copyright 2016  Angelo Dureghello <angelo@sysam.it>
  */
 
 #ifndef __AMCORE_CONFIG_H
 #define __AMCORE_CONFIG_H
 
-#define CONFIG_AMCORE
-#define CONFIG_HOSTNAME                        AMCORE
+#define CONFIG_HOSTNAME                        "AMCORE"
 
 #define CONFIG_MCFTMR
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT           0
-#define CONFIG_BAUDRATE                        115200
 #define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200 }
 
-#define CONFIG_BOOTDELAY               1
 #define CONFIG_BOOTCOMMAND             "bootm ffc20000"
+#define CONFIG_EXTRA_ENV_SETTINGS                              \
+       "upgrade_uboot=loady; "                                 \
+               "protect off 0xffc00000 0xffc1ffff; "           \
+               "erase 0xffc00000 0xffc1ffff; "                 \
+               "cp.b 0x20000 0xffc00000 ${filesize}\0"         \
+       "upgrade_kernel=loady; "                                \
+               "erase 0xffc20000 0xffefffff; "                 \
+               "cp.b 0x20000 0xffc20000 ${filesize}\0"         \
+       "upgrade_jffs2=loady; "                                 \
+               "erase 0xfff00000 0xffffffff; "                 \
+               "cp.b 0x20000 0xfff00000 ${filesize}\0"
 
-#undef CONFIG_CMD_AES
-#define CONFIG_CMD_CACHE
-#define CONFIG_CMD_TIMER
-#define CONFIG_CMD_DIAG
-
-#define CONFIG_SYS_PROMPT              "amcore $ "
 /* undef to save memory        */
-#undef CONFIG_SYS_LONGHELP
-
-#if defined(CONFIG_CMD_KGDB)
-/* Console I/O buff. size */
-#define CONFIG_SYS_CBSIZE              1024
-#else
-#define CONFIG_SYS_CBSIZE              256
-#endif
-/* Print buffer size */
-#define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE + \
-                                        sizeof(CONFIG_SYS_PROMPT)+16)
-/* max number of command args  */
-#define CONFIG_SYS_MAXARGS             16
-/* Boot argument buffer size   */
-#define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
-
-#define CONFIG_SYS_CONSOLE_INFO_QUIET  1 /* no console @ startup       */
-#define CONFIG_AUTO_COMPLETE           1 /* add autocompletion support */
-#define CONFIG_LOOPW                   1 /* enable loopw command       */
-#define CONFIG_MX_CYCLIC               1 /* enable mdc/mwc commands    */
 
 #define CONFIG_SYS_LOAD_ADDR           0x20000 /* default load address */
 
@@ -75,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 */
@@ -86,15 +64,9 @@
 #define CONFIG_SYS_MALLOC_LEN          (1 * 1024 * 1024)
 #define CONFIG_SYS_BOOTPARAMS_LEN      (64 * 1024)
 
-#define CONFIG_ENV_IS_IN_FLASH         1
-#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 : .; \
-        common/env_embedded.o (.text*);
+       . = DEFINED(env_offset) ? env_offset : .; \
+       env/embedded.o(.text*);
 
 /* memory map space for linux boot data */
 #define CONFIG_SYS_BOOTMAPSZ           (8 << 20)