Merge branch '2022-08-04-Kconfig-migrations'

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

diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index d356ff9..c2f4f2b 100644 (file)
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -61,7 +61,6 @@
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000 /* DDR is system memory */
 #define CONFIG_SYS_DDR_SDRAM_CLK_CNTL  0x03000000
-#define CONFIG_SYS_83XX_DDR_USES_CS0
 
 #define CONFIG_SYS_DDRCDR_VALUE        (DDRCDR_DHC_EN | DDRCDR_ODT | DDRCDR_Q_DRN)
 
@@ -70,7 +69,7 @@
 /*
  * Manually set up DDR parameters
  */
-#define CONFIG_SYS_DDR_SIZE            256             /* MB */
+#define CONFIG_SYS_SDRAM_SIZE          0x10000000 /* 256 MiB */
 #define CONFIG_SYS_DDR_CS0_BNDS                0x0000000f
 #define CONFIG_SYS_DDR_CS0_CONFIG      (CSCONFIG_EN \
                                        | CSCONFIG_ODT_WR_ONLY_CURRENT \
@@ -127,12 +126,6 @@
  * The reserved memory
  */
 
-#if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
-#define CONFIG_SYS_RAMBOOT
-#else
-#undef CONFIG_SYS_RAMBOOT
-#endif
-
 #define CONFIG_SYS_MONITOR_LEN (512 * 1024) /* Reserve 512 kB for Mon */
 
 /*
@@ -148,15 +141,6 @@
 #define CONFIG_SYS_FLASH_BASE          0xFE000000 /* FLASH base address */
 #define CONFIG_SYS_FLASH_SIZE          8 /* max FLASH size is 32M */
 
-#define CONFIG_SYS_FLASH_EMPTY_INFO            /* display empty sectors */
-
-
-#define CONFIG_SYS_MAX_FLASH_SECT      256 /* max sectors per device */
-
-#undef CONFIG_SYS_FLASH_CHECKSUM
-#define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
-#define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
-
 /*
  * NAND Flash on the Local Bus
  */
@@ -198,43 +182,15 @@
  * General PCI
  * Addresses are mapped 1-1.
  */
-#define CONFIG_SYS_PCI_MEM_BASE                0x80000000
-#define CONFIG_SYS_PCI_MEM_PHYS                CONFIG_SYS_PCI_MEM_BASE
-#define CONFIG_SYS_PCI_MEM_SIZE                0x10000000 /* 256M */
-#define CONFIG_SYS_PCI_MMIO_BASE       0x90000000
-#define CONFIG_SYS_PCI_MMIO_PHYS       CONFIG_SYS_PCI_MMIO_BASE
-#define CONFIG_SYS_PCI_MMIO_SIZE       0x10000000 /* 256M */
-#define CONFIG_SYS_PCI_IO_BASE         0x00000000
-#define CONFIG_SYS_PCI_IO_PHYS         0xE0300000
-#define CONFIG_SYS_PCI_IO_SIZE         0x100000 /* 1M */
-
-#define CONFIG_SYS_PCI_SLV_MEM_LOCAL   CONFIG_SYS_SDRAM_BASE
-#define CONFIG_SYS_PCI_SLV_MEM_BUS     0x00000000
-#define CONFIG_SYS_PCI_SLV_MEM_SIZE    0x80000000
-
-#define CONFIG_SYS_PCIE1_BASE          0xA0000000
 #define CONFIG_SYS_PCIE1_CFG_BASE      0xA0000000
 #define CONFIG_SYS_PCIE1_CFG_SIZE      0x08000000
-#define CONFIG_SYS_PCIE1_MEM_BASE      0xA8000000
 #define CONFIG_SYS_PCIE1_MEM_PHYS      0xA8000000
-#define CONFIG_SYS_PCIE1_MEM_SIZE      0x10000000
-#define CONFIG_SYS_PCIE1_IO_BASE       0x00000000
 #define CONFIG_SYS_PCIE1_IO_PHYS       0xB8000000
-#define CONFIG_SYS_PCIE1_IO_SIZE       0x00800000
 
-#define CONFIG_SYS_PCIE2_BASE          0xC0000000
 #define CONFIG_SYS_PCIE2_CFG_BASE      0xC0000000
 #define CONFIG_SYS_PCIE2_CFG_SIZE      0x08000000
-#define CONFIG_SYS_PCIE2_MEM_BASE      0xC8000000
 #define CONFIG_SYS_PCIE2_MEM_PHYS      0xC8000000
-#define CONFIG_SYS_PCIE2_MEM_SIZE      0x10000000
-#define CONFIG_SYS_PCIE2_IO_BASE       0x00000000
 #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
@@ -255,7 +211,6 @@
 
 #ifdef CONFIG_TSEC2
 #define CONFIG_TSEC2_NAME              "TSEC1"
-#define CONFIG_SYS_TSEC2_OFFSET                0x25000
 #define TSEC2_PHY_ADDR                 0x1c
 #define TSEC2_FLAGS                    (TSEC_GIGABIT | TSEC_REDUCED)
 #define TSEC2_PHYIDX                   0
@@ -263,22 +218,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
  */
 
@@ -300,15 +239,11 @@
  * the maximum mapped by the Linux kernel during initialization.
  */
 #define CONFIG_SYS_BOOTMAPSZ   (256 << 20) /* Initial Memory map for Linux */
-#define CONFIG_SYS_BOOTM_LEN   (64 << 20)      /* Increase max gunzip size */
 
 /*
  * Environment Configuration
  */
 
-#define CONFIG_HAS_FSL_DR_USB
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
-
 #define CONFIG_NETDEV          "eth1"
 
 #define CONFIG_HOSTNAME                "mpc837x_rdb"