Merge git://git.denx.de/u-boot-rockchip

[J-u-boot.git] / include / configs / ids8313.h

diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h
index 2384864eb025fc979288bec16e3a2e2aca709f01..12eb07d1f7e587738a30f59e48943194ad0bb5b6 100644 (file)
--- a/include/configs/ids8313.h
+++ b/include/configs/ids8313.h
@@ -17,21 +17,13 @@
  */
 #define CONFIG_MPC831x
 #define CONFIG_MPC8313
-#define CONFIG_IDS8313
-
-#define CONFIG_SYS_GENERIC_BOARD
 
 #define CONFIG_FSL_ELBC
 
 #define CONFIG_MISC_INIT_R
 
-#define CONFIG_AUTOBOOT_KEYED
-#define CONFIG_AUTOBOOT_PROMPT \
-       "\nEnter password - autoboot in %d seconds...\n", CONFIG_BOOTDELAY
-#define CONFIG_AUTOBOOT_DELAY_STR      "ids"
 #define CONFIG_BOOT_RETRY_TIME         900
 #define CONFIG_BOOT_RETRY_MIN          30
-#define CONFIG_BOOTDELAY               1
 #define CONFIG_RESET_TO_RETRY
 
 #define CONFIG_83XX_CLKIN              66000000        /* in Hz */
@@ -171,9 +163,7 @@
 #define CONFIG_TSEC1
 #define CONFIG_TSEC2
 #define CONFIG_TSEC_ENET
-#define CONFIG_NET_MULTI
 #define CONFIG_HARD_SPI
-#define CONFIG_HARD_I2C
 
 /*
  * NOR FLASH setup
@@ -214,7 +204,6 @@
 #define CONFIG_SYS_NAND_BASE           0xE1000000
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
 #define CONFIG_SYS_NAND_MAX_CHIPS      1
-#define CONFIG_MTD_NAND_VERIFY_WRITE
 #define CONFIG_NAND_FSL_ELBC
 #define CONFIG_SYS_NAND_PAGE_SIZE      (2048)
 #define CONFIG_SYS_NAND_BLOCK_SIZE     (128 << 10)
@@ -284,7 +273,6 @@
 /*
  * I2C setup
  */
-#define CONFIG_CMD_I2C
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_I2C_FSL
 #define CONFIG_SYS_FSL_I2C_SPEED       400000
@@ -298,7 +286,6 @@
  */
 #ifdef CONFIG_HARD_SPI
 #define CONFIG_MPC8XXX_SPI
-#define CONFIG_CMD_SPI
 #define CONFIG_SYS_GPIO1_PRELIM
 #define CONFIG_SYS_GPIO1_DIR           0x00000001
 #define CONFIG_SYS_GPIO1_DAT           0x00000001
@@ -330,7 +317,6 @@
  * Serial Port
  */
 #define CONFIG_CONS_INDEX              1
-#define CONFIG_SYS_NS16550
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_REG_SIZE    1
 
@@ -424,28 +410,12 @@
 /*
  * U-Boot environment setup
  */
-#include <config_cmd_default.h>
-
-#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_NFS
-#define CONFIG_CMD_NAND
-#define CONFIG_CMD_FLASH
-#define CONFIG_CMD_SNTP
-#define CONFIG_CMD_MII
-#define CONFIG_CMD_DATE
 #define CONFIG_CMDLINE_EDITING
-#define CONFIG_CMD_EDITENV
-#define CONFIG_CMD_JFFS2
 #define CONFIG_BOOTP_SUBNETMASK
 #define CONFIG_BOOTP_GATEWAY
 #define CONFIG_BOOTP_HOSTNAME
 #define CONFIG_BOOTP_BOOTPATH
 #define CONFIG_BOOTP_BOOTFILESIZE
-/* pass open firmware flat tree */
-#define CONFIG_OF_LIBFDT
-#define CONFIG_OF_BOARD_SETUP
-#define CONFIG_OF_STDOUT_VIA_ALIAS
 
 /*
  * The reserved memory
@@ -457,14 +427,12 @@
 /*
  * Environment Configuration
  */
