All of lore.kernel.org
 help / color / mirror / Atom feed
From: Masahiro Yamada <yamada.m@jp.panasonic.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 22/34] Kbuild: delete temporary build scripts
Date: Wed, 11 Dec 2013 20:01:44 +0900	[thread overview]
Message-ID: <1386759716-5322-23-git-send-email-yamada.m@jp.panasonic.com> (raw)
In-Reply-To: <1386759716-5322-1-git-send-email-yamada.m@jp.panasonic.com>

We had switched to Kbuild.
We do not need old build scripts any more.

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

 rules.mk                   |  30 -----------
 scripts/Makefile.build.tmp | 127 ---------------------------------------------
 scripts/Makefile.host.tmp  |  61 ----------------------
 3 files changed, 218 deletions(-)
 delete mode 100644 rules.mk
 delete mode 100644 scripts/Makefile.build.tmp
 delete mode 100644 scripts/Makefile.host.tmp

diff --git a/rules.mk b/rules.mk
deleted file mode 100644
index 8cbd84a..0000000
--- a/rules.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# (C) Copyright 2006-2013
-# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
-#########################################################################
-
-_depend:	$(obj)/.depend
-
-# Join all the dependencies into a single file, in three parts
-#	1 .Concatenate all the generated depend files together
-#	2. Add in the deps from OTHER_SRCS which we couldn't process
-#	3. Add in the HOSTSRCS
-$(obj)/.depend:	$(TOPDIR)/config.mk $(SRCS) \
-		$(HOSTSRCS)
-	cat /dev/null $(DEPS) >$@
-	@for f in $(SRCS); do \
-		g=`basename $$f | sed -e 's/\(.*\)\.[[:alnum:]_]/\1.o/'`; \
-		$(CC) -M $(CPPFLAGS) -MQ $(obj)/$$g $$f >> $@ ; \
-	done
-	@for f in $(HOSTSRCS); do \
-		g=`basename $$f | sed -e 's/\(.*\)\.[[:alnum:]_]/\1.o/'`; \
-		$(HOSTCC) -M $(HOSTCPPFLAGS) -MQ $(obj)/$$g $$f >> $@ ; \
-	done
-
-MAKE_DEPEND = $(CC) -M $(CPPFLAGS) $(EXTRA_CPPFLAGS_DEP) \
-		-MQ $(addsuffix .o,$(obj)$(basename $<)) $< >$@
-
-#########################################################################
diff --git a/scripts/Makefile.build.tmp b/scripts/Makefile.build.tmp
deleted file mode 100644
index 52a44ff..0000000
--- a/scripts/Makefile.build.tmp
+++ /dev/null
@@ -1,127 +0,0 @@
-# our default target
-.PHONY: all
-all:
-
-ifeq ($(CONFIG_TPL_BUILD),y)
-  src := $(patsubst tpl/%,%,$(obj))
-else
-  ifeq ($(CONFIG_SPL_BUILD),y)
-    src := $(patsubst spl/%,%,$(obj))
-  else
-    src := $(obj)
-  endif
-endif
-
-include $(srctree)/scripts/Kbuild.include
-include $(srctree)/config.mk
-
-# variable LIB is used in examples/standalone/Makefile
-__LIB := $(obj)/built-in.o
-LIBGCC = $(obj)/libgcc.o
-SRCS :=
-subdir-y :=
-obj-dirs :=
-
-kbuild-dir := $(if $(filter /%,$(src)),$(src),$(srctree)/$(src))
-include $(kbuild-dir)/Makefile
-
-# Do not include host rules unless needed
-ifneq ($(hostprogs-y)$(hostprogs-m),)
-include $(SRCTREE)/scripts/Makefile.host.tmp
-endif
-
-# Going forward use the following
-obj-y := $(sort $(obj-y))
-extra-y := $(sort $(extra-y))
-always := $(sort $(always))
-lib-y := $(sort $(lib-y))
-
-subdir-y 	+= $(patsubst %/,%,$(filter %/, $(obj-y)))
-obj-y		:= $(patsubst %/, %/built-in.o, $(obj-y))
-subdir-obj-y	:= $(filter %/built-in.o, $(obj-y))
-subdir-obj-y	:= $(addprefix $(obj)/,$(subdir-obj-y))
-
-SRCS	+= $(obj-y:.o=.c) $(obj-y:.o=.S) $(lib-y:.o=.c) \
-	$(lib-y:.o=.S) $(extra-y:.o=.c) $(extra-y:.o=.S)
-
-SRCS := $(addprefix $(if $(KBUILD_SRC),$(srctree)/$(src)/,$(src)/),$(SRCS))
-SRCS := $(wildcard $(SRCS))
-
-OBJS	:= $(addprefix $(obj)/,$(obj-y))
-
-# $(obj-dirs) is a list of directories that contain object files
-
-obj-dirs += $(dir $(OBJS))
-
-_dummy := $(shell [ -d $(obj) ] || mkdir -p $(obj))
-
-# Create directories for object files if directory does not exist
-# Needed when obj-y := dir/file.o syntax is used
-_dummy := $(foreach d,$(obj-dirs), $(shell [ -d $(d) ] || mkdir -p $(d)))
-
-LGOBJS := $(addprefix $(obj)/,$(sort $(lib-y)))
-
-all: $(__LIB) $(addprefix $(obj)/,$(extra-y) $(always)) $(subdir-y)
-
-$(__LIB):	$(obj)/.depend $(OBJS)
-	$(call cmd_link_o_target, $(OBJS))
-
-ifneq ($(strip $(lib-y)),)
-all: $(LIBGCC)
-
-$(LIBGCC): $(obj)/.depend $(LGOBJS)
-	$(call cmd_link_o_target, $(LGOBJS))
-endif
-
-ifneq ($(subdir-obj-y),)
-# Descending
-$(subdir-obj-y): $(subdir-y)
-endif
-
-ifneq ($(subdir-y),)
-$(subdir-y): FORCE
-	$(MAKE) $(build)=$(obj)/$@
-endif
-
-#########################################################################
-
-# Allow boards to use custom optimize flags on a per dir/file basis
-ALL_AFLAGS = $(AFLAGS) $(AFLAGS_$(BCURDIR)/$(@F)) $(AFLAGS_$(BCURDIR))
-ALL_CFLAGS = $(CFLAGS) $(CFLAGS_$(BCURDIR)/$(@F)) $(CFLAGS_$(BCURDIR))
-EXTRA_CPPFLAGS = $(CPPFLAGS_$(BCURDIR)/$(@F)) $(CPPFLAGS_$(BCURDIR))
-ALL_CFLAGS += $(EXTRA_CPPFLAGS)
-
-# The _DEP version uses the $< file target (for dependency generation)
-# See rules.mk
-EXTRA_CPPFLAGS_DEP = $(CPPFLAGS_$(BCURDIR)/$(addsuffix .o,$(basename $<))) \
-		$(CPPFLAGS_$(BCURDIR))
-$(obj)/%.s:	$(src)/%.S
-	$(CPP) $(ALL_AFLAGS) -o $@ $<
-$(obj)/%.o:	$(src)/%.S
-	$(CC)  $(ALL_AFLAGS) -o $@ $< -c
-$(obj)/%.o:	$(src)/%.c
-ifneq ($(CHECKSRC),0)
-	$(CHECK) $(CHECKFLAGS) $(ALL_CFLAGS) $<
-endif
-	$(CC)  $(ALL_CFLAGS) -o $@ $< -c
-$(obj)/%.i:	$(src)/%.c
-	$(CPP) $(ALL_CFLAGS) -o $@ $< -c
-$(obj)/%.s:	$(src)/%.c
-	$(CC)  $(ALL_CFLAGS) -o $@ $< -c -S
-
-# If the list of objects to link is empty, just create an empty built-in.o
-cmd_link_o_target = $(if $(strip $1),\
-		      $(LD) $(LDFLAGS) -r -o $@ $1,\
-		      rm -f $@; $(AR) rcs $@ )
-
-#########################################################################
-
-# defines $(obj)/.depend target
-
-include $(TOPDIR)/rules.mk
-
-sinclude $(obj)/.depend
-
-#########################################################################
-
-.PHONY: FORCE
diff --git a/scripts/Makefile.host.tmp b/scripts/Makefile.host.tmp
deleted file mode 100644
index 53fe930..0000000
--- a/scripts/Makefile.host.tmp
+++ /dev/null
@@ -1,61 +0,0 @@
-
-__hostprogs := $(sort $(hostprogs-y) $(hostprogs-m))
-
-# C code
-# Executables compiled from a single .c file
-host-csingle	:= $(foreach m,$(__hostprogs),$(if $($(m)-objs),,$(m)))
-
-# C executables linked based on several .o files
-host-cmulti	:= $(foreach m,$(__hostprogs),$(if $($(m)-objs),$(m)))
-
-# Object (.o) files compiled from .c files
-host-cobjs	:= $(sort $(foreach m,$(__hostprogs),$($(m)-objs)))
-
-# output directory for programs/.o files
-# hostprogs-y := tools/build may have been specified. Retrieve directory
-host-objdirs := $(foreach f,$(__hostprogs), $(if $(dir $(f)),$(dir $(f))))
-# directory of .o files from prog-objs notation
-host-objdirs += $(foreach f,$(host-cmulti),                  \
-                    $(foreach m,$($(f)-objs),                \
-                        $(if $(dir $(m)),$(dir $(m)))))
-
-host-objdirs := $(strip $(sort $(filter-out ./,$(host-objdirs))))
-
-__hostprogs     := $(addprefix $(obj)/,$(__hostprogs))
-host-csingle	:= $(addprefix $(obj)/,$(host-csingle))
-host-cmulti	:= $(addprefix $(obj)/,$(host-cmulti))
-host-cobjs	:= $(addprefix $(obj)/,$(host-cobjs))
-host-objdirs    := $(addprefix $(obj)/,$(host-objdirs))
-
-obj-dirs += $(host-objdirs)
-
-#####
-# Handle options to gcc. Support building with separate output directory
-
-_hostc_flags   = $(HOSTCFLAGS)   $(HOST_EXTRACFLAGS)   \
-                 $(HOSTCFLAGS_$(basetarget).o)
-
-# Find all -I options and call addtree
-flags = $(foreach o,$($(1)),$(if $(filter -I%,$(o)),$(call addtree,$(o)),$(o)))
-
-ifeq ($(OBJTREE),$(SRCTREE))
-__hostc_flags	= $(_hostc_flags)
-else
-__hostc_flags	= -I$(obj) $(call flags,_hostc_flags)
-endif
-
-hostc_flags    = $(__hostc_flags)
-
-#####
-# Compile programs on the host
-
-$(host-csingle): $(obj)/%: $(src)/%.c
-	$(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) $(HOSTLDFLAGS) $(HOSTCFLAGS_$(@F)) $(HOSTCFLAGS_$(BCURDIR)) -o $@ $<
-
-$(host-cmulti): $(obj)/%: $(host-cobjs)
-	$(HOSTCC) $(HOSTLDFLAGS) -o $@ $(addprefix $(obj)/,$($(@F)-objs)) $(HOSTLOADLIBES_$(@F))
-
-$(host-cobjs): $(obj)/%.o: $(src)/%.c
-	$(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS_$(@F)) $(HOSTCFLAGS_$(BCURDIR)) -o $@ $< -c
-
-targets += $(host-csingle)  $(host-cmulti) $(host-cobjs)
-- 
1.8.3.2

  parent reply	other threads:[~2013-12-11 11:01 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-11 11:01 [U-Boot] [PATCH 0/34] Switch over to real Kbuild Masahiro Yamada
2013-12-11 11:01 ` [U-Boot] [PATCH 01/34] .gitignore: ingore files generated by Kbuild Masahiro Yamada
2013-12-11 11:01 ` [U-Boot] [PATCH 02/34] Makefile.host.tmp: add a new script to refactor tools Masahiro Yamada
2013-12-11 11:01 ` [U-Boot] [PATCH 03/34] tools: convert makefiles to kbuild style Masahiro Yamada
2013-12-11 11:01 ` [U-Boot] [PATCH 04/34] board: samsung: refactor host programs Masahiro Yamada
2013-12-11 11:01 ` [U-Boot] [PATCH 05/34] examples: Use scripts/Makefile.build Masahiro Yamada
2013-12-11 11:01 ` [U-Boot] [PATCH 06/34] nand-spl: " Masahiro Yamada
2013-12-11 11:01 ` [U-Boot] [PATCH 07/34] Makfile: move suffix rules to Makefile.build Masahiro Yamada
2013-12-11 11:01 ` [U-Boot] [PATCH 08/34] Makefile: move some variable definitions to the top Makefile Masahiro Yamada
2013-12-11 11:01 ` [U-Boot] [PATCH 09/34] Makefile: move BFD_ROOT_DIR to tools/gdb/Makefile Masahiro Yamada
2013-12-11 11:01 ` [U-Boot] [PATCH 10/34] Kbuild: import Kbuild.include from linux v3.12 tag Masahiro Yamada
2013-12-11 11:01 ` [U-Boot] [PATCH 11/34] Kbuild: Use Kbuild.include Masahiro Yamada
2013-12-11 11:01 ` [U-Boot] [PATCH 12/34] Makefile: move more flags to the top Makefile Masahiro Yamada
2013-12-11 11:01 ` [U-Boot] [PATCH 13/34] Makefile: refactor include path settings Masahiro Yamada
2013-12-11 11:01 ` [U-Boot] [PATCH 14/34] Makefile: move more stuff to top Makefile Masahiro Yamada
2013-12-11 11:01 ` [U-Boot] [PATCH 15/34] Makefile: move some flags to spl/Makefile Masahiro Yamada
2013-12-11 11:01 ` [U-Boot] [PATCH 16/34] Makefile: move some flags to examples makefiles Masahiro Yamada
2013-12-11 11:01 ` [U-Boot] [PATCH 17/34] Kbuild: change out-of-tree building Masahiro Yamada
2013-12-11 11:01 ` [U-Boot] [PATCH 18/34] Kbuild: add dummy obj-y to create built-in.o Masahiro Yamada
2013-12-11 11:01 ` [U-Boot] [PATCH 19/34] Makefile: rename scripts/Makefile.build to scripts/Makefile.build.tmp Masahiro Yamada
2013-12-11 11:01 ` [U-Boot] [PATCH 20/34] Kbuild: import more build scripts from Linux v3.12 tag Masahiro Yamada
2013-12-11 11:01 ` [U-Boot] [PATCH 21/34] Kbuild: use Linux Kernel build scripts Masahiro Yamada
2013-12-11 11:01 ` Masahiro Yamada [this message]
2013-12-11 11:01 ` [U-Boot] [PATCH 23/34] Kbuild: move some lines to more suitable place Masahiro Yamada
2013-12-11 11:01 ` [U-Boot] [PATCH 24/34] Kbuild: convert some make rules to Kbuild style Masahiro Yamada
2013-12-11 11:01 ` [U-Boot] [PATCH 25/34] Kbuild: move include directives of board configuration files Masahiro Yamada
2013-12-11 11:01 ` [U-Boot] [PATCH 26/34] Kbuild: generate {spl, tpl}-autoconf.mk only when it is necessary Masahiro Yamada
2013-12-11 11:01 ` [U-Boot] [PATCH 27/34] Makefile: remove a cleaning target "tidy" Masahiro Yamada
2013-12-11 11:01 ` [U-Boot] [PATCH 28/34] Kbuild: change the top Makefile to more Kbuild-ish structure Masahiro Yamada
2013-12-11 11:01 ` [U-Boot] [PATCH 29/34] examples: move api/ and standalone/ to examples/Makefile Masahiro Yamada
2013-12-11 11:01 ` [U-Boot] [PATCH 30/34] Kbuild: refactor Makefile and spl/Makefile more Masahiro Yamada
2013-12-11 11:01 ` [U-Boot] [PATCH 31/34] Makefile: Do not pass MTD_VERSION from the top Makefile Masahiro Yamada
2013-12-11 11:01 ` [U-Boot] [PATCH 32/34] Makefile: refactor tools-all targets Masahiro Yamada
2013-12-11 11:01 ` [U-Boot] [PATCH 33/34] Kbuild: use scripts/Makefile.clean Masahiro Yamada
2013-12-11 11:01 ` [U-Boot] [PATCH 34/34] Kbuild: support simultaneous board configuration and "make all" Masahiro Yamada
2013-12-11 19:21 ` [U-Boot] [PATCH 0/34] Switch over to real Kbuild Simon Glass
2013-12-12  2:53   ` Masahiro Yamada
2013-12-12 23:39     ` Simon Glass
2013-12-13 22:35       ` Simon Glass
2013-12-16  9:42         ` Masahiro Yamada
2013-12-18 16:21           ` Simon Glass
2013-12-16 11:01         ` Masahiro Yamada

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1386759716-5322-23-git-send-email-yamada.m@jp.panasonic.com \
    --to=yamada.m@jp.panasonic.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.