Convert CONFIG_CMD_JFFS2 to Kconfig

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

diff --git a/include/configs/ac14xx.h b/include/configs/ac14xx.h
index d6cef888c6f00618276762ecc0a065163457a36d..4eb8f39aaf2eabe1584c84f21f44e549cb458c48 100644 (file)
--- a/include/configs/ac14xx.h
+++ b/include/configs/ac14xx.h
@@ -13,6 +13,7 @@
 #define __CONFIG_H
 
 #define CONFIG_AC14XX 1
+
 /*
  * Memory map for the ifm AC14xx board:
  *
@@ -27,15 +28,9 @@
  * High Level Configuration Options
  */
 #define CONFIG_E300            1       /* E300 Family */
-#define CONFIG_MPC512X         1       /* MPC512X family */
 
 #define CONFIG_SYS_TEXT_BASE   0xFFF00000
 
-#if defined(CONFIG_VIDEO)
-#define CONFIG_CFB_CONSOLE
-#define CONFIG_VGA_AS_SINGLE_DEVICE
-#endif
-
 #define CONFIG_SYS_MPC512X_CLKIN       25000000        /* in Hz */
 #define SCFR1_IPS_DIV                  2
 #define SCFR1_LPC_DIV                  2
@@ -288,11 +283,10 @@
 
 /* Use SRAM for initial stack */
 #define CONFIG_SYS_INIT_RAM_ADDR       CONFIG_SYS_SRAM_BASE
-#define CONFIG_SYS_INIT_RAM_END                CONFIG_SYS_SRAM_SIZE
+#define CONFIG_SYS_INIT_RAM_SIZE       CONFIG_SYS_SRAM_SIZE
 
-#define CONFIG_SYS_GBL_DATA_SIZE       0x100
-#define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - \
-                                        CONFIG_SYS_GBL_DATA_SIZE)
+#define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_SIZE - \
+                                        GENERATED_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
 #define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE
@@ -318,8 +312,6 @@
 #error CONFIG_PSC_CONSOLE must be 3
 #endif
 
-#define CONFIG_BAUDRATE                        115200  /* ... at 115200 bps */
-
 #define CONSOLE_FIFO_TX_SIZE           FIFOC_PSC3_TX_SIZE
 #define CONSOLE_FIFO_TX_ADDR           FIFOC_PSC3_TX_ADDR
 #define CONSOLE_FIFO_RX_SIZE           FIFOC_PSC3_RX_SIZE
@@ -342,36 +334,17 @@
                         CLOCK_SCCR2_DIU_EN |           \
                         CLOCK_SCCR2_I2C_EN)
 
-
 #define CONFIG_CMDLINE_EDITING         1       /* command line history */
 
-/* I2C */
-#define CONFIG_HARD_I2C                        /* I2C with hardware support */
-#define CONFIG_I2C_MULTI_BUS
-
-/* I2C speed and slave address */
-#define CONFIG_SYS_I2C_SPEED           100000
-#define CONFIG_SYS_I2C_SLAVE           0x7F
-
 /*
  * IIM - IC Identification Module
  */
 #undef CONFIG_FSL_IIM
 
-/*
- * EEPROM configuration for Atmel AT24C01:
- * 8-bit addresses, 30ms write delay, 32-Byte Page Write Mode
- */
-#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN         1
-#define CONFIG_SYS_I2C_EEPROM_ADDR             0x52
-#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS  30
-#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS      5
-
 /*
  * Ethernet configuration
  */
 #define CONFIG_MPC512x_FEC             1
-#define CONFIG_NET_MULTI
 #define CONFIG_PHY_ADDR                        0x1F
 #define CONFIG_MII                     1       /* MII PHY management */
 #define CONFIG_FEC_AN_TIMEOUT          1
@@ -394,37 +367,17 @@
 #define CONFIG_LOADS_ECHO              1
 #define CONFIG_SYS_LOADS_BAUD_CHANGE   1
 
-#include <config_cmd_default.h>
-
-#define CONFIG_CMD_ASKENV
-#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_EEPROM
-#undef CONFIG_CMD_FUSE
-#define CONFIG_CMD_I2C
-#undef CONFIG_CMD_IDE
-#undef CONFIG_CMD_EXT2
-#define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_MII
-#define CONFIG_CMD_NFS
-#define CONFIG_CMD_PING
 #define CONFIG_CMD_REGINFO
 
 #if defined(CONFIG_PCI)
 #define CONFIG_CMD_PCI
 #endif
 
-#if defined(CONFIG_CMD_IDE) || defined(CONFIG_CMD_EXT2)
-#define CONFIG_DOS_PARTITION
-#define CONFIG_MAC_PARTITION
-#define CONFIG_ISO_PARTITION
-#endif /* defined(CONFIG_CMD_IDE) */
-
 /*
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_LONGHELP                    /* undef to save memory */
 #define CONFIG_SYS_LOAD_ADDR   0x2000000       /* default load address */
-#define CONFIG_SYS_PROMPT      "ac14xx> "      /* Monitor Command Prompt */
 
 #ifdef CONFIG_CMD_KGDB
 # define CONFIG_SYS_CBSIZE     1024            /* Console I/O Buffer Size */
@@ -461,14 +414,6 @@
 
 #define CONFIG_HIGH_BATS               1       /* High BATs supported */
 
-/*
- * Internal Definitions
- *
- * Boot Flags
- */
-#define BOOTFLAG_COLD                  0x01
-#define BOOTFLAG_WARM                  0x02
-
 #ifdef CONFIG_CMD_KGDB
 #define CONFIG_KGDB_BAUDRATE           230400  /* speed of kgdb serial port */
 #endif
@@ -482,7 +427,6 @@
 /* default load addr for tftp and bootm */
 #define CONFIG_LOADADDR                400000
 
-#define CONFIG_BOOTDELAY       2       /* -1 disables auto-boot */
 
 /* the builtin environment and standard greeting */
 #define CONFIG_PREBOOT "echo;" \
@@ -562,9 +506,6 @@
 
 #define CONFIG_ARP_TIMEOUT     200UL
 
-#define CONFIG_FIT             1
-#define CONFIG_OF_LIBFDT       1
-#define CONFIG_OF_BOARD_SETUP  1
 #define CONFIG_OF_SUPPORT_OLD_DEVICE_TREES     1
 
 #define OF_CPU                 "PowerPC,5121@0"