Move setting CONFIG_BOOTP_VCI_STRING to before including the vexpress-common header

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

diff --git a/include/configs/eb_cpux9k2.h b/include/configs/eb_cpux9k2.h
index efb50e37786c263c4b4ccd6b9b2e2c0f8ef87221..271e071cbba9ffb6079d7f4cdd8c939f72a6bb2b 100644 (file)
--- a/include/configs/eb_cpux9k2.h
+++ b/include/configs/eb_cpux9k2.h
@@ -5,23 +5,7 @@
  *
  * Configuation settings for the EB+CPUx9K2 board.
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef _CONFIG_EB_CPUx9K2_H_
@@ -52,13 +36,10 @@
 #define CONFIG_SYS_TEXT_BASE           0x00000000
 #else
 #define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_SYS_TEXT_BASE           0x21f00000
+#define CONFIG_SYS_TEXT_BASE           0x21800000
 #endif
 #define CONFIG_SYS_LOAD_ADDR           0x21000000  /* default load address */
-
-#define CONFIG_SYS_BOOT_SIZE           0x00 /* 0 KBytes */
-#define CONFIG_SYS_U_BOOT_BASE         PHYS_FLASH_1
-#define CONFIG_SYS_U_BOOT_SIZE         0x60000 /* 384 KBytes */
+#define CONFIG_STANDALONE_LOAD_ADDR    0x21000000
 
 #define CONFIG_BOOT_RETRY_TIME         30
 #define CONFIG_CMDLINE_EDITING
@@ -75,7 +56,6 @@
 
 #define AT91C_MAIN_CLOCK       179404800       /* from 12.288 MHz * 73 / 5 */
 #define AT91C_MASTER_CLOCK     (AT91C_MAIN_CLOCK / 3)
-#define CONFIG_SYS_HZ          1000
 #define CONFIG_SYS_HZ_CLOCK    (AT91C_MASTER_CLOCK / 2)
 
 #define CONFIG_SYS_AT91_SLOW_CLOCK     32768           /* slow clock */
@@ -98,7 +78,7 @@
  * Size of malloc() pool
  */
 
-#define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + 520*1024)
+#define CONFIG_SYS_MALLOC_LEN          (4 * 1024 * 1024)
 
 /*
  * sdram
@@ -132,52 +112,50 @@
 /*
  * Command line configuration
  */
-
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_BMP
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_I2C
-#define CONFIG_CMD_JFFS2
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_NAND
 #define CONFIG_CMD_PING
-#define CONFIG_I2C_CMD_NO_FLAT
 #define CONFIG_I2C_CMD_TREE
 #define CONFIG_CMD_USB
 #define CONFIG_CMD_FAT
+#define CONFIG_CMD_UBI
+#define CONFIG_CMD_MTDPARTS
+#define CONFIG_CMD_UBIFS
 
 #define CONFIG_SYS_LONGHELP
 
 /*
- * Filesystems
+ * MTD defines
  */
 
-#define CONFIG_JFFS2_NAND              1
+#define CONFIG_FLASH_CFI_MTD
+#define CONFIG_MTD_DEVICE
+#define CONFIG_MTD_PARTITIONS
+#define CONFIG_RBTREE
+#define CONFIG_LZO
 
-#ifndef CONFIG_JFFS2_CMDLINE
-#define CONFIG_JFFS2_DEV               "nand0"
-#define CONFIG_JFFS2_PART_OFFSET       0
-#define CONFIG_JFFS2_PART_SIZE         0xFFFFFFFF
-#else
-#define MTDIDS_DEFAULT         "nor0=0,nand0=1"
+#define MTDIDS_DEFAULT         "nor0=physmap-flash.0,nand0=atmel_nand"
 #define MTDPARTS_DEFAULT       "mtdparts="                             \
