From: Matwey V. Kornilov <matwey.kornilov@gmail.com>
Date: Thu, 29 Oct 2015 18:54:15 +0000 (+0300)
Subject: configs: Use config_distro_defaults.h in ti_armv7_common.h
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=755324c432f62306487786f89efce96398291a03;p=u-boot.git

configs: Use config_distro_defaults.h in ti_armv7_common.h

CONFIG_BOOTDELAY is defined in config_distro_defaults.h

Signed-off-by: Matwey V. Kornilov <matwey.kornilov@gmail.com>
[trini: Drop omap3_logic.h settings which were a warning and no longer
        correct usage].
Signed-off-by: Tom Rini <trini@konsulko.com>
---

diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
index ecd5615859..7b60f29bd2 100644
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -272,13 +272,4 @@
 
 #endif /* (CONFIG_CMD_NET) */
 
-/*
- * BOOTP fields
- */
-
-#define CONFIG_BOOTP_SUBNETMASK		0x00000001
-#define CONFIG_BOOTP_GATEWAY		0x00000002
-#define CONFIG_BOOTP_HOSTNAME		0x00000004
-#define CONFIG_BOOTP_BOOTPATH		0x00000010
-
 #endif /* __CONFIG_H */
diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
index 32bb805f78..7810dd6c30 100644
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -66,11 +66,6 @@
 		"root=PARTUUID=${uuid} rw " \
 		"rootfstype=${mmcrootfstype}\0"
 
-/*
- * Default to a quick boot delay.
- */
-#define CONFIG_BOOTDELAY		1
-
 /*
  * DDR information.  If the CONFIG_NR_DRAM_BANKS is not defined,
  * we say (for simplicity) that we have 1 bank, always, even when
@@ -288,4 +283,6 @@
 #define NETARGS ""
 #endif
 
+#include <config_distro_defaults.h>
+
 #endif	/* __CONFIG_TI_ARMV7_COMMON_H__ */