Skip to content

Commit

Permalink
kbuild: move asm-offsets.h rules to ./Kbuild
Browse files Browse the repository at this point in the history
Generate include/generated/generic-asm-offsets.h and
include/generated/asm-offsets.h in ./Kbuild.

This commit also changes the include guard.

Before this commit, __ASM_OFFSETS_H__ was used for both of them.
So we could not include generic-asm-offsets.h and asm-offsets.h
at the same time.

This commit renames the include guard of the former to
__GENERIC_ASM_OFFSETS_H__.

Signed-off-by: Masahiro Yamada <[email protected]>
  • Loading branch information
masahir0y authored and trini committed Feb 25, 2014
1 parent 6378008 commit 6a44d80
Showing 3 changed files with 89 additions and 61 deletions.
87 changes: 87 additions & 0 deletions Kbuild
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
#
# Kbuild for top-level directory of U-Boot
# This file takes care of the following:
# 1) Generate generic-asm-offsets.h
# 2) Generate asm-offsets.h

#####
# 1) Generate generic-asm-offsets.h

generic-offsets-file := include/generated/generic-asm-offsets.h

always := $(generic-offsets-file)
targets := $(generic-offsets-file) lib/asm-offsets.s

quiet_cmd_generic-offsets = GEN $@
define cmd_generic-offsets
(set -e; \
echo "#ifndef __GENERIC_ASM_OFFSETS_H__"; \
echo "#define __GENERIC_ASM_OFFSETS_H__"; \
echo "/*"; \
echo " * DO NOT MODIFY."; \
echo " *"; \
echo " * This file was generated by Kbuild"; \
echo " *"; \
echo " */"; \
echo ""; \
sed -ne $(sed-y) $<; \
echo ""; \
echo "#endif" ) > $@
endef

# We use internal kbuild rules to avoid the "is up to date" message from make
lib/asm-offsets.s: lib/asm-offsets.c FORCE
$(Q)mkdir -p $(dir $@)
$(call if_changed_dep,cc_s_c)

$(obj)/$(generic-offsets-file): lib/asm-offsets.s Kbuild
$(Q)mkdir -p $(dir $@)
$(call cmd,generic-offsets)

#####
# 2) Generate asm-offsets.h
#

ifneq ($(wildcard $(srctree)/$(CPUDIR)/$(SOC)/asm-offsets.c),)
offsets-file := include/generated/asm-offsets.h
endif

always += $(offsets-file)
targets += $(offsets-file)
targets += $(CPUDIR)/$(SOC)/asm-offsets.s


# Default sed regexp - multiline due to syntax constraints
define sed-y
"/^->/{s:->#\(.*\):/* \1 */:; \
s:^->\([^ ]*\) [\$$#]*\([-0-9]*\) \(.*\):#define \1 \2 /* \3 */:; \
s:^->\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; \
s:->::; p;}"
endef

CFLAGS_asm-offsets.o := -DDO_DEPS_ONLY

quiet_cmd_offsets = GEN $@
define cmd_offsets
(set -e; \
echo "#ifndef __ASM_OFFSETS_H__"; \
echo "#define __ASM_OFFSETS_H__"; \
echo "/*"; \
echo " * DO NOT MODIFY."; \
echo " *"; \
echo " * This file was generated by Kbuild"; \
echo " *"; \
echo " */"; \
echo ""; \
sed -ne $(sed-y) $<; \
echo ""; \
echo "#endif" ) > $@
endef

# We use internal kbuild rules to avoid the "is up to date" message from make
$(CPUDIR)/$(SOC)/asm-offsets.s: $(CPUDIR)/$(SOC)/asm-offsets.c FORCE
$(Q)mkdir -p $(dir $@)
$(call if_changed_dep,cc_s_c)

$(obj)/$(offsets-file): $(CPUDIR)/$(SOC)/asm-offsets.s
$(call cmd,offsets)
36 changes: 2 additions & 34 deletions Makefile
Original file line number Diff line number Diff line change
@@ -988,9 +988,8 @@ prepare1: prepare2 $(version_h) $(timestamp_h)

archprepare: prepare1 scripts_basic

prepare0: archprepare FORCE include/generated/generic-asm-offsets.h \
include/generated/asm-offsets.h
@:
prepare0: archprepare FORCE
$(Q)$(MAKE) $(build)=.

# All the preparing..
prepare: prepare0
@@ -1115,37 +1114,6 @@ checkdtc:
false; \
fi

quiet_cmd_offsets = GEN $@
cmd_offsets = $(srctree)/tools/scripts/make-asm-offsets $< $@

include/generated/generic-asm-offsets.h: lib/asm-offsets.s
$(call cmd,offsets)

quiet_cmd_asm-offsets.s = CC $@
cmd_asm-offsets.s = mkdir -p lib; \
$(CC) -DDO_DEPS_ONLY \
$(c_flags) $(CFLAGS_$(BCURDIR)/$(@F)) $(CFLAGS_$(BCURDIR)) \
-o $@ $< -c -S

lib/asm-offsets.s: $(srctree)/lib/asm-offsets.c include/config.h
$(call cmd,asm-offsets.s)

include/generated/asm-offsets.h: $(CPUDIR)/$(SOC)/asm-offsets.s
$(call cmd,offsets)

quiet_cmd_soc_asm-offsets.s = CC $@
cmd_soc_asm-offsets.s = mkdir -p $(CPUDIR)/$(SOC); \
if [ -f $(srctree)/$(CPUDIR)/$(SOC)/asm-offsets.c ];then \
$(CC) -DDO_DEPS_ONLY \
$(c_flags) $(CFLAGS_$(BCURDIR)/$(@F)) $(CFLAGS_$(BCURDIR)) \
-o $@ $(srctree)/$(CPUDIR)/$(SOC)/asm-offsets.c -c -S; \
else \
touch $@; \
fi

$(CPUDIR)/$(SOC)/asm-offsets.s: include/config.h
$(call cmd,soc_asm-offsets.s)

#########################################################################

# ARM relocations should all be R_ARM_RELATIVE (32-bit) or
27 changes: 0 additions & 27 deletions tools/scripts/make-asm-offsets

This file was deleted.

0 comments on commit 6a44d80

Please sign in to comment.