Commit fa8f95084d06bd29c4ca75994a41c557345f53f6

Authored by Masahiro Yamada
Committed by Tom Rini
1 parent 3d9c84737b

ARM: convert makefiles to Kbuild style

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>

Showing 16 changed files with 65 additions and 429 deletions Side-by-side Diff

arch/arm/cpu/arm1136/Makefile
... ... @@ -5,28 +5,6 @@
5 5 # SPDX-License-Identifier: GPL-2.0+
6 6 #
7 7  
8   -include $(TOPDIR)/config.mk
9   -
10   -LIB = $(obj)lib$(CPU).o
11   -
12   -START = start.o
13   -COBJS = cpu.o
14   -
15   -SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
16   -OBJS := $(addprefix $(obj),$(COBJS) $(SOBJS))
17   -START := $(addprefix $(obj),$(START))
18   -
19   -all: $(obj).depend $(START) $(LIB)
20   -
21   -$(LIB): $(OBJS)
22   - $(call cmd_link_o_target, $(OBJS))
23   -
24   -#########################################################################
25   -
26   -# defines $(obj).depend target
27   -include $(SRCTREE)/rules.mk
28   -
29   -sinclude $(obj).depend
30   -
31   -#########################################################################
  8 +extra-y = start.o
  9 +obj-y = cpu.o
arch/arm/cpu/arm1136/mx31/Makefile
... ... @@ -5,28 +5,7 @@
5 5 # SPDX-License-Identifier: GPL-2.0+
6 6 #
7 7  
8   -include $(TOPDIR)/config.mk
9   -
10   -LIB = $(obj)lib$(SOC).o
11   -
12   -COBJS += generic.o
13   -COBJS += timer.o
14   -COBJS += devices.o
15   -
16   -SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
17   -OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
18   -
19   -all: $(obj).depend $(LIB)
20   -
21   -$(LIB): $(OBJS)
22   - $(call cmd_link_o_target, $(OBJS))
23   -
24   -#########################################################################
25   -
26   -# defines $(obj).depend target
27   -include $(SRCTREE)/rules.mk
28   -
29   -sinclude $(obj).depend
30   -
31   -#########################################################################
  8 +obj-y += generic.o
  9 +obj-y += timer.o
  10 +obj-y += devices.o
arch/arm/cpu/arm1136/mx35/Makefile
... ... @@ -7,29 +7,7 @@
7 7 # SPDX-License-Identifier: GPL-2.0+
8 8 #
9 9  
10   -include $(TOPDIR)/config.mk
11   -
12   -LIB = $(obj)lib$(SOC).o
13   -
14   -COBJS += generic.o
15   -COBJS += timer.o
16   -COBJS += mx35_sdram.o
17   -
18   -SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
19   -OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
20   -
21   -all: $(obj).depend $(LIB)
22   -
23   -$(LIB): $(OBJS)
24   - $(call cmd_link_o_target, $(OBJS))
25   -
26   -
27   -#########################################################################
28   -
29   -# defines $(obj).depend target
30   -include $(SRCTREE)/rules.mk
31   -
32   -sinclude $(obj).depend
33   -
34   -#########################################################################
  10 +obj-y += generic.o
  11 +obj-y += timer.o
  12 +obj-y += mx35_sdram.o
arch/arm/cpu/arm1176/Makefile
... ... @@ -8,28 +8,6 @@
8 8 # SPDX-License-Identifier: GPL-2.0+
9 9 #
10 10  
11   -include $(TOPDIR)/config.mk
12   -
13   -LIB = $(obj)lib$(CPU).o
14   -
15   -START = start.o
16   -COBJS = cpu.o
17   -
18   -SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
19   -OBJS := $(addprefix $(obj),$(COBJS) $(SOBJS))
20   -START := $(addprefix $(obj),$(START))
21   -
22   -all: $(obj).depend $(START) $(LIB)
23   -
24   -$(LIB): $(OBJS)
25   - $(call cmd_link_o_target, $(OBJS))
26   -
27   -#########################################################################
28   -
29   -# defines $(obj).depend target
30   -include $(SRCTREE)/rules.mk
31   -
32   -sinclude $(obj).depend
33   -
34   -#########################################################################
  11 +extra-y = start.o
  12 +obj-y = cpu.o
