Merge tag 'u-boot-atmel-fixes-2019.07-a' of git://git.denx.de/u-boot-atmel

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

diff --git a/include/configs/poplar.h b/include/configs/poplar.h
index e0268290ce5efcc5b0c2031019e9024f7876e2ff..be9a0b51a96fa29cc4a43bc042910c4919ae38f4 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,7 +14,6 @@
 #include <linux/sizes.h>
 
 /* DRAM banks */
-#define CONFIG_NR_DRAM_BANKS                   2
 
 /* SYS */
 #define CONFIG_SYS_BOOTM_LEN                   SZ_64M
@@ -28,9 +26,6 @@
 /* USB configuration */
 #define CONFIG_USB_MAX_CONTROLLER_COUNT                2
 
-/* SD/MMC */
-#define CONFIG_BOUNCE_BUFFER
-
 /*****************************************************************************
  *  Initial environment variables
  *****************************************************************************/
@@ -40,14 +35,13 @@
                                        func(MMC, mmc, 0)               \
                                        func(DHCP, dhcp, na)
 #ifndef CONFIG_SPL_BUILD
-#include <config_distro_defaults.h>
 #include <config_distro_bootcmd.h>
 #endif
 
 #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"                   \
@@ -60,13 +54,10 @@
 
 /* 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 */
-#define CONFIG_ENV_VARS_UBOOT_CONFIG
+#define CONFIG_ENV_OFFSET              (0xf80 * 512) /* env_mmc_blknum bytes */
+#define CONFIG_ENV_SIZE                        (0x80 * 512)  /* env_mmc_nblks bytes */
 
 /* Monitor Command Prompt */
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_CBSIZE              512
 #define CONFIG_SYS_MAXARGS             64