| 1 |
hwoarang 13/09/27 21:49:31 |
| 2 |
|
| 3 |
Added: u-boot-no-config.h.patch |
| 4 |
Log: |
| 5 |
Version bump |
| 6 |
|
| 7 |
(Portage version: 2.2.6/cvs/Linux x86_64, signed Manifest commit with key C2BA7F3C!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-embedded/u-boot-tools/files/u-boot-no-config.h.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/u-boot-tools/files/u-boot-no-config.h.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/u-boot-tools/files/u-boot-no-config.h.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: u-boot-no-config.h.patch |
| 16 |
=================================================================== |
| 17 |
This patch has been reverted later on by |
| 18 |
http://git.denx.de/?p=u-boot.git;a=commit;h=e3c52f2b8779469c843eb79282396f1a5ca3fef5 |
| 19 |
|
| 20 |
but we still need it to build the tools without having to configure |
| 21 |
a full u-boot environment. |
| 22 |
|
| 23 |
Signed-off-by: Markos Chandras <hwoarang@g.o> |
| 24 |
|
| 25 |
From: Mike Frysinger <vapier@g.o> |
| 26 |
Date: Sat, 10 Nov 2012 19:47:47 +0000 (+0000) |
| 27 |
Subject: fw_env: fix building w/out a config.h |
| 28 |
X-Git-Tag: v2013.01-rc3~19 |
| 29 |
X-Git-Url: http://git.denx.de/?p=u-boot.git;a=commitdiff_plain;h=92ace272d06cec1d7f1533bb9edf914fb5845fba;hp=7a546db2ffc6a713fb8009d8246c29da5420f6a7 |
| 30 |
|
| 31 |
fw_env: fix building w/out a config.h |
| 32 |
|
| 33 |
Signed-off-by: Mike Frysinger <vapier@g.o> |
| 34 |
Acked-by: Peter Korsgaard <jacmet@×××××××.dk> |
| 35 |
--- |
| 36 |
|
| 37 |
diff --git a/tools/env/Makefile b/tools/env/Makefile |
| 38 |
index 0e798e0..e6dc5f3 100644 |
| 39 |
--- a/tools/env/Makefile |
| 40 |
+++ b/tools/env/Makefile |
| 41 |
@@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk |
| 42 |
HOSTSRCS := $(SRCTREE)/lib/crc32.c fw_env.c fw_env_main.c |
| 43 |
HOSTSRCS += $(SRCTREE)/lib/ctype.c $(SRCTREE)/lib/linux_string.c |
| 44 |
HOSTSRCS += $(SRCTREE)/common/env_attr.c $(SRCTREE)/common/env_flags.c |
| 45 |
-HEADERS := fw_env.h $(OBJTREE)/include/config.h |
| 46 |
+HEADERS := fw_env.h |
| 47 |
|
| 48 |
# Compile for a hosted environment on the target |
| 49 |
HOSTCPPFLAGS = -idirafter $(SRCTREE)/include \ |
| 50 |
@@ -36,6 +36,15 @@ HOSTCPPFLAGS = -idirafter $(SRCTREE)/include \ |
| 51 |
-DUSE_HOSTCC \ |
| 52 |
-DTEXT_BASE=$(TEXT_BASE) |
| 53 |
|
| 54 |
+# Pass CONFIG_xxx settings via the command line so that we can build w/out |
| 55 |
+# a config.h file existing in the first place. Useful for generic builds. |
| 56 |
+CONFIG_VARS_TO_PASS = \ |
| 57 |
+ ENV_OVERWRITE \ |
| 58 |
+ OVERWRITE_ETHADDR_ONCE \ |
| 59 |
+ ETHADDR |
| 60 |
+HOSTCPPFLAGS += \ |
| 61 |
+ $(foreach x,$(CONFIG_VARS_TO_PASS),$(if $(CONFIG_$(x)),-DCONFIG_$(x)=$(CONFIG_$(x)))) |
| 62 |
+ |
| 63 |
ifeq ($(MTD_VERSION),old) |
| 64 |
HOSTCPPFLAGS += -DMTD_OLD |
| 65 |
endif |
| 66 |
diff --git a/tools/env/fw_env.h b/tools/env/fw_env.h |
| 67 |
index a1a6807..19703c7 100644 |
| 68 |
--- a/tools/env/fw_env.h |
| 69 |
+++ b/tools/env/fw_env.h |
| 70 |
@@ -21,15 +21,6 @@ |
| 71 |
* MA 02111-1307 USA |
| 72 |
*/ |
| 73 |
|
| 74 |
-/* Pull in the current config to define the default environment */ |
| 75 |
-#ifndef __ASSEMBLY__ |
| 76 |
-#define __ASSEMBLY__ /* get only #defines from config.h */ |
| 77 |
-#include <config.h> |
| 78 |
-#undef __ASSEMBLY__ |
| 79 |
-#else |
| 80 |
-#include <config.h> |
| 81 |
-#endif |
| 82 |
- |
| 83 |
/* |
| 84 |
* To build the utility with the static configuration |
| 85 |
* comment out the next line. |
| 86 |
@@ -52,22 +43,6 @@ |
| 87 |
#define DEVICE2_ENVSECTORS 2 |
| 88 |
#endif |
| 89 |
|
| 90 |
-#ifndef CONFIG_BAUDRATE |
| 91 |
-#define CONFIG_BAUDRATE 115200 |
| 92 |
-#endif |
| 93 |
- |
| 94 |
-#ifndef CONFIG_BOOTDELAY |
| 95 |
-#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ |
| 96 |
-#endif |
| 97 |
- |
| 98 |
-#ifndef CONFIG_BOOTCOMMAND |
| 99 |
-#define CONFIG_BOOTCOMMAND \ |
| 100 |
- "bootp; " \ |
| 101 |
- "setenv bootargs root=/dev/nfs nfsroot=${serverip}:${rootpath} " \ |
| 102 |
- "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; " \ |
| 103 |
- "bootm" |
| 104 |
-#endif |
| 105 |
- |
| 106 |
extern int fw_printenv(int argc, char *argv[]); |
| 107 |
extern char *fw_getenv (char *name); |
| 108 |
extern int fw_setenv (int argc, char *argv[]); |
Archives