summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/Makefile1
-rw-r--r--common/cmd_bootm.c2
-rw-r--r--common/cmd_load.c2
-rw-r--r--common/cmd_net.c2
4 files changed, 4 insertions, 3 deletions
diff --git a/common/Makefile b/common/Makefile
index 0a93462ea2..a42440a90c 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -52,6 +52,7 @@ COBJS-y += env_common.o
COBJS-$(CONFIG_ENV_IS_IN_DATAFLASH) += env_dataflash.o
COBJS-$(CONFIG_ENV_IS_IN_EEPROM) += env_eeprom.o
COBJS-$(CONFIG_ENV_IS_EMBEDDED) += env_embedded.o
+COBJS-$(CONFIG_ENV_IS_IN_FLASH) += env_embedded.o
COBJS-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o
COBJS-$(CONFIG_ENV_IS_IN_MG_DISK) += env_mgdisk.o
COBJS-$(CONFIG_ENV_IS_IN_NAND) += env_nand.o
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 6fdeef49a3..bd1813ad42 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -30,7 +30,7 @@
#include <command.h>
#include <image.h>
#include <malloc.h>
-#include <zlib.h>
+#include <u-boot/zlib.h>
#include <bzlib.h>
#include <environment.h>
#include <lmb.h>
diff --git a/common/cmd_load.c b/common/cmd_load.c
index d5eaac7351..2b5a66dd6f 100644
--- a/common/cmd_load.c
+++ b/common/cmd_load.c
@@ -518,7 +518,7 @@ int do_load_serial_bin (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
char *s;
if (((s = getenv("autoscript")) != NULL) && (strcmp(s,"yes") == 0)) {
- printf ("Running "source" command at addr 0x%08lX",
+ printf ("Running \"source\" command at addr 0x%08lX",
load_addr);
s = getenv ("autoscript_uname");
diff --git a/common/cmd_net.c b/common/cmd_net.c
index 9bef7a2049..92bbf85d11 100644
--- a/common/cmd_net.c
+++ b/common/cmd_net.c
@@ -224,7 +224,7 @@ netboot_common (proto_t proto, cmd_tbl_t *cmdtp, int argc, char *argv[])
#ifdef CONFIG_SOURCE
if (((s = getenv("autoscript")) != NULL) && (strcmp(s,"yes") == 0)) {
- printf ("Running "source" command at addr 0x%08lX",
+ printf ("Running \"source\" command at addr 0x%08lX",
load_addr);
s = getenv ("autoscript_uname");