X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fconfigs%2Fpoplar.h;h=6e8adf91877cd05f680b5b706f889b482ceb7099;hb=11910550b65e6072b9542d462c0aa93f4ca81836;hp=6def3691103c455e05099fce1518e4f936ca5ea6;hpb=8bbbd6337361cadad96b163bde4ae675752b7778;p=platform%2Fkernel%2Fu-boot.git

diff --git a/include/configs/poplar.h b/include/configs/poplar.h
index 6def369..6e8adf9 100644
--- a/include/configs/poplar.h
+++ b/include/configs/poplar.h
@@ -16,12 +16,10 @@
 /* DRAM banks */
 
 /* SYS */
-#define CONFIG_SYS_BOOTM_LEN			SZ_64M
 
 /* ATF bl33.bin load address (must match) */
 
 /* USB configuration */
-#define CONFIG_USB_MAX_CONTROLLER_COUNT		2
 
 /*****************************************************************************
  *  Initial environment variables
@@ -31,11 +29,9 @@
 					func(USB, usb, 0)		\
 					func(MMC, mmc, 0)		\
 					func(DHCP, dhcp, na)
-#ifndef CONFIG_SPL_BUILD
 #include <config_distro_bootcmd.h>
-#endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 			"loader_mmc_blknum=0x0\0"			\
 			"loader_mmc_nblks=0x780\0"			\
 			"env_mmc_blknum=0xf80\0"			\