arm: spear: Move to common SPL infrastructure

[karo-tx-uboot.git] / include / configs / x600.h

diff --git a/include/configs/x600.h b/include/configs/x600.h
index 04187c0a312588d82a6bbea557239c4cd0aa167a..70e633c27423498632a303a7871285091f91f59a 100644 (file)
--- a/include/configs/x600.h
+++ b/include/configs/x600.h
@@ -2,7 +2,7 @@
  * (C) Copyright 2009
  * Vipin Kumar, STMicroelectronics, <vipin.kumar@st.com>
  *
- * Copyright (C) 2012 Stefan Roese <sr@denx.de>
+ * Copyright (C) 2012, 2015 Stefan Roese <sr@denx.de>
  *
  * SPDX-License-Identifier:    GPL-2.0+
  */
@@ -16,6 +16,7 @@
  */
 #define CONFIG_SPEAR600                                /* SPEAr600 SoC */
 #define CONFIG_X600                            /* on X600 board */
+#define CONFIG_SYS_GENERIC_BOARD
 
 #include <asm/arch/hardware.h>
 
@@ -73,8 +74,6 @@
 
 /* Ethernet config options */
 #define CONFIG_MII
-#define CONFIG_DESIGNWARE_ETH
-#define CONFIG_NET_MULTI
 #define CONFIG_PHYLIB
 #define CONFIG_PHY_RESET_DELAY                 10000           /* in usec */
 #define CONFIG_PHY_ADDR                0       /* PHY address */
@@ -106,25 +105,18 @@
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_ENV
-#define CONFIG_CMD_FPGA
 #define CONFIG_CMD_FPGA_LOADMK
 #define CONFIG_CMD_GPIO
 #define CONFIG_CMD_I2C
-#define CONFIG_CMD_MEMORY
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_MTDPARTS
 #define CONFIG_CMD_NAND
-#define CONFIG_CMD_NET
 #define CONFIG_CMD_PING
-#define CONFIG_CMD_RUN
 #define CONFIG_CMD_SAVES
 #define CONFIG_CMD_UBI
 #define CONFIG_CMD_UBIFS
 #define CONFIG_LZO
 
-/* This must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <config_cmd_default.h>
-
 #define CONFIG_BOOTDELAY                       3
 
 #define CONFIG_SYS_HUSH_PARSER                 /* Use the HUSH parser  */
@@ -153,17 +145,12 @@
 #define CONFIG_LOOPW                   /* enable loopw command         */
 #define CONFIG_MX_CYCLIC               /* enable mdc/mwc commands      */
 #define CONFIG_ZERO_BOOTDELAY_CHECK
-#define CONFIG_AUTOBOOT_KEYED
-#define CONFIG_AUTOBOOT_STOP_STR               " "
-#define CONFIG_AUTOBOOT_PROMPT                 \
-               "Hit SPACE in %d seconds to stop autoboot.\n", bootdelay
 
 #define CONFIG_SYS_MEMTEST_START               0x00800000
 #define CONFIG_SYS_MEMTEST_END                 0x04000000
 #define CONFIG_SYS_MALLOC_LEN                  (1024 * 1024)
 #define CONFIG_IDENT_STRING                    "-SPEAr"
 #define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_PROMPT                      "X600> "
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_CBSIZE                      256
 #define CONFIG_SYS_PBSIZE                      (CONFIG_SYS_CBSIZE + \
@@ -175,7 +162,8 @@
 
 /* Use last 2 lwords in internal SRAM for bootcounter */
 #define CONFIG_BOOTCOUNT_LIMIT
-#define CONFIG_SYS_BOOTCOUNT_ADDR      0xd2801ff8
+#define CONFIG_SYS_BOOTCOUNT_ADDR              (CONFIG_SRAM_BASE + \
+                                                CONFIG_SRAM_SIZE)
 
 #define CONFIG_HOSTNAME                                x600
 #define CONFIG_UBI_PART                                ubi0
@@ -261,8 +249,11 @@
 #define PHYS_SDRAM_1_MAXSIZE                   0x40000000
 
 #define CONFIG_SYS_SDRAM_BASE                  PHYS_SDRAM_1
-#define CONFIG_SYS_INIT_RAM_ADDR               0xD2800000
-#define CONFIG_SYS_INIT_RAM_SIZE               0x2000
+#define CONFIG_SRAM_BASE                       0xd2800000
+/* Preserve the last 2 lwords for the boot-counter */
+#define CONFIG_SRAM_SIZE                       ((8 << 10) - 0x8)
+#define CONFIG_SYS_INIT_RAM_ADDR               CONFIG_SRAM_BASE
+#define CONFIG_SYS_INIT_RAM_SIZE               CONFIG_SRAM_SIZE
 
 #define CONFIG_SYS_INIT_SP_OFFSET              \
        (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
@@ -273,10 +264,13 @@
 /*
  * SPL related defines
  */
-#define CONFIG_SPL_TEXT_BASE   0xd2800b00
+#define CONFIG_SPL_TEXT_BASE           0xd2800b00
+#define CONFIG_SPL_MAX_SIZE            (CONFIG_SRAM_SIZE - 0xb00)
 #define        CONFIG_SPL_START_S_PATH "arch/arm/cpu/arm926ejs/spear"
 #define CONFIG_SPL_LDSCRIPT    "arch/arm/cpu/arm926ejs/spear/u-boot-spl.lds"
 
+#define CONFIG_SPL_FRAMEWORK
+#define CONFIG_SPL_NOR_SUPPORT
 #define CONFIG_SPL_SERIAL_SUPPORT
 #define CONFIG_SPL_LIBCOMMON_SUPPORT   /* image.c */
 #define CONFIG_SPL_LIBGENERIC_SUPPORT  /* string.c */