arch/arm/cpu/arm1176/bcm2835/Makefile
... ... @@ -12,27 +12,6 @@
12 12 # GNU General Public License for more details.
13 13 #
14 14  
15   -include $(TOPDIR)/config.mk
16   -
17   -LIB = $(obj)lib$(SOC).o
18   -
19   -SOBJS := lowlevel_init.o
20   -COBJS := init.o reset.o timer.o mbox.o
21   -
22   -SRCS := $(SOBJS:.o=.c) $(COBJS:.o=.c)
23   -OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
24   -
25   -all: $(obj).depend $(LIB)
26   -
27   -$(LIB): $(OBJS)
28   - $(call cmd_link_o_target, $(OBJS))
29   -
30   -#########################################################################
31   -
32   -# defines $(obj).depend target
33   -include $(SRCTREE)/rules.mk
34   -
35   -sinclude $(obj).depend
36   -
37   -#########################################################################
  15 +obj-y := lowlevel_init.o
  16 +obj-y += init.o reset.o timer.o mbox.o
arch/arm/cpu/arm1176/tnetv107x/Makefile
... ... @@ -2,29 +2,6 @@
2 2 # SPDX-License-Identifier: GPL-2.0+
3 3 #
4 4  
5   -include $(TOPDIR)/config.mk
6   -
7   -LIB = $(obj)lib$(SOC).o
8   -
9   -COBJS += aemif.o clock.o init.o mux.o timer.o
10   -SOBJS += lowlevel_init.o
11   -
12   -SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
13   -
14   -OBJS := $(addprefix $(obj),$(COBJS) $(SOBJS))
15   -START := $(addprefix $(obj),$(START))
16   -
17   -all: $(obj).depend $(LIB)
18   -
19   -$(LIB): $(OBJS)
20   - $(call cmd_link_o_target, $(OBJS))
21   -
22   -#########################################################################
23   -
24   -# defines $(obj).depend target
25   -include $(SRCTREE)/rules.mk
26   -
27   -sinclude $(obj).depend
28   -
29   -#########################################################################
  5 +obj-y += aemif.o clock.o init.o mux.o timer.o
  6 +obj-y += lowlevel_init.o
arch/arm/cpu/arm946es/Makefile
... ... @@ -5,29 +5,7 @@
5 5 # SPDX-License-Identifier: GPL-2.0+
6 6 #
7 7  
8   -include $(TOPDIR)/config.mk
  8 +extra-y = start.o
9 9  
10   -LIB = $(obj)lib$(CPU).o
11   -
12   -START = start.o
13   -
14   -COBJS = cpu.o
15   -
16   -SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
17   -OBJS := $(addprefix $(obj),$(COBJS) $(SOBJS))
18   -START := $(addprefix $(obj),$(START))
19   -
20   -all: $(obj).depend $(START) $(LIB)
21   -
22   -$(LIB): $(OBJS)
23   - $(call cmd_link_o_target, $(OBJS))
24   -
25   -#########################################################################
26   -
27   -# defines $(obj).depend target
28   -include $(SRCTREE)/rules.mk
29   -
30   -sinclude $(obj).depend
31   -
32   -#########################################################################
  10 +obj-y = cpu.o
arch/arm/cpu/arm_intcm/Makefile
... ... @@ -5,28 +5,6 @@
5 5 # SPDX-License-Identifier: GPL-2.0+
6 6 #
7 7  
8   -include $(TOPDIR)/config.mk
9   -
10   -LIB = $(obj)lib$(CPU).o
11   -
12   -START = start.o
13   -COBJS = cpu.o
14   -
15   -SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
16   -OBJS := $(addprefix $(obj),$(COBJS) $(SOBJS))
17   -START := $(addprefix $(obj),$(START))
18   -
19   -all: $(obj).depend $(START) $(LIB)
20   -
21   -$(LIB): $(OBJS)
22   - $(call cmd_link_o_target, $(OBJS))
23   -
24   -#########################################################################
25   -
26   -# defines $(obj).depend target
27   -include $(SRCTREE)/rules.mk
28   -
29   -sinclude $(obj).depend
30   -
31   -#########################################################################
  8 +extra-y = start.o
  9 +obj-y = cpu.o
arch/arm/cpu/ixp/Makefile
... ... @@ -5,31 +5,9 @@
5 5 # SPDX-License-Identifier: GPL-2.0+
6 6 #
7 7  
8   -include $(TOPDIR)/config.mk
  8 +extra-y = start.o
