Merge tag 'mips-pull-2020-06-29' of https://gitlab.denx.de/u-boot/custodians/u-boot...

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

diff --git a/include/configs/poplar.h b/include/configs/poplar.h
index be4c20a..2c7dc8b 100644 (file)
--- a/include/configs/poplar.h
+++ b/include/configs/poplar.h
@@ -14,7 +14,6 @@
 #include <linux/sizes.h>
 
 /* DRAM banks */
-#define CONFIG_NR_DRAM_BANKS                   2
 
 /* SYS */
 #define CONFIG_SYS_BOOTM_LEN                   SZ_64M
@@ -27,9 +26,6 @@
 /* USB configuration */
 #define CONFIG_USB_MAX_CONTROLLER_COUNT                2
 
-/* SD/MMC */
-#define CONFIG_BOUNCE_BUFFER
-
 /*****************************************************************************
  *  Initial environment variables
  *****************************************************************************/
@@ -45,7 +41,7 @@
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
                        "loader_mmc_blknum=0x0\0"                       \
                        "loader_mmc_nblks=0x780\0"                      \
-                       "env_mmc_blknum=0x780\0"                        \
+                       "env_mmc_blknum=0xf80\0"                        \
                        "env_mmc_nblks=0x80\0"                          \
                        "kernel_addr_r=0x30000000\0"                    \
                        "pxefile_addr_r=0x32000000\0"                   \
@@ -56,10 +52,7 @@
                        BOOTENV
 
 
-/* Command line configuration */
 #define CONFIG_SYS_MMC_ENV_DEV         0
-#define CONFIG_ENV_OFFSET              (0x780 * 512)   /* env_mmc_blknum */
-#define CONFIG_ENV_SIZE                        0x10000 /* env_mmc_nblks bytes */
 
 /* Monitor Command Prompt */
 #define CONFIG_SYS_CBSIZE              512