Convert CONFIG_USE_BOOTCOMMAND et al to Kconfig

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

diff --git a/include/configs/poplar.h b/include/configs/poplar.h
index 9a16eab..222a14b 100644 (file)
--- a/include/configs/poplar.h
+++ b/include/configs/poplar.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2017 Linaro
  *
@@ -5,8 +6,6 @@
  *
  * Configuration for Poplar 96boards CE. Parts were derived from other ARM
  * configurations.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef _POPLAR_H_
@@ -15,22 +14,16 @@
 #include <linux/sizes.h>
 
 /* DRAM banks */
-#define CONFIG_NR_DRAM_BANKS                   2
 
 /* SYS */
 #define CONFIG_SYS_BOOTM_LEN                   SZ_64M
 #define CONFIG_SYS_INIT_SP_ADDR                        0x200000
-#define CONFIG_SYS_LOAD_ADDR                   0x800000
-#define CONFIG_SYS_MALLOC_LEN                  SZ_32M
 
 /* ATF bl33.bin load address (must match) */
 
 /* USB configuration */
 #define CONFIG_USB_MAX_CONTROLLER_COUNT                2
 
-/* SD/MMC */
-#define CONFIG_BOUNCE_BUFFER
-
 /*****************************************************************************
  *  Initial environment variables
  *****************************************************************************/
@@ -46,7 +39,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,12 +49,6 @@
                        "ramdisk_addr_r=0x32400000\0"                   \
                        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
 #define CONFIG_SYS_MAXARGS             64