9 9  
10   -LIB = $(obj)lib$(CPU).o
11   -
12   -START = start.o
13   -
14   -COBJS-y += cpu.o
15   -COBJS-$(CONFIG_USE_IRQ) += interrupts.o
16   -COBJS-y += timer.o
17   -
18   -SRCS := $(START:.o=.S) $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
19   -OBJS := $(addprefix $(obj),$(SOBJS-y) $(COBJS-y))
20   -START := $(addprefix $(obj),$(START))
21   -
22   -all: $(obj).depend $(START) $(LIB)
23   -
24   -$(LIB): $(OBJS)
25   - $(call cmd_link_o_target, $(OBJS))
26   -
27   -#########################################################################
28   -
29   -# defines $(obj).depend target
30   -include $(SRCTREE)/rules.mk
31   -
32   -sinclude $(obj).depend
33   -
34   -#########################################################################
  10 +obj-y += cpu.o
  11 +obj-$(CONFIG_USE_IRQ) += interrupts.o
  12 +obj-y += timer.o
arch/arm/cpu/pxa/Makefile
... ... @@ -5,36 +5,12 @@
5 5 # SPDX-License-Identifier: GPL-2.0+
6 6 #
7 7  
8   -include $(TOPDIR)/config.mk
  8 +extra-y = start.o
9 9  
10   -LIB = $(obj)lib$(CPU).o
  10 +obj-$(CONFIG_CPU_PXA25X) += pxa2xx.o
  11 +obj-$(CONFIG_CPU_PXA27X) += pxa2xx.o
11 12  
12   -START = start.o
13   -
14   -COBJS-$(CONFIG_CPU_PXA25X) = pxa2xx.o
15   -COBJS-$(CONFIG_CPU_PXA27X) = pxa2xx.o
16   -
17   -COBJS-y += cpuinfo.o
18   -
19   -COBJS = $(COBJS-y)
20   -COBJS += timer.o
21   -COBJS += usb.o
22   -
23   -SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
24   -OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
25   -START := $(addprefix $(obj),$(START))
26   -
27   -all: $(obj).depend $(START) $(LIB)
28   -
29   -$(LIB): $(OBJS)
30   - $(call cmd_link_o_target, $(OBJS))
31   -
32   -#########################################################################
33   -
34   -# defines $(obj).depend target
35   -include $(SRCTREE)/rules.mk
36   -
37   -sinclude $(obj).depend
38   -
39   -#########################################################################
  13 +obj-y += cpuinfo.o
  14 +obj-y += timer.o
  15 +obj-y += usb.o
arch/arm/cpu/sa1100/Makefile
... ... @@ -5,30 +5,8 @@
5 5 # SPDX-License-Identifier: GPL-2.0+
6 6 #
7 7  
8   -include $(TOPDIR)/config.mk
  8 +extra-y = start.o
9 9  
10   -LIB = $(obj)lib$(CPU).o
11   -
12   -START = start.o
13   -
14   -COBJS += cpu.o
15   -COBJS += timer.o
16   -
17   -SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
18   -OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
19   -START := $(addprefix $(obj),$(START))
20   -
21   -all: $(obj).depend $(START) $(LIB)
22   -
23   -$(LIB): $(OBJS)
24   - $(call cmd_link_o_target, $(OBJS))
25   -
26   -#########################################################################
27   -
28   -# defines $(obj).depend target
29   -include $(SRCTREE)/rules.mk
30   -
31   -sinclude $(obj).depend
32   -
33   -#########################################################################
  10 +obj-y += cpu.o
  11 +obj-y += timer.o
arch/arm/cpu/tegra-common/Makefile
... ... @@ -7,27 +7,6 @@
7 7 # SPDX-License-Identifier: GPL-2.0+
8 8 #
9 9  
10   -include $(TOPDIR)/config.mk
11   -
12   -LIB = $(obj)libcputegra-common.o
13   -
14   -SOBJS += lowlevel_init.o
15   -COBJS-y += ap.o board.o sys_info.o timer.o clock.o cache.o
16   -
17   -SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
18   -OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS-y))
19   -
20   -all: $(obj).depend $(LIB)
21   -
22   -$(LIB): $(OBJS)
23   - $(call cmd_link_o_target, $(OBJS))
24   -
25   -#########################################################################
26   -
27   -# defines $(obj).depend target
28   -include $(SRCTREE)/rules.mk
29   -
30   -sinclude $(obj).depend
31   -
32   -#########################################################################
  10 +obj-y += lowlevel_init.o
  11 +obj-y += ap.o board.o sys_info.o timer.o clock.o cache.o
