flash: complete CONFIG_SYS_NO_FLASH move with renaming

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

diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h
index 834786d9406c67462d8a7fb171a5a7306bcbc73f..5f6fc8e5b4b26532e429efa996443dbd578c5162 100644 (file)
--- a/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@@ -40,9 +40,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_SYS_GENERIC_BOARD
-#define CONFIG_DISPLAY_BOARDINFO
-
 #if (CONFIG_SYS_TEXT_BASE == 0xFE000000)
 #define CONFIG_SYS_LOWBOOT
 #endif
@@ -74,7 +71,6 @@
 #define CONFIG_SYS_USB_HOST    /* use the EHCI USB controller */
 #endif
 
-#define CONFIG_PCI
 #define CONFIG_RTC_DS1337
 #define CONFIG_SYS_I2C
 #define CONFIG_TSEC_ENET               /* TSEC Ethernet support */
@@ -152,8 +148,6 @@
 /*
  * Support USB
  */
-#define CONFIG_CMD_USB
-#define CONFIG_USB_STORAGE
 #define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_FSL
 
@@ -332,7 +326,7 @@ boards, we say we have two, but don't display a message if we find only one. */
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
 /* CONFIG_SYS_MONITOR_LEN must be a multiple of CONFIG_ENV_SECT_SIZE */
-#define CONFIG_SYS_MONITOR_LEN (384 * 1024) /* Reserve 384 kB for Mon */
+#define CONFIG_SYS_MONITOR_LEN (512 * 1024) /* Reserve 512 kB for Mon */
 #define CONFIG_SYS_MALLOC_LEN  (256 * 1024) /* Reserved for malloc */
 
 /*
@@ -354,7 +348,6 @@ boards, we say we have two, but don't display a message if we find only one. */
  * Serial Port
  */
 #define CONFIG_CONS_INDEX      1
-#define CONFIG_SYS_NS16550
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_REG_SIZE    1
 #define CONFIG_SYS_NS16550_CLK         get_bus_freq(0)
@@ -362,17 +355,12 @@ boards, we say we have two, but don't display a message if we find only one. */
 #define CONFIG_SYS_BAUDRATE_TABLE  \
                {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 115200}
 
-#define CONFIG_CONSOLE         ttyS0
+#define CONSOLE                        ttyS0
 #define CONFIG_BAUDRATE                115200
 
 #define CONFIG_SYS_NS16550_COM1        (CONFIG_SYS_IMMR + 0x4500)
 #define CONFIG_SYS_NS16550_COM2        (CONFIG_SYS_IMMR + 0x4600)
 
-/* pass open firmware flat tree */
-#define CONFIG_OF_LIBFDT       1
-#define CONFIG_OF_BOARD_SETUP  1
-#define CONFIG_OF_STDOUT_VIA_ALIAS     1
-
 /*
  * PCI
  */
@@ -411,8 +399,6 @@ boards, we say we have two, but don't display a message if we find only one. */
 #define CONFIG_SYS_PCI2_IO_SIZE                0x01000000      /* 16M */
 #endif
 
-#define CONFIG_PCI_PNP                 /* do pci plug-and-play */
-
 #ifndef CONFIG_PCI_PNP
     #define PCI_ENET0_IOADDR   0x00000000
     #define PCI_ENET0_MEMADDR  CONFIG_SYS_PCI2_MEM_BASE
@@ -474,7 +460,6 @@ boards, we say we have two, but don't display a message if we find only one. */
   #define CONFIG_ENV_SECT_SIZE 0x10000 /* 64K (one sector) for environment */
   #define CONFIG_ENV_SIZE      0x2000
 #else
-  #define CONFIG_SYS_NO_FLASH  /* Flash is not usable now */
   #undef  CONFIG_FLASH_CFI_DRIVER
   #define CONFIG_ENV_IS_NOWHERE        /* Store ENV in memory only */
   #define CONFIG_ENV_ADDR      (CONFIG_SYS_MONITOR_BASE - 0x1000)
