Merge git://www.denx.de/git/u-boot-marvell

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

diff --git a/include/configs/ap143.h b/include/configs/ap143.h
index e45f743936da4fa25a63aa41497ef92c68f36294..99027e078edf259243022c97c19135eee7219d30 100644 (file)
--- a/include/configs/ap143.h
+++ b/include/configs/ap143.h
@@ -7,10 +7,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
-#define CONFIG_BOARD_EARLY_INIT_F
-
 #define CONFIG_SYS_HZ                   1000
 #define CONFIG_SYS_MHZ                  325
 #define CONFIG_SYS_MIPS_TIMER_FREQ      (CONFIG_SYS_MHZ * 1000000)
@@ -38,20 +34,19 @@
 #define CONFIG_SYS_BAUDRATE_TABLE \
        {9600, 19200, 38400, 57600, 115200}
 
-#define CONFIG_BOOTDELAY                3
 #define CONFIG_BOOTARGS                 "console=ttyS0,115200 " \
                                        "root=/dev/mtdblock2 " \
                                        "rootfstype=squashfs"
 #define CONFIG_BOOTCOMMAND              "sf probe;" \
                                        "mtdparts default;" \
-                                       "bootm 0x9f300000"
+                                       "bootm 0x9f680000"
 #define CONFIG_LZMA
 
 #define MTDIDS_DEFAULT                  "nor0=spi-flash.0"
 #define MTDPARTS_DEFAULT                "mtdparts=spi-flash.0:" \
                                        "256k(u-boot),64k(u-boot-env)," \
-                                       "2752k(rootfs),896k(uImage)," \
-                                       "64k(NVRAM),64k(ART)"
+                                       "6336k(rootfs),1472k(uImage)," \
+                                       "64k(ART)"
 
 #define CONFIG_ENV_SPI_MAX_HZ           25000000
 #define CONFIG_ENV_IS_IN_SPI_FLASH