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

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

diff --git a/include/configs/ap121.h b/include/configs/ap121.h
index 2da520eda9d9d32530e6a1dab42b60fe97fb0896..860f38509d0a27de9e420f0e4218303ee78f085f 100644 (file)
--- a/include/configs/ap121.h
+++ b/include/configs/ap121.h
@@ -7,8 +7,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_BOARD_EARLY_INIT_F
-
 #define CONFIG_SYS_HZ                   1000
 #define CONFIG_SYS_MHZ                  200
 #define CONFIG_SYS_MIPS_TIMER_FREQ      (CONFIG_SYS_MHZ * 1000000)
@@ -21,24 +19,17 @@
 #define CONFIG_SYS_SDRAM_BASE           0x80000000
 #define CONFIG_SYS_LOAD_ADDR            0x81000000
 
-#define CONFIG_SYS_NO_FLASH
-
 #define CONFIG_SYS_INIT_RAM_ADDR        0xbd000000
 #define CONFIG_SYS_INIT_RAM_SIZE        0x8000
 #define CONFIG_SYS_INIT_SP_ADDR \
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_RAM_SIZE - 1)
 
-#define CONFIG_BAUDRATE                 115200
 #define CONFIG_SYS_BAUDRATE_TABLE \
        {9600, 19200, 38400, 57600, 115200}
 
-#define CONFIG_BOOTARGS                 "console=ttyS0,115200 " \
-                                       "root=/dev/mtdblock2 " \
-                                       "rootfstype=squashfs"
 #define CONFIG_BOOTCOMMAND              "sf probe;" \
                                        "mtdparts default;" \
                                        "bootm 0x9f650000"
-#define CONFIG_LZMA
 
 #define MTDIDS_DEFAULT                  "nor0=spi-flash.0"
 #define MTDPARTS_DEFAULT                "mtdparts=spi-flash.0:" \
@@ -47,16 +38,10 @@
                                        "64k(NVRAM),64k(ART)"
 
 #define CONFIG_ENV_SPI_MAX_HZ           25000000
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_OFFSET               0x40000
 #define CONFIG_ENV_SECT_SIZE            0x10000
 #define CONFIG_ENV_SIZE                 0x10000
 
-/*
- * Command
- */
-#define CONFIG_CMD_MTDPARTS
-
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_CBSIZE               256
 #define CONFIG_SYS_MAXARGS              16