@@ -492,21 +477,15 @@ boards, we say we have two, but don't display a message if we find only one. */
 #define CONFIG_BOOTP_GATEWAY
 #define CONFIG_BOOTP_HOSTNAME
 
-
 /*
  * Command line configuration.
  */
-#define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_IRQ
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_DHCP
 #define CONFIG_CMD_SDRAM
 
 #if defined(CONFIG_COMPACT_FLASH) || defined(CONFIG_SATA_SIL3114) \
                                || defined(CONFIG_USB_STORAGE)
-       #define CONFIG_DOS_PARTITION
-       #define CONFIG_CMD_FAT
        #define CONFIG_SUPPORT_VFAT
 #endif
 
@@ -519,17 +498,12 @@ boards, we say we have two, but don't display a message if we find only one. */
 #endif
 
 #if defined(CONFIG_SATA_SIL3114) || defined(CONFIG_USB_STORAGE)
-       #define CONFIG_CMD_EXT2
 #endif
 
 #ifdef CONFIG_PCI
        #define CONFIG_CMD_PCI
 #endif
 
-#ifdef CONFIG_SYS_I2C
-       #define CONFIG_CMD_I2C
-#endif
-
 /* Watchdog */
 #undef CONFIG_WATCHDOG         /* watchdog disabled */
 
@@ -539,7 +513,6 @@ boards, we say we have two, but don't display a message if we find only one. */
 #define CONFIG_SYS_LONGHELP            /* undef to save memory */
 #define CONFIG_CMDLINE_EDITING         /* Command-line editing */
 #define CONFIG_AUTO_COMPLETE           /* add autocompletion support */
-#define CONFIG_SYS_HUSH_PARSER         /* Use the HUSH parser */
 
 #define CONFIG_SYS_LOAD_ADDR   0x2000000       /* default load address */
 #define CONFIG_LOADADDR        800000  /* default location for tftp and bootm */
@@ -563,6 +536,7 @@ boards, we say we have two, but don't display a message if we find only one. */
  */
                                /* Initial Memory map for Linux*/
 #define CONFIG_SYS_BOOTMAPSZ   (256 << 20)
+#define CONFIG_SYS_BOOTM_LEN   (64 << 20)      /* Increase max gunzip size */
 
 #define CONFIG_SYS_HRCW_LOW (\
        HRCWL_LCL_BUS_TO_SCB_CLK_1X1 |\
@@ -725,7 +699,6 @@ boards, we say we have two, but don't display a message if we find only one. */
 #define CONFIG_KGDB_BAUDRATE   230400  /* speed of kgdb serial port */
 #endif
 
-
 /*
  * Environment Configuration
  */
@@ -751,7 +724,6 @@ boards, we say we have two, but don't display a message if we find only one. */
 #define CONFIG_FDTFILE         "mpc8349emitxgp.dtb"
 #endif
 
-#define CONFIG_BOOTDELAY       6
 
 #define CONFIG_BOOTARGS \
        "root=/dev/nfs rw" \
@@ -761,10 +733,10 @@ boards, we say we have two, but don't display a message if we find only one. */
                __stringify(CONFIG_GATEWAYIP) ":"       \
                __stringify(CONFIG_NETMASK) ":"         \
                CONFIG_HOSTNAME ":" CONFIG_NETDEV ":off"                \
-       " console=" __stringify(CONFIG_CONSOLE) "," __stringify(CONFIG_BAUDRATE)
+       " console=" __stringify(CONSOLE) "," __stringify(CONFIG_BAUDRATE)
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
-       "console=" __stringify(CONFIG_CONSOLE) "\0"                     \
+       "console=" __stringify(CONSOLE) "\0"                    \
        "netdev=" CONFIG_NETDEV "\0"                                    \
        "uboot=" CONFIG_UBOOTPATH "\0"                                  \
        "tftpflash=tftpboot $loadaddr $uboot; "                         \