-#define CONFIG_ENV_IS_IN_FLASH
 #define CONFIG_ENV_ADDR                (CONFIG_SYS_MONITOR_BASE \
                                + CONFIG_SYS_MONITOR_LEN)
 #define CONFIG_ENV_SIZE                0x20000
 #define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SIZE)
 #define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)
 
-
 #define CONFIG_NETDEV                  eth1
 #define CONFIG_HOSTNAME                ids8313
 #define CONFIG_ROOTPATH                "/opt/eldk-4.2/ppc_6xx"
@@ -472,11 +440,8 @@
 #define CONFIG_UBOOTPATH               "ids8313/u-boot.bin"
 #define CONFIG_FDTFILE                 "ids8313/ids8313.dtb"
 #define CONFIG_LOADADDR                0x400000
-#define CONFIG_CMD_ENV_FLAGS
 #define CONFIG_ENV_FLAGS_LIST_STATIC "ethaddr:mo,eth1addr:mo"
 
-#define CONFIG_BAUDRATE                115200
-
 /* Initial Memory map for Linux*/
 #define CONFIG_SYS_BOOTMAPSZ           (256 << 20)
 
@@ -485,12 +450,7 @@
  */
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_CBSIZE              1024
-#define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE \
-                                        + sizeof(CONFIG_SYS_PROMPT)+16)
-#define CONFIG_SYS_MAXARGS             16
 #define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
-#define CONFIG_SYS_HUSH_PARSER         /* use "hush" command parser    */
-#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
 
 #define CONFIG_SYS_MEMTEST_START       0x00001000
 #define CONFIG_SYS_MEMTEST_END         0x00C00000
@@ -502,7 +462,6 @@
 #define CONFIG_PREBOOT                 "echo;" \
                                        "echo Type \\\"run nfsboot\\\" " \
                                        "to mount root filesystem over NFS;echo"
-#undef CONFIG_BOOTARGS
 #define CONFIG_BOOTCOMMAND             "run boot_cramfs"
 #undef CONFIG_SYS_LOADS_BAUD_CHANGE
 
@@ -510,14 +469,8 @@
 #define CONFIG_JFFS2_DEV               "0"
 
 /* mtdparts command line support */
-#define CONFIG_CMD_MTDPARTS
 #define CONFIG_FLASH_CFI_MTD
 #define CONFIG_MTD_DEVICE
-#define MTDIDS_DEFAULT         "nor0=ff800000.flash,nand0=e1000000.flash"
-#define MTDPARTS_DEFAULT       "mtdparts=ff800000.flash:7m(dum)," \
-                                       "768k(BOOT-BIN)," \
-                                       "128k(BOOT-ENV),128k(BOOT-REDENV);" \
-                                       "e1000000.flash:-(ubi)"
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "netdev=" __stringify(CONFIG_NETDEV) "\0"                       \
@@ -547,8 +500,8 @@
                        "${netmask}:${hostname}:${netdev}:off "         \
                        "console=${console},${baudrate} ${othbootargs}\0" \
        "addmtd=setenv bootargs ${bootargs} ${mtdparts}\0"              \
-       "mtdids=" MTDIDS_DEFAULT "\0"                                   \
-       "mtdparts=" MTDPARTS_DEFAULT "\0"                               \
+       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0"                                    \
+       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0"                                \
        "\0"
 
 #define CONFIG_NFSBOOTCOMMAND                                          \
@@ -560,11 +513,6 @@
        "bootm ${loadaddr} - ${fdtaddr}"
 
 /* UBI Support */
-#define CONFIG_CMD_NAND_TRIMFFS
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
-#define CONFIG_RBTREE
-#define CONFIG_LZO
 #define CONFIG_MTD_PARTITIONS
 
 /* bootcount support */
@@ -573,12 +521,6 @@
 #define CONFIG_BOOTCOUNT_ALEN  1
 #define CONFIG_SYS_BOOTCOUNT_ADDR      0x9
 
-#define CONFIG_VERSION_VARIABLE
-
 #define CONFIG_IMAGE_FORMAT_LEGACY
-#define CONFIG_CMD_FDT
-#define CONFIG_CMD_HASH
-#define CONFIG_SHA1
-#define CONFIG_SHA256
 
 #endif /* __CONFIG_H */