diff options
| author | Minkyu Kang <mk7.kang@samsung.com> | 2010-01-25 14:42:11 +0900 |
|---|---|---|
| committer | Minkyu Kang <mk7.kang@samsung.com> | 2010-01-25 14:42:11 +0900 |
| commit | ed44387f406ca0e695609270a1282e699111a945 (patch) | |
| tree | 6660c48863ede9c5f0207afce4b0ad93378076a8 /tools | |
| parent | 2fba7a08770586b342db367750a8447f21882d9a (diff) | |
| parent | 790af6ed08cc3675267191eb60403bd4f0d9a03c (diff) | |
| download | u-boot-imx-ed44387f406ca0e695609270a1282e699111a945.zip u-boot-imx-ed44387f406ca0e695609270a1282e699111a945.tar.gz u-boot-imx-ed44387f406ca0e695609270a1282e699111a945.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile | 9 | ||||
| -rw-r--r-- | tools/ubsha1.c | 8 |
2 files changed, 9 insertions, 8 deletions
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) 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]; |