Convert CONFIG_PCI_GT64120 to Kconfig

[platform/kernel/u-boot.git] / include / configs / MPC837XERDB.h

diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 32dac86..e8e0a1c 100644 (file)
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -13,7 +13,6 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_E300            1 /* E300 family */
 
 #define CONFIG_HWCONFIG
 
@@ -127,7 +126,6 @@
 /*
  * The reserved memory
  */
-#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE /* start of monitor */
 
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT
@@ -143,8 +141,6 @@
 #define CONFIG_SYS_INIT_RAM_LOCK       1
 #define CONFIG_SYS_INIT_RAM_ADDR       0xE6000000 /* Initial RAM address */
 #define CONFIG_SYS_INIT_RAM_SIZE       0x1000 /* Size of used area in RAM */
-#define CONFIG_SYS_GBL_DATA_OFFSET     \
-                       (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
 
 /*
  * FLASH on the Local Bus
@@ -236,10 +232,6 @@
 #define CONFIG_SYS_PCIE2_IO_PHYS       0xD8000000
 #define CONFIG_SYS_PCIE2_IO_SIZE       0x00800000
 
-#ifdef CONFIG_PCI
-#undef CONFIG_PCI_SCAN_SHOW    /* show pci devices on startup */
-#endif /* CONFIG_PCI */
-
 /*
  * TSEC
  */
@@ -267,22 +259,6 @@
 #endif
 
 /*
- * SATA
- */
-#define CONFIG_SATA1
-#define CONFIG_SYS_SATA1_OFFSET        0x18000
-#define CONFIG_SYS_SATA1       (CONFIG_SYS_IMMR + CONFIG_SYS_SATA1_OFFSET)
-#define CONFIG_SYS_SATA1_FLAGS FLAGS_DMA
-#define CONFIG_SATA2
-#define CONFIG_SYS_SATA2_OFFSET        0x19000
-#define CONFIG_SYS_SATA2       (CONFIG_SYS_IMMR + CONFIG_SYS_SATA2_OFFSET)
-#define CONFIG_SYS_SATA2_FLAGS FLAGS_DMA
-
-#ifdef CONFIG_FSL_SATA
-#define CONFIG_LBA48
-#endif
-
-/*
  * Environment
  */
 
@@ -310,14 +286,10 @@
  * Environment Configuration
  */
 
-#define CONFIG_HAS_FSL_DR_USB
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
-
 #define CONFIG_NETDEV          "eth1"
 
 #define CONFIG_HOSTNAME                "mpc837x_rdb"
 #define CONFIG_ROOTPATH                "/nfsroot"
-#define CONFIG_RAMDISKFILE     "rootfs.ext2.gz.uboot"
                                /* U-Boot image on TFTP server */
 #define CONFIG_UBOOTPATH       "u-boot.bin"
 #define CONFIG_FDTFILE         "mpc8379_rdb.dtb"
@@ -339,7 +311,7 @@
        "fdtaddr=780000\0"                                              \
        "fdtfile=" CONFIG_FDTFILE "\0"                                  \
        "ramdiskaddr=1000000\0"                                         \
-       "ramdiskfile=" CONFIG_RAMDISKFILE "\0"                          \
+       "ramdiskfile=rootfs.ext2.gz.uboot\0"                            \
        "console=ttyS0\0"                                               \
        "setbootargs=setenv bootargs "                                  \
                "root=$rootdev rw console=$console,$baudrate $othbootargs\0" \