diff options
| author | Tom Rini <trini@ti.com> | 2012-12-20 07:30:27 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-12-20 07:30:27 -0700 |
| commit | e3c52f2b8779469c843eb79282396f1a5ca3fef5 (patch) | |
| tree | 8b08fdd16e5ec5ca83c047de71e9e3060c326281 /tools/env | |
| parent | 46dc5bcade4e6d26dfe44baf644c8dca70717917 (diff) | |
| download | talos-obmc-uboot-e3c52f2b8779469c843eb79282396f1a5ca3fef5.tar.gz talos-obmc-uboot-e3c52f2b8779469c843eb79282396f1a5ca3fef5.zip | |
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>
Diffstat (limited to 'tools/env')
| -rw-r--r-- | tools/env/Makefile | 11 | ||||
| -rw-r--r-- | tools/env/fw_env.h | 25 |
2 files changed, 26 insertions, 10 deletions
diff --git a/tools/env/Makefile b/tools/env/Makefile index e6dc5f32fc..0e798e0940 100644 --- a/tools/env/Makefile +++ b/tools/env/Makefile @@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk 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 @@ HOSTCPPFLAGS = -idirafter $(SRCTREE)/include \ -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 19703c7033..a1a6807445 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[]); |
