Revert "fw_env: fix building w/out a config.h"
I had missed Joe's NAK on this patch, so...
This reverts commit 92ace272d06cec1d7f1533bb9edf914fb5845fba.
Signed-off-by: Tom Rini <trini@ti.com>
diff --git a/tools/env/Makefile b/tools/env/Makefile
index e6dc5f3..0e798e0 100644
--- a/tools/env/Makefile
+++ b/tools/env/Makefile
@@ -26,7 +26,7 @@
HOSTSRCS := $(SRCTREE)/lib/crc32.c fw_env.c fw_env_main.c
HOSTSRCS += $(SRCTREE)/lib/ctype.c $(SRCTREE)/lib/linux_string.c
HOSTSRCS += $(SRCTREE)/common/env_attr.c $(SRCTREE)/common/env_flags.c
-HEADERS := fw_env.h
+HEADERS := fw_env.h $(OBJTREE)/include/config.h
# Compile for a hosted environment on the target
HOSTCPPFLAGS = -idirafter $(SRCTREE)/include \
@@ -36,15 +36,6 @@
-DUSE_HOSTCC \
-DTEXT_BASE=$(TEXT_BASE)
-# Pass CONFIG_xxx settings via the command line so that we can build w/out
-# a config.h file existing in the first place. Useful for generic builds.
-CONFIG_VARS_TO_PASS = \
- ENV_OVERWRITE \
- OVERWRITE_ETHADDR_ONCE \
- ETHADDR
-HOSTCPPFLAGS += \
- $(foreach x,$(CONFIG_VARS_TO_PASS),$(if $(CONFIG_$(x)),-DCONFIG_$(x)=$(CONFIG_$(x))))
-
ifeq ($(MTD_VERSION),old)
HOSTCPPFLAGS += -DMTD_OLD
endif
diff --git a/tools/env/fw_env.h b/tools/env/fw_env.h
index 19703c7..a1a6807 100644
--- a/tools/env/fw_env.h
+++ b/tools/env/fw_env.h
@@ -21,6 +21,15 @@
* MA 02111-1307 USA
*/
+/* Pull in the current config to define the default environment */
+#ifndef __ASSEMBLY__
+#define __ASSEMBLY__ /* get only #defines from config.h */
+#include <config.h>
+#undef __ASSEMBLY__
+#else
+#include <config.h>
+#endif
+
/*
* To build the utility with the static configuration
* comment out the next line.
@@ -43,6 +52,22 @@
#define DEVICE2_ENVSECTORS 2
#endif
+#ifndef CONFIG_BAUDRATE
+#define CONFIG_BAUDRATE 115200
+#endif
+
+#ifndef CONFIG_BOOTDELAY
+#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
+#endif
+
+#ifndef CONFIG_BOOTCOMMAND
+#define CONFIG_BOOTCOMMAND \
+ "bootp; " \
+ "setenv bootargs root=/dev/nfs nfsroot=${serverip}:${rootpath} " \
+ "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; " \
+ "bootm"
+#endif
+
extern int fw_printenv(int argc, char *argv[]);
extern char *fw_getenv (char *name);
extern int fw_setenv (int argc, char *argv[]);