arch/arm/cpu/tegra114-common/Makefile
... ... @@ -17,26 +17,5 @@
17 17 # along with this program. If not, see <http://www.gnu.org/licenses/>.
18 18 #
19 19  
20   -include $(TOPDIR)/config.mk
21   -
22   -LIB = $(obj)lib$(SOC)-common.o
23   -
24   -COBJS-y += clock.o funcmux.o pinmux.o
25   -
26   -SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
27   -OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS-y))
28   -
29   -all: $(obj).depend $(LIB)
30   -
31   -$(LIB): $(OBJS)
32   - $(call cmd_link_o_target, $(OBJS))
33   -
34   -#########################################################################
35   -
36   -# defines $(obj).depend target
37   -include $(SRCTREE)/rules.mk
38   -
39   -sinclude $(obj).depend
40   -
41   -#########################################################################
  20 +obj-y += clock.o funcmux.o pinmux.o
arch/arm/cpu/tegra20-common/Makefile
... ... @@ -7,33 +7,12 @@
7 7 # SPDX-License-Identifier: GPL-2.0+
8 8 #
9 9  
10   -include $(TOPDIR)/config.mk
11   -
12 10 # The AVP is ARMv4T architecture so we must use special compiler
13 11 # flags for any startup files it might use.
14 12 CFLAGS_arch/arm/cpu/tegra20-common/warmboot_avp.o += -march=armv4t
15 13  
16   -LIB = $(obj)lib$(SOC)-common.o
17   -
18   -COBJS-y += clock.o funcmux.o pinmux.o
19   -COBJS-$(CONFIG_TEGRA_LP0) += warmboot.o crypto.o warmboot_avp.o
20   -COBJS-$(CONFIG_TEGRA_CLOCK_SCALING) += emc.o
21   -COBJS-$(CONFIG_TEGRA_PMU) += pmu.o
22   -
23   -SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
24   -OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS-y))
25   -
26   -all: $(obj).depend $(LIB)
27   -
28   -$(LIB): $(OBJS)
29   - $(call cmd_link_o_target, $(OBJS))
30   -
31   -#########################################################################
32   -
33   -# defines $(obj).depend target
34   -include $(SRCTREE)/rules.mk
35   -
36   -sinclude $(obj).depend
37   -
38   -#########################################################################
  14 +obj-y += clock.o funcmux.o pinmux.o
  15 +obj-$(CONFIG_TEGRA_LP0) += warmboot.o crypto.o warmboot_avp.o
  16 +obj-$(CONFIG_TEGRA_CLOCK_SCALING) += emc.o
  17 +obj-$(CONFIG_TEGRA_PMU) += pmu.o
arch/arm/cpu/tegra30-common/Makefile
... ... @@ -17,29 +17,5 @@
17 17 # along with this program. If not, see <http://www.gnu.org/licenses/>.
18 18 #
19 19  
20   -include $(TOPDIR)/config.mk
21   -
22   -# The AVP is ARMv4T architecture so we must use special compiler
23   -# flags for any startup files it might use.
24   -
25   -LIB = $(obj)lib$(SOC)-common.o
26   -
27   -COBJS-y += clock.o funcmux.o pinmux.o
28   -
29   -SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
30   -OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS-y))
31   -
32   -all: $(obj).depend $(LIB)
33   -
34   -$(LIB): $(OBJS)
35   - $(call cmd_link_o_target, $(OBJS))
36   -
37   -#########################################################################
38   -
39   -# defines $(obj).depend target
40   -include $(SRCTREE)/rules.mk
41   -
42   -sinclude $(obj).depend
43   -
44   -#########################################################################
  20 +obj-y += clock.o funcmux.o pinmux.o
