Commit 95ddcd68ab54862f416815b9f8c4f584cc0108e2
Committed by
Tom Rini
1 parent
6a44d80634
Exists in
master
and in
49 other branches
kbuild: rename OBJCFLAGS to OBJCOPYFLAGS
Rename OBJCFLAGS to OBJCOPYFLAGS beforehand to use "cmd_objcopy" in scripts/Makefile.lib in an upcoming commit. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Showing 20 changed files with 41 additions and 41 deletions Side-by-side Diff
- Makefile
- arch/arm/config.mk
- arch/arm/cpu/pxa/config.mk
- arch/arm/imx-common/Makefile
- arch/mips/config.mk
- board/hymod/config.mk
- config.mk
- nand_spl/board/amcc/acadia/Makefile
- nand_spl/board/amcc/bamboo/Makefile
- nand_spl/board/amcc/canyonlands/Makefile
- nand_spl/board/amcc/kilauea/Makefile
- nand_spl/board/amcc/sequoia/Makefile
- nand_spl/board/freescale/mpc8315erdb/Makefile
- nand_spl/board/freescale/mpc8536ds/Makefile
- nand_spl/board/freescale/mpc8569mds/Makefile
- nand_spl/board/freescale/mpc8572ds/Makefile
- nand_spl/board/freescale/p1023rds/Makefile
- nand_spl/board/freescale/p1_p2_rdb/Makefile
- nand_spl/board/sheldon/simpc8313/Makefile
- spl/Makefile
Makefile
... | ... | @@ -753,13 +753,13 @@ |
753 | 753 | cat $^ >$@ |
754 | 754 | |
755 | 755 | u-boot.hex: u-boot |
756 | - $(OBJCOPY) ${OBJCFLAGS} -O ihex $< $@ | |
756 | + $(OBJCOPY) $(OBJCOPYFLAGS) -O ihex $< $@ | |
757 | 757 | |
758 | 758 | u-boot.srec: u-boot |
759 | - $(OBJCOPY) ${OBJCFLAGS} -O srec $< $@ | |
759 | + $(OBJCOPY) $(OBJCOPYFLAGS) -O srec $< $@ | |
760 | 760 | |
761 | 761 | u-boot.bin: u-boot |
762 | - $(OBJCOPY) ${OBJCFLAGS} -O binary $< $@ | |
762 | + $(OBJCOPY) $(OBJCOPYFLAGS) -O binary $< $@ | |
763 | 763 | $(call DO_STATIC_RELA,$<,$@,$(CONFIG_SYS_TEXT_BASE)) |
764 | 764 | $(BOARD_SIZE_CHECK) |
765 | 765 | |
766 | 766 | |
... | ... | @@ -769,10 +769,10 @@ |
769 | 769 | $(BOARD_SIZE_CHECK) |
770 | 770 | |
771 | 771 | u-boot.ldr.hex: u-boot.ldr |
772 | - $(OBJCOPY) ${OBJCFLAGS} -O ihex $< $@ -I binary | |
772 | + $(OBJCOPY) $(OBJCOPYFLAGS) -O ihex $< $@ -I binary | |
773 | 773 | |
774 | 774 | u-boot.ldr.srec: u-boot.ldr |
775 | - $(OBJCOPY) ${OBJCFLAGS} -O srec $< $@ -I binary | |
775 | + $(OBJCOPY) $(OBJCOPYFLAGS) -O srec $< $@ -I binary | |
776 | 776 | |
777 | 777 | # |
778 | 778 | # U-Boot entry point, needed for booting of full-blown U-Boot |
... | ... | @@ -810,7 +810,7 @@ |
810 | 810 | # $@ is output, $(1) and $(2) are inputs, $(3) is padded intermediate, |
811 | 811 | # $(4) is pad-to |
812 | 812 | SPL_PAD_APPEND = \ |
813 | - $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(4) -I binary -O binary \ | |
813 | + $(OBJCOPY) $(OBJCOPYFLAGS) --pad-to=$(4) -I binary -O binary \ | |
814 | 814 | $(1) $(3); \ |
815 | 815 | cat $(3) $(2) > $@; \ |
816 | 816 | rm $(3) |
... | ... | @@ -845,7 +845,7 @@ |
845 | 845 | -e $(CONFIG_SPL_TEXT_BASE) \ |
846 | 846 | -d spl/u-boot-spl.bin \ |
847 | 847 | spl/u-boot-spl.ais |
848 | - $(OBJCOPY) ${OBJCFLAGS} -I binary \ | |
848 | + $(OBJCOPY) $(OBJCOPYFLAGS) -I binary \ | |
849 | 849 | --pad-to=$(CONFIG_SPL_MAX_SIZE) -O binary \ |
850 | 850 | spl/u-boot-spl.ais spl/u-boot-spl-pad.ais |
851 | 851 | cat spl/u-boot-spl-pad.ais u-boot.img > u-boot.ais |
... | ... | @@ -870,7 +870,7 @@ |
870 | 870 | |
871 | 871 | ifneq ($(CONFIG_TEGRA),) |
872 | 872 | u-boot-nodtb-tegra.bin: spl/u-boot-spl.bin u-boot.bin |
873 | - $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(CONFIG_SYS_TEXT_BASE) -O binary spl/u-boot-spl spl/u-boot-spl-pad.bin | |
873 | + $(OBJCOPY) $(OBJCOPYFLAGS) --pad-to=$(CONFIG_SYS_TEXT_BASE) -O binary spl/u-boot-spl spl/u-boot-spl-pad.bin | |
874 | 874 | cat spl/u-boot-spl-pad.bin u-boot.bin > $@ |
875 | 875 | rm spl/u-boot-spl-pad.bin |
876 | 876 |
arch/arm/config.mk
... | ... | @@ -108,8 +108,8 @@ |
108 | 108 | |
109 | 109 | # limit ourselves to the sections we want in the .bin. |
110 | 110 | ifdef CONFIG_ARM64 |
111 | -OBJCFLAGS += -j .text -j .rodata -j .data -j .u_boot_list -j .rela.dyn | |
111 | +OBJCOPYFLAGS += -j .text -j .rodata -j .data -j .u_boot_list -j .rela.dyn | |
112 | 112 | else |
113 | -OBJCFLAGS += -j .text -j .rodata -j .hash -j .data -j .got.plt -j .u_boot_list -j .rel.dyn | |
113 | +OBJCOPYFLAGS += -j .text -j .rodata -j .hash -j .data -j .got.plt -j .u_boot_list -j .rel.dyn | |
114 | 114 | endif |
arch/arm/cpu/pxa/config.mk
arch/arm/imx-common/Makefile
... | ... | @@ -36,7 +36,7 @@ |
36 | 36 | -e $(CONFIG_SPL_TEXT_BASE) -d $< $@ |
37 | 37 | |
38 | 38 | $(OBJTREE)/u-boot-with-spl.imx: $(OBJTREE)/SPL $(OBJTREE)/u-boot.bin |
39 | - $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(CONFIG_SPL_PAD_TO) \ | |
39 | + $(OBJCOPY) $(OBJCOPYFLAGS) --pad-to=$(CONFIG_SPL_PAD_TO) \ | |
40 | 40 | -I binary -O binary $< $(OBJTREE)/spl/u-boot-spl-pad.imx |
41 | 41 | $(OBJTREE)/tools/mkimage -A arm -O U-Boot -a $(CONFIG_SYS_TEXT_BASE) \ |
42 | 42 | -e $(CONFIG_SYS_TEXT_BASE) -C none -d $(OBJTREE)/u-boot.bin \ |
... | ... | @@ -48,7 +48,7 @@ |
48 | 48 | (echo -ne '\x00\x00\x00\x00\x46\x43\x42\x20\x01' && \ |
49 | 49 | dd bs=1015 count=1 if=/dev/zero 2>/dev/null) | \ |
50 | 50 | cat - $< > $(OBJTREE)/spl/u-boot-nand-spl.imx |
51 | - $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(CONFIG_SPL_PAD_TO) \ | |
51 | + $(OBJCOPY) $(OBJCOPYFLAGS) --pad-to=$(CONFIG_SPL_PAD_TO) \ | |
52 | 52 | -I binary -O binary $(OBJTREE)/spl/u-boot-nand-spl.imx \ |
53 | 53 | $(OBJTREE)/spl/u-boot-nand-spl-pad.imx |
54 | 54 | rm $(OBJTREE)/spl/u-boot-nand-spl.imx |
arch/mips/config.mk
board/hymod/config.mk
config.mk
nand_spl/board/amcc/acadia/Makefile
... | ... | @@ -28,10 +28,10 @@ |
28 | 28 | $(nandobj)System.map |
29 | 29 | |
30 | 30 | $(nandobj)u-boot-spl-16k.bin: $(nandobj)u-boot-spl |
31 | - $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(PAD_TO) -O binary $< $@ | |
31 | + $(OBJCOPY) $(OBJCOPYFLAGS) --pad-to=$(PAD_TO) -O binary $< $@ | |
32 | 32 | |
33 | 33 | $(nandobj)u-boot-spl.bin: $(nandobj)u-boot-spl |
34 | - $(OBJCOPY) ${OBJCFLAGS} -O binary $< $@ | |
34 | + $(OBJCOPY) $(OBJCOPYFLAGS) -O binary $< $@ | |
35 | 35 | |
36 | 36 | $(nandobj)u-boot-spl: $(OBJS) $(nandobj)u-boot.lds |
37 | 37 | cd $(LNDIR) && $(LD) $(LDFLAGS) $(__OBJS) $(PLATFORM_LIBS) \ |
nand_spl/board/amcc/bamboo/Makefile
... | ... | @@ -27,10 +27,10 @@ |
27 | 27 | all: $(nandobj)u-boot-spl.bin $(nandobj)u-boot-spl-16k.bin |
28 | 28 | |
29 | 29 | $(nandobj)u-boot-spl-16k.bin: $(nandobj)u-boot-spl |
30 | - $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(PAD_TO) -O binary $< $@ | |
30 | + $(OBJCOPY) $(OBJCOPYFLAGS) --pad-to=$(PAD_TO) -O binary $< $@ | |
31 | 31 | |
32 | 32 | $(nandobj)u-boot-spl.bin: $(nandobj)u-boot-spl |
33 | - $(OBJCOPY) ${OBJCFLAGS} -O binary $< $@ | |
33 | + $(OBJCOPY) $(OBJCOPYFLAGS) -O binary $< $@ | |
34 | 34 | |
35 | 35 | $(nandobj)u-boot-spl: $(OBJS) $(nandobj)u-boot.lds |
36 | 36 | cd $(LNDIR) && $(LD) $(LDFLAGS) $(__OBJS) $(PLATFORM_LIBS) \ |
nand_spl/board/amcc/canyonlands/Makefile
... | ... | @@ -32,10 +32,10 @@ |
32 | 32 | all: $(nandobj)u-boot-spl.bin $(nandobj)u-boot-spl-16k.bin |
33 | 33 | |
34 | 34 | $(nandobj)u-boot-spl-16k.bin: $(nandobj)u-boot-spl |
35 | - $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(PAD_TO) -O binary $< $@ | |
35 | + $(OBJCOPY) $(OBJCOPYFLAGS) --pad-to=$(PAD_TO) -O binary $< $@ | |
36 | 36 | |
37 | 37 | $(nandobj)u-boot-spl.bin: $(nandobj)u-boot-spl |
38 | - $(OBJCOPY) ${OBJCFLAGS} -O binary $< $@ | |
38 | + $(OBJCOPY) $(OBJCOPYFLAGS) -O binary $< $@ | |
39 | 39 | |
40 | 40 | $(nandobj)u-boot-spl: $(OBJS) $(nandobj)u-boot.lds |
41 | 41 | cd $(LNDIR) && $(LD) $(LDFLAGS) $(__OBJS) $(PLATFORM_LIBS) \ |
nand_spl/board/amcc/kilauea/Makefile
... | ... | @@ -27,10 +27,10 @@ |
27 | 27 | all: $(nandobj)u-boot-spl.bin $(nandobj)u-boot-spl-16k.bin |
28 | 28 | |
29 | 29 | $(nandobj)u-boot-spl-16k.bin: $(nandobj)u-boot-spl |
30 | - $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(PAD_TO) -O binary $< $@ | |
30 | + $(OBJCOPY) $(OBJCOPYFLAGS) --pad-to=$(PAD_TO) -O binary $< $@ | |
31 | 31 | |
32 | 32 | $(nandobj)u-boot-spl.bin: $(nandobj)u-boot-spl |
33 | - $(OBJCOPY) ${OBJCFLAGS} -O binary $< $@ | |
33 | + $(OBJCOPY) $(OBJCOPYFLAGS) -O binary $< $@ | |
34 | 34 | |
35 | 35 | $(nandobj)u-boot-spl: $(OBJS) $(nandobj)u-boot.lds |
36 | 36 | cd $(LNDIR) && $(LD) $(LDFLAGS) $(__OBJS) $(PLATFORM_LIBS) \ |
nand_spl/board/amcc/sequoia/Makefile
... | ... | @@ -27,10 +27,10 @@ |
27 | 27 | all: $(nandobj)u-boot-spl.bin $(nandobj)u-boot-spl-16k.bin |
28 | 28 | |
29 | 29 | $(nandobj)u-boot-spl-16k.bin: $(nandobj)u-boot-spl |
30 | - $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(PAD_TO) -O binary $< $@ | |
30 | + $(OBJCOPY) $(OBJCOPYFLAGS) --pad-to=$(PAD_TO) -O binary $< $@ | |
31 | 31 | |
32 | 32 | $(nandobj)u-boot-spl.bin: $(nandobj)u-boot-spl |
33 | - $(OBJCOPY) ${OBJCFLAGS} -O binary $< $@ | |
33 | + $(OBJCOPY) $(OBJCOPYFLAGS) -O binary $< $@ | |
34 | 34 | |
35 | 35 | $(nandobj)u-boot-spl: $(OBJS) $(nandobj)u-boot.lds |
36 | 36 | cd $(LNDIR) && $(LD) $(LDFLAGS) $(__OBJS) $(PLATFORM_LIBS) \ |
nand_spl/board/freescale/mpc8315erdb/Makefile
... | ... | @@ -29,10 +29,10 @@ |
29 | 29 | all: $(nandobj)u-boot-spl.bin $(nandobj)u-boot-spl-16k.bin |
30 | 30 | |
31 | 31 | $(nandobj)u-boot-spl-16k.bin: $(nandobj)u-boot-spl |
32 | - $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(PAD_TO) -O binary $< $@ | |
32 | + $(OBJCOPY) $(OBJCOPYFLAGS) --pad-to=$(PAD_TO) -O binary $< $@ | |
33 | 33 | |
34 | 34 | $(nandobj)u-boot-spl.bin: $(nandobj)u-boot-spl |
35 | - $(OBJCOPY) ${OBJCFLAGS} -O binary $< $@ | |
35 | + $(OBJCOPY) $(OBJCOPYFLAGS) -O binary $< $@ | |
36 | 36 | |
37 | 37 | $(nandobj)u-boot-spl: $(OBJS) $(nandobj)u-boot.lds |
38 | 38 | cd $(LNDIR) && $(LD) $(LDFLAGS) $(__OBJS) $(PLATFORM_LIBS) \ |
nand_spl/board/freescale/mpc8536ds/Makefile
... | ... | @@ -31,10 +31,10 @@ |
31 | 31 | all: $(nandobj)u-boot-spl.bin $(nandobj)u-boot-spl-16k.bin |
32 | 32 | |
33 | 33 | $(nandobj)u-boot-spl-16k.bin: $(nandobj)u-boot-spl |
34 | - $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(PAD_TO) -O binary $< $@ | |
34 | + $(OBJCOPY) $(OBJCOPYFLAGS) --pad-to=$(PAD_TO) -O binary $< $@ | |
35 | 35 | |
36 | 36 | $(nandobj)u-boot-spl.bin: $(nandobj)u-boot-spl |
37 | - $(OBJCOPY) ${OBJCFLAGS} -O binary $< $@ | |
37 | + $(OBJCOPY) $(OBJCOPYFLAGS) -O binary $< $@ | |
38 | 38 | |
39 | 39 | $(nandobj)u-boot-spl: $(OBJS) $(nandobj)u-boot-nand_spl.lds |
40 | 40 | cd $(LNDIR) && $(LD) $(LDFLAGS) $(__OBJS) $(PLATFORM_LIBS) \ |
nand_spl/board/freescale/mpc8569mds/Makefile
... | ... | @@ -31,10 +31,10 @@ |
31 | 31 | all: $(nandobj)u-boot-spl.bin $(nandobj)u-boot-spl-16k.bin |
32 | 32 | |
33 | 33 | $(nandobj)u-boot-spl-16k.bin: $(nandobj)u-boot-spl |
34 | - $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(PAD_TO) -O binary $< $@ | |
34 | + $(OBJCOPY) $(OBJCOPYFLAGS) --pad-to=$(PAD_TO) -O binary $< $@ | |
35 | 35 | |
36 | 36 | $(nandobj)u-boot-spl.bin: $(nandobj)u-boot-spl |
37 | - $(OBJCOPY) ${OBJCFLAGS} -O binary $< $@ | |
37 | + $(OBJCOPY) $(OBJCOPYFLAGS) -O binary $< $@ | |
38 | 38 | |
39 | 39 | $(nandobj)u-boot-spl: $(OBJS) $(nandobj)u-boot-nand_spl.lds |
40 | 40 | cd $(LNDIR) && $(LD) $(LDFLAGS) $(__OBJS) $(PLATFORM_LIBS) \ |
nand_spl/board/freescale/mpc8572ds/Makefile
... | ... | @@ -31,10 +31,10 @@ |
31 | 31 | all: $(nandobj)u-boot-spl.bin $(nandobj)u-boot-spl-16k.bin |
32 | 32 | |
33 | 33 | $(nandobj)u-boot-spl-16k.bin: $(nandobj)u-boot-spl |
34 | - $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(PAD_TO) -O binary $< $@ | |
34 | + $(OBJCOPY) $(OBJCOPYFLAGS) --pad-to=$(PAD_TO) -O binary $< $@ | |
35 | 35 | |
36 | 36 | $(nandobj)u-boot-spl.bin: $(nandobj)u-boot-spl |
37 | - $(OBJCOPY) ${OBJCFLAGS} -O binary $< $@ | |
37 | + $(OBJCOPY) $(OBJCOPYFLAGS) -O binary $< $@ | |
38 | 38 | |
39 | 39 | $(nandobj)u-boot-spl: $(OBJS) $(nandobj)u-boot-nand_spl.lds |
40 | 40 | cd $(LNDIR) && $(LD) $(LDFLAGS) $(__OBJS) $(PLATFORM_LIBS) \ |
nand_spl/board/freescale/p1023rds/Makefile
... | ... | @@ -27,10 +27,10 @@ |
27 | 27 | all: $(nandobj)u-boot-spl.bin $(nandobj)u-boot-spl-16k.bin |
28 | 28 | |
29 | 29 | $(nandobj)u-boot-spl-16k.bin: $(nandobj)u-boot-spl |
30 | - $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(PAD_TO) -O binary $< $@ | |
30 | + $(OBJCOPY) $(OBJCOPYFLAGS) --pad-to=$(PAD_TO) -O binary $< $@ | |
31 | 31 | |
32 | 32 | $(nandobj)u-boot-spl.bin: $(nandobj)u-boot-spl |
33 | - $(OBJCOPY) ${OBJCFLAGS} -O binary $< $@ | |
33 | + $(OBJCOPY) $(OBJCOPYFLAGS) -O binary $< $@ | |
34 | 34 | |
35 | 35 | $(nandobj)u-boot-spl: $(OBJS) $(nandobj)u-boot-nand_spl.lds |
36 | 36 | cd $(LNDIR) && $(LD) $(LDFLAGS) $(__OBJS) $(PLATFORM_LIBS) \ |
nand_spl/board/freescale/p1_p2_rdb/Makefile
... | ... | @@ -31,10 +31,10 @@ |
31 | 31 | all: $(nandobj)u-boot-spl.bin $(nandobj)u-boot-spl-16k.bin |
32 | 32 | |
33 | 33 | $(nandobj)u-boot-spl-16k.bin: $(nandobj)u-boot-spl |
34 | - $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(PAD_TO) -O binary $< $@ | |
34 | + $(OBJCOPY) $(OBJCOPYFLAGS) --pad-to=$(PAD_TO) -O binary $< $@ | |
35 | 35 | |
36 | 36 | $(nandobj)u-boot-spl.bin: $(nandobj)u-boot-spl |
37 | - $(OBJCOPY) ${OBJCFLAGS} -O binary $< $@ | |
37 | + $(OBJCOPY) $(OBJCOPYFLAGS) -O binary $< $@ | |
38 | 38 | |
39 | 39 | $(nandobj)u-boot-spl: $(OBJS) $(nandobj)u-boot-nand_spl.lds |
40 | 40 | cd $(LNDIR) && $(LD) $(LDFLAGS) $(__OBJS) $(PLATFORM_LIBS) \ |
nand_spl/board/sheldon/simpc8313/Makefile
... | ... | @@ -28,10 +28,10 @@ |
28 | 28 | all: $(nandobj)u-boot-spl.bin $(nandobj)u-boot-spl-16k.bin |
29 | 29 | |
30 | 30 | $(nandobj)u-boot-spl-16k.bin: $(nandobj)u-boot-spl |
31 | - $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(PAD_TO) -O binary $< $@ | |
31 | + $(OBJCOPY) $(OBJCOPYFLAGS) --pad-to=$(PAD_TO) -O binary $< $@ | |
32 | 32 | |
33 | 33 | $(nandobj)u-boot-spl.bin: $(nandobj)u-boot-spl |
34 | - $(OBJCOPY) ${OBJCFLAGS} -O binary $< $@ | |
34 | + $(OBJCOPY) $(OBJCOPYFLAGS) -O binary $< $@ | |
35 | 35 | |
36 | 36 | $(nandobj)u-boot-spl: $(OBJS) $(nandobj)u-boot.lds |
37 | 37 | cd $(LNDIR) && $(LD) $(LDFLAGS) $(__OBJS) $(PLATFORM_LIBS) \ |
spl/Makefile
... | ... | @@ -201,7 +201,7 @@ |
201 | 201 | endif |
202 | 202 | |
203 | 203 | $(obj)/$(SPL_BIN).bin: $(obj)/$(SPL_BIN) |
204 | - $(OBJCOPY) $(OBJCFLAGS) $(SPL_OBJCFLAGS) -O binary $< $@ | |
204 | + $(OBJCOPY) $(OBJCOPYFLAGS) $(SPL_OBJCFLAGS) -O binary $< $@ | |
205 | 205 | |
206 | 206 | LDFLAGS_$(SPL_BIN) += -T u-boot-spl.lds $(LDFLAGS_FINAL) |
207 | 207 | ifneq ($(CONFIG_SPL_TEXT_BASE),) |