-                                       "0:"                            \
-                                       "384k(U-Boot),"                 \
-                                       "128k(Env),"                    \
-                                       "128k(Splash),"                 \
-                                       "4M(Kernel),"                   \
-                                       "-(FS)"                         \
+                                       "physmap-flash.0:"              \
+                                               "512k(U-Boot),"         \
+                                               "128k(Env),"            \
+                                               "128k(Splash),"         \
+                                               "4M(Kernel),"           \
+                                               "384k(MiniFS),"         \
+                                               "-(FS)"                 \
                                        ";"                             \
-                                       "1:"                            \
-                                       "-(jffs2)"
-#endif /* CONFIG_JFFS2_CMDLINE */
-
+                                       "atmel_nand:"                   \
+                                               "1M(emergency),"        \
+                                               "-(data)"
 /*
  * Hardware drivers
  */
 #define CONFIG_USB_ATMEL
+#define CONFIG_USB_ATMEL_CLK_SEL_PLLB
 #define CONFIG_USB_OHCI_NEW
 #define CONFIG_AT91C_PQFP_UHPBUG
 #define CONFIG_USB_STORAGE
@@ -344,7 +322,7 @@
 #define CONFIG_BOOTDELAY               5
 
 #define CONFIG_ENV_IS_IN_FLASH         1
-#define CONFIG_ENV_ADDR                        (PHYS_FLASH_1 + 0x60000)
+#define CONFIG_ENV_ADDR                        (PHYS_FLASH_1 + 0x80000)
 #define CONFIG_ENV_SIZE                        0x20000 /* sectors are 128K here */
 
 #define CONFIG_BAUDRATE                115200
@@ -363,12 +341,14 @@
        "displayheight=512\0"                                           \
        "displaybsteps=1023\0"                                          \
        "ubootaddr=10000000\0"                                          \
-       "splashimage=10080000\0"                                        \
-       "kerneladdr=100A0000\0"                                         \
+       "splashimage=100A0000\0"                                        \
+       "kerneladdr=100C0000\0"                                         \
        "kernelsize=00400000\0"                                         \
-       "rootfsaddr=104A0000\0"                                         \
+       "rootfsaddr=10520000\0"                                         \
        "copy_addr=21200000\0"                                          \
-       "rootfssize=00B60000\0"                                         \
+       "rootfssize=00AE0000\0"                                         \
+       "mtdids=" MTDIDS_DEFAULT "\0"                                   \
+       "mtdparts=" MTDPARTS_DEFAULT "\0"                               \
        "bootargsdefaults=set bootargs "                                \
                "console=ttyS0,115200 "                                 \
                "video=vcxk_fb:xres:${displaywidth},"                   \
@@ -389,15 +369,15 @@
                "erase $(rootfsaddr) +$(rootfssize);"                   \
                "cp.b $(fileaddr) $(rootfsaddr) $(filesize);"           \
                "\0"                                                    \
-       "update_uboot=protect off 10000000 1005FFFF;"                   \
+       "update_uboot=protect off 10000000 1007FFFF;"                   \
                "dhcp $(copy_addr) u-boot_eb_cpux9k2;"                  \
-               "erase 10000000 1005FFFF;"                              \
+               "erase 10000000 1007FFFF;"                              \
                "cp.b $(fileaddr) $(ubootaddr) $(filesize);"            \
-               "protect on 10000000 1005FFFF;reset\0"                  \
+               "protect on 10000000 1007FFFF;reset\0"                  \
        "update_splash=protect off $(splashimage) +20000;"              \
                "dhcp $(copy_addr) splash_eb_cpux9k2.bmp;"              \
                "erase $(splashimage) +20000;"                          \
-               "cp.b $(fileaddr) 10080000 $(filesize);"                \
+               "cp.b $(fileaddr) $(splashimage) $(filesize);"          \
                "protect on $(splashimage) +20000;reset\0"              \
        "emergency=run bootargsdefaults;"                               \
                "set bootargs $(bootargs) root=initramfs boot=emergency " \