[U-Boot] [PATCH 1/3] image.h: avoid command.h for host tools
The u-boot command structures don't get used with host systems, so don't bother including it when building host code. This avoids an implicit need on config.h in the process.
Signed-off-by: Mike Frysinger vapier@gentoo.org --- include/image.h | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/include/image.h b/include/image.h index d2e78fe..8fc2636 100644 --- a/include/image.h +++ b/include/image.h @@ -46,11 +46,10 @@
#include <lmb.h> #include <asm/u-boot.h> +#include <command.h>
#endif /* USE_HOSTCC */
-#include <command.h> - #if defined(CONFIG_FIT) #include <fdt.h> #include <libfdt.h>
This code doesn't use any config.h defines, and the sha1.h header already declares a sha1_csum prototype.
Signed-off-by: Mike Frysinger vapier@gentoo.org --- tools/ubsha1.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/tools/ubsha1.c b/tools/ubsha1.c index 9774eea..625e13f 100644 --- a/tools/ubsha1.c +++ b/tools/ubsha1.c @@ -31,14 +31,6 @@ #include <sys/stat.h> #include "sha1.h"
-#ifndef __ASSEMBLY__ -#define __ASSEMBLY__ /* Dirty trick to get only #defines */ -#endif -#include <config.h> -#undef __ASSEMBLY__ - -extern void sha1_csum (unsigned char *input, int ilen, unsigned char output[20]); - int main (int argc, char **argv) { unsigned char output[20];
Dear Mike Frysinger,
In message 1264064602-24071-2-git-send-email-vapier@gentoo.org you wrote:
This code doesn't use any config.h defines, and the sha1.h header already declares a sha1_csum prototype.
Signed-off-by: Mike Frysinger vapier@gentoo.org
tools/ubsha1.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
It's useful to be able to build up the host tools without having to select a board first. Pretty much all tools in there are config-independent anyways.
Also add a shortcut "tools-all" to quickly build all host tools that are actually config-independent to allow for simple test builds.
Signed-off-by: Mike Frysinger vapier@gentoo.org --- Makefile | 9 +++++++-- tools/Makefile | 9 +++++++++ 2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile index 793fcec..2dc75ae 100644 --- a/Makefile +++ b/Makefile @@ -448,10 +448,15 @@ $(obj)include/autoconf.mk: $(obj)include/config.h else # !config.mk all $(obj)u-boot.hex $(obj)u-boot.srec $(obj)u-boot.bin \ $(obj)u-boot.img $(obj)u-boot.dis $(obj)u-boot \ -$(SUBDIRS) $(TIMESTAMP_FILE) $(VERSION_FILE) gdbtools updater env depend \ -dep tags ctags etags cscope $(obj)System.map: +$(filter-out tools,$(SUBDIRS)) $(TIMESTAMP_FILE) $(VERSION_FILE) gdbtools \ +updater env depend dep tags ctags etags cscope $(obj)System.map: @echo "System not configured - see README" >&2 @ exit 1 + +tools: + $(MAKE) -C tools +tools-all: + $(MAKE) -C tools HOST_TOOLS_ALL=y endif # config.mk
.PHONY : CHANGELOG diff --git a/tools/Makefile b/tools/Makefile index 5b8c3c3..d3b1518 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -38,6 +38,15 @@ endif # include $(TOPDIR)/config.mk
+# Enable all the config-independent tools +ifneq ($(HOST_TOOLS_ALL),) +CONFIG_LCD_LOGO = y +CONFIG_CMD_NET = y +CONFIG_INCA_IP = y +CONFIG_NETCONSOLE = y +CONFIG_SHA1_CHECK_UB_IMG = y +endif + # Generated executable files BIN_FILES-$(CONFIG_LCD_LOGO) += bmp_logo$(SFX) BIN_FILES-$(CONFIG_VIDEO_LOGO) += bmp_logo$(SFX)
Dear Mike Frysinger,
In message 1264064602-24071-3-git-send-email-vapier@gentoo.org you wrote:
It's useful to be able to build up the host tools without having to select a board first. Pretty much all tools in there are config-independent anyways.
Also add a shortcut "tools-all" to quickly build all host tools that are actually config-independent to allow for simple test builds.
Signed-off-by: Mike Frysinger vapier@gentoo.org
Makefile | 9 +++++++-- tools/Makefile | 9 +++++++++ 2 files changed, 16 insertions(+), 2 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
Dear Mike Frysinger,
In message 1264064602-24071-1-git-send-email-vapier@gentoo.org you wrote:
The u-boot command structures don't get used with host systems, so don't bother including it when building host code. This avoids an implicit need on config.h in the process.
Signed-off-by: Mike Frysinger vapier@gentoo.org
include/image.h | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
participants (2)
-
Mike Frysinger -
Wolfgang Denk