Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-19 19:34:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kbuild, tools: generate wrapper C sources automatically by Makefile

Browse source 
There are many source files shared between U-boot image and tools.
Instead of adding a lot of dummy wrapper files that just include
the corresponding file in lib/ or common/ directory,
Makefile should automatically generate them.

The original inspiration for this came from
scripts/Makefile.asm-generic of Linux Kernel.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Masahiro Yamada 2014-06-06 14:04:32 +09:00 • committed by Tom Rini
parent 4a36be9bdb
commit ad80c4a322
19 changed files with 26 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tools/.gitignore vendored
View file

@ -21,3 +21,6 @@
/easylogo/easylogo /easylogo/easylogo
/gdb/gdbcont /gdb/gdbcont
/gdb/gdbsend /gdb/gdbsend
/lib/
/common/

36
tools/Makefile
View file

@ -47,7 +47,7 @@ hostprogs-$(CONFIG_VIDEO_LOGO) += bmp_logo$(SFX)
HOSTCFLAGS_bmp_logo$(SFX).o := -pedantic HOSTCFLAGS_bmp_logo$(SFX).o := -pedantic
hostprogs-$(CONFIG_BUILD_ENVCRC) += envcrc$(SFX) hostprogs-$(CONFIG_BUILD_ENVCRC) += envcrc$(SFX)
envcrc$(SFX)-objs := crc32.o env_embedded.o envcrc.o sha1.o envcrc$(SFX)-objs := envcrc.o lib/crc32.o common/env_embedded.o lib/sha1.o
hostprogs-$(CONFIG_CMD_NET) += gen_eth_addr$(SFX) hostprogs-$(CONFIG_CMD_NET) += gen_eth_addr$(SFX)
HOSTCFLAGS_gen_eth_addr$(SFX).o := -pedantic HOSTCFLAGS_gen_eth_addr$(SFX).o := -pedantic
@ -59,41 +59,43 @@ hostprogs-$(CONFIG_XWAY_SWAP_BYTES) += xway-swap-bytes$(SFX)
HOSTCFLAGS_xway-swap-bytes$(SFX).o := -pedantic HOSTCFLAGS_xway-swap-bytes$(SFX).o := -pedantic
hostprogs-y += mkenvimage$(SFX) hostprogs-y += mkenvimage$(SFX)
mkenvimage$(SFX)-objs := crc32.o mkenvimage.o os_support.o mkenvimage$(SFX)-objs := mkenvimage.o os_support.o lib/crc32.o
hostprogs-y += dumpimage$(SFX) mkimage$(SFX) hostprogs-y += dumpimage$(SFX) mkimage$(SFX)
hostprogs-$(CONFIG_FIT_SIGNATURE) += fit_info$(SFX) fit_check_sign$(SFX) hostprogs-$(CONFIG_FIT_SIGNATURE) += fit_info$(SFX) fit_check_sign$(SFX)
FIT_SIG_OBJS-$(CONFIG_FIT_SIGNATURE) := image-sig.o FIT_SIG_OBJS-$(CONFIG_FIT_SIGNATURE) := common/image-sig.o
# Flattened device tree objects # Flattened device tree objects
LIBFDT_OBJS := fdt.o fdt_ro.o fdt_rw.o fdt_strerror.o fdt_wip.o LIBFDT_OBJS := $(addprefix lib/libfdt/, \
RSA_OBJS-$(CONFIG_FIT_SIGNATURE) := rsa-sign.o rsa-verify.o rsa-checksum.o fdt.o fdt_ro.o fdt_rw.o fdt_strerror.o fdt_wip.o)
RSA_OBJS-$(CONFIG_FIT_SIGNATURE) := $(addprefix lib/rsa/, \
rsa-sign.o rsa-verify.o rsa-checksum.o)
# common objs for dumpimage and mkimage # common objs for dumpimage and mkimage
dumpimage-mkimage-objs := aisimage.o \ dumpimage-mkimage-objs := aisimage.o \
atmelimage.o \ atmelimage.o \
$(FIT_SIG_OBJS-y) \ $(FIT_SIG_OBJS-y) \
crc32.o \ lib/crc32.o \
default_image.o \ default_image.o \
fdtdec.o \ lib/fdtdec.o \
fit_common.o \ fit_common.o \
fit_image.o \ fit_image.o \
gpimage.o \ gpimage.o \
gpimage-common.o \ gpimage-common.o \
image-fit.o \ common/image-fit.o \
image-host.o \ image-host.o \
image.o \ common/image.o \
imagetool.o \ imagetool.o \
imximage.o \ imximage.o \
kwbimage.o \ kwbimage.o \
md5.o \ lib/md5.o \
mxsimage.o \ mxsimage.o \
omapimage.o \ omapimage.o \
os_support.o \ os_support.o \
pblimage.o \ pblimage.o \
pbl_crc32.o \ pbl_crc32.o \
sha1.o \ lib/sha1.o \
sha256.o \ lib/sha256.o \
ublimage.o \ ublimage.o \
$(LIBFDT_OBJS) \ $(LIBFDT_OBJS) \
$(RSA_OBJS-y) $(RSA_OBJS-y)
@ -139,7 +141,7 @@ hostprogs-$(CONFIG_SUNXI) += mksunxiboot$(SFX)
hostprogs-$(CONFIG_NETCONSOLE) += ncb$(SFX) hostprogs-$(CONFIG_NETCONSOLE) += ncb$(SFX)
hostprogs-$(CONFIG_SHA1_CHECK_UB_IMG) += ubsha1$(SFX) hostprogs-$(CONFIG_SHA1_CHECK_UB_IMG) += ubsha1$(SFX)
ubsha1$(SFX)-objs := os_support.o sha1.o ubsha1.o ubsha1$(SFX)-objs := os_support.o ubsha1.o lib/sha1.o
HOSTCFLAGS_ubsha1.o := -pedantic HOSTCFLAGS_ubsha1.o := -pedantic
@ -159,6 +161,14 @@ HOSTCFLAGS_sha256.o := -pedantic
#hostprogs-$(CONFIG_PPC) += mpc86x_clk$(SFX) #hostprogs-$(CONFIG_PPC) += mpc86x_clk$(SFX)
#HOSTCFLAGS_mpc86x_clk$(SFX).o := -pedantic #HOSTCFLAGS_mpc86x_clk$(SFX).o := -pedantic
quiet_cmd_wrap = WRAP $@
cmd_wrap = echo "\#include <$(srctree)/$(patsubst $(obj)/%,%,$@)>" >$@
$(obj)/lib/%.c $(obj)/common/%.c:
$(call cmd,wrap)
clean-dirs := lib common
always := $(hostprogs-y) always := $(hostprogs-y)
# Generated LCD/video logo # Generated LCD/video logo