arch/arm/lib/Makefile
... ... @@ -5,78 +5,44 @@
5 5 # SPDX-License-Identifier: GPL-2.0+
6 6 #
7 7  
8   -include $(TOPDIR)/config.mk
  8 +# Build private libgcc only when asked for
  9 +ifdef USE_PRIVATE_LIBGCC
  10 +lib-y += _ashldi3.o
  11 +lib-y += _ashrdi3.o
  12 +lib-y += _divsi3.o
  13 +lib-y += _lshrdi3.o
  14 +lib-y += _modsi3.o
  15 +lib-y += _udivsi3.o
  16 +lib-y += _umodsi3.o
  17 +lib-y += div0.o
  18 +endif
9 19  
10   -LIB = $(obj)lib$(ARCH).o
11   -LIBGCC = $(obj)libgcc.o
  20 +obj-y += crt0.o
12 21  
13   -GLSOBJS += _ashldi3.o
14   -GLSOBJS += _ashrdi3.o
15   -GLSOBJS += _divsi3.o
16   -GLSOBJS += _lshrdi3.o
17   -GLSOBJS += _modsi3.o
18   -GLSOBJS += _udivsi3.o
19   -GLSOBJS += _umodsi3.o
20   -
21   -GLCOBJS += div0.o
22   -
23   -SOBJS-y += crt0.o
24   -
25 22 ifndef CONFIG_SPL_BUILD
26   -SOBJS-y += relocate.o
  23 +obj-y += relocate.o
27 24 ifndef CONFIG_SYS_GENERIC_BOARD
28   -COBJS-y += board.o
  25 +obj-y += board.o
29 26 endif
30   -COBJS-y += sections.o
  27 +obj-y += sections.o
31 28  
32   -COBJS-$(CONFIG_OF_LIBFDT) += bootm-fdt.o
33   -COBJS-$(CONFIG_CMD_BOOTM) += bootm.o
34   -COBJS-$(CONFIG_SYS_L2_PL310) += cache-pl310.o
35   -SOBJS-$(CONFIG_USE_ARCH_MEMSET) += memset.o
36   -SOBJS-$(CONFIG_USE_ARCH_MEMCPY) += memcpy.o
  29 +obj-$(CONFIG_OF_LIBFDT) += bootm-fdt.o
  30 +obj-$(CONFIG_CMD_BOOTM) += bootm.o
  31 +obj-$(CONFIG_SYS_L2_PL310) += cache-pl310.o
  32 +obj-$(CONFIG_USE_ARCH_MEMSET) += memset.o
  33 +obj-$(CONFIG_USE_ARCH_MEMCPY) += memcpy.o
37 34 else
38   -COBJS-$(CONFIG_SPL_FRAMEWORK) += spl.o
  35 +obj-$(CONFIG_SPL_FRAMEWORK) += spl.o
39 36 endif
40 37  
41   -COBJS-y += interrupts.o
42   -COBJS-y += reset.o
  38 +obj-y += interrupts.o
  39 +obj-y += reset.o
43 40  
44   -COBJS-y += cache.o
45   -COBJS-y += cache-cp15.o
  41 +obj-y += cache.o
  42 +obj-y += cache-cp15.o
46 43  
47   -SRCS := $(GLSOBJS:.o=.S) $(GLCOBJS:.o=.c) \
48   - $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
49   -OBJS := $(addprefix $(obj),$(SOBJS-y) $(COBJS-y))
50   -LGOBJS := $(addprefix $(obj),$(GLSOBJS)) \
51   - $(addprefix $(obj),$(GLCOBJS))
52   -
53   -# Always build libarm.o
54   -TARGETS := $(LIB)
55   -
56   -# Build private libgcc only when asked for
57   -ifdef USE_PRIVATE_LIBGCC
58   -TARGETS += $(LIBGCC)
59   -endif
60   -
61 44 # For EABI conformant tool chains, provide eabi_compat()
62 45 ifneq (,$(findstring -mabi=aapcs-linux,$(PLATFORM_CPPFLAGS)))
63   -TARGETS += $(obj)eabi_compat.o
  46 +extra-y += eabi_compat.o
64 47 endif
65   -
66   -all: $(TARGETS)
67   -
68   -$(LIB): $(obj).depend $(OBJS)
69   - $(call cmd_link_o_target, $(OBJS))
70   -
71   -$(LIBGCC): $(obj).depend $(LGOBJS)
72   - $(call cmd_link_o_target, $(LGOBJS))
73   -
74   -#########################################################################
75   -
76   -# defines $(obj).depend target
77   -include $(SRCTREE)/rules.mk
78   -
79   -sinclude $(obj).depend
80   -
81   -#########################################################################