config: Move CONFIG_DEFAULT_FDT_FILE to defconfigs

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

diff --git a/include/configs/amcore.h b/include/configs/amcore.h
index 229fa5a6c2d5a2f573615e57be31140bc80eb5e0..fcb82e286c32d7485338bbd7073b28a4b86806c6 100644 (file)
--- a/include/configs/amcore.h
+++ b/include/configs/amcore.h
@@ -1,7 +1,7 @@
 /*
  * Sysam AMCORE board configuration
  *
- * (C) Copyright 2015  Angelo Dureghello <angelo@sysam.it>
+ * (C) Copyright 2016  Angelo Dureghello <angelo@sysam.it>
  *
  * SPDX-License-Identifier:     GPL-2.0+
  */
@@ -18,21 +18,22 @@
 #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"
 
-#include <config_cmd_default.h>
 #undef CONFIG_CMD_AES
-#undef CONFIG_CMD_BOOTD
-#undef CONFIG_CMD_NET
-#undef CONFIG_CMD_NFS
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_XIMG
-#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
 
@@ -52,7 +53,6 @@
 
 #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 */
@@ -98,6 +98,10 @@
 #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*);
+
 /* memory map space for linux boot data */
 #define CONFIG_SYS_BOOTMAPSZ           (8 << 20)