forked from pool/u-boot
61 lines
1.7 KiB
Diff
61 lines
1.7 KiB
Diff
|
From 755324c432f62306487786f89efce96398291a03 Mon Sep 17 00:00:00 2001
|
||
|
|
From: "Matwey V. Kornilov" <matwey.kornilov@gmail.com>
|
||
|
|
Date: Thu, 29 Oct 2015 21:54:15 +0300
|
||
|
|
Subject: [PATCH] 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>
|
||
|
|
---
|
||
|
|
include/configs/omap3_logic.h | 9 ---------
|
||
|
|
include/configs/ti_armv7_common.h | 7 ++-----
|
||
|
|
2 files changed, 2 insertions(+), 14 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
|
||
|
|
index ecd5615..7b60f29 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 32bb805..7810dd6 100644
|
||
|
|
--- a/include/configs/ti_armv7_common.h
|
||
|
|
+++ b/include/configs/ti_armv7_common.h
|
||
|
|
@@ -67,11 +67,6 @@
|
||
|
|
"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
|
||
|
|
* we have more. We always start at 0x80000000, and we place the
|
||
|
|
@@ -288,4 +283,6 @@
|
||
|
|
#define NETARGS ""
|
||
|
|
#endif
|
||
|
|
|
||
|
|
+#include <config_distro_defaults.h>
|
||
|
|
+
|
||
|
|
#endif /* __CONFIG_TI_ARMV7_COMMON_H__ */
|
||
|
|
--
|
||
|
|
2.1.4
|
||
|
|
|