1
tools/crc32.c
View file

@ -1 +0,0 @@
#include "../lib/crc32.c"

1
tools/env_embedded.c
View file

@ -1 +0,0 @@
#include "../common/env_embedded.c"

1
tools/fdt.c
View file

@ -1 +0,0 @@
#include "../lib/libfdt/fdt.c"

1
tools/fdt_ro.c
View file

@ -1 +0,0 @@
#include "../lib/libfdt/fdt_ro.c"

1
tools/fdt_rw.c
View file

@ -1 +0,0 @@
#include "../lib/libfdt/fdt_rw.c"

1
tools/fdt_strerror.c
View file

@ -1 +0,0 @@
#include "../lib/libfdt/fdt_strerror.c"

1
tools/fdt_wip.c
View file

@ -1 +0,0 @@
#include "../lib/libfdt/fdt_wip.c"

1
tools/fdtdec.c
View file

@ -1 +0,0 @@
#include "../lib/fdtdec.c"

1
tools/image-fit.c
View file

@ -1 +0,0 @@
#include "../common/image-fit.c"

1
tools/image-sig.c
View file

@ -1 +0,0 @@
#include "../common/image-sig.c"

1
tools/image.c
View file

@ -1 +0,0 @@
#include "../common/image.c"

1
tools/md5.c
View file

@ -1 +0,0 @@
#include "../lib/md5.c"

1
tools/rsa-checksum.c
View file

@ -1 +0,0 @@
#include "../lib/rsa/rsa-checksum.c"

1
tools/rsa-sign.c
View file

@ -1 +0,0 @@
#include "../lib/rsa/rsa-sign.c"

1
tools/rsa-verify.c
View file

@ -1 +0,0 @@
#include "../lib/rsa/rsa-verify.c"

1
tools/sha1.c
View file

@ -1 +0,0 @@
#include "../lib/sha1.c"

1
tools/sha256.c
View file

@ -1 +0,0 @@
#include "../lib/sha256.c"