Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6906a2c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes 

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
  kbuild: fix typos (s/bin_shipped/bin.o_shipped/) in Documentation
  kbuild: add a symlink to the source for separate objdirs
  kconfig: add script to manipulate .config files on the command line
  kbuild: reintroduce ALLSOURCE_ARCHS support for tags/cscope
  bootchart: improve output based on Dave Jones' feedback
  fix modules_install via NFS
  qnx: include <linux/types.h> for definitions of __[us]{8,16,32,64} types
parents 8903709b baa91878

Documentation/kbuild/kbuild.txt

+7 −0
Original line number Diff line number Diff line
@@ -124,3 +124,10 @@ KBUILD_EXTRA_SYMBOLS 
--------------------------------------------------

For modules use symbols from another modules.

See more details in modules.txt.



ALLSOURCE_ARCHS

--------------------------------------------------

For tags/TAGS/cscope targets, you can specify more than one archs

to be included in the databases, separated by blankspace. e.g.



    $ make ALLSOURCE_ARCHS="x86 mips arm" tags

Documentation/kbuild/modules.txt

+2 −2
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ following files: 


		# Module specific targets

		genbin:

			echo "X" > 8123_bin_shipped

			echo "X" > 8123_bin.o_shipped





	In example 2, we are down to two fairly simple files and for simple
@@ -279,7 +279,7 @@ following files: 


		# Module specific targets

		genbin:

			echo "X" > 8123_bin_shipped

			echo "X" > 8123_bin.o_shipped



		endif

Makefile

+1 −0
Original line number Diff line number Diff line
@@ -965,6 +965,7 @@ ifneq ($(KBUILD_SRC),) 
	    mkdir -p include2;                                          \

	    ln -fsn $(srctree)/include/asm-$(SRCARCH) include2/asm;     \

	fi

	ln -fsn $(srctree) source

endif



# prepare2 creates a makefile if using a separate output directory

firmware/.gitignore

+0 −1
Original line number Diff line number Diff line
@@ -3,4 +3,3 @@ 
*.bin

*.csp

*.dsp
 
ihex2fw

firmware/Makefile

+4 −6
Original line number Diff line number Diff line
@@ -99,10 +99,10 @@ quiet_cmd_ihex = IHEX $@ 
      cmd_ihex  = $(OBJCOPY) -Iihex -Obinary $< $@



quiet_cmd_ihex2fw  = IHEX2FW $@

      cmd_ihex2fw  = $(objtree)/$(obj)/ihex2fw $< $@

      cmd_ihex2fw  = $(objtree)/scripts/ihex2fw $< $@



quiet_cmd_h16tofw  = H16TOFW $@

      cmd_h16tofw  = $(objtree)/$(obj)/ihex2fw -w $< $@

      cmd_h16tofw  = $(objtree)/scripts/ihex2fw -w $< $@



quiet_cmd_fwbin = MK_FW   $@

      cmd_fwbin = FWNAME="$(patsubst firmware/%.gen.S,%,$@)";		     \
@@ -165,11 +165,11 @@ $(obj)/%: $(obj)/%.ihex | $(objtree)/$(obj)/$$(dir %) 
# is actually meaningful, because the firmware has to be loaded in a certain

# order rather than as a single binary blob. Thus, we convert them into our

# more compact binary representation of ihex records (<linux/ihex.h>)

$(obj)/%.fw: $(obj)/%.HEX $(obj)/ihex2fw | $(objtree)/$(obj)/$$(dir %)

$(obj)/%.fw: $(obj)/%.HEX  | $(objtree)/$(obj)/$$(dir %)

	$(call cmd,ihex2fw)



# .H16 is our own modified form of Intel HEX, with 16-bit length for records.

$(obj)/%.fw: $(obj)/%.H16 $(obj)/ihex2fw | $(objtree)/$(obj)/$$(dir %)

$(obj)/%.fw: $(obj)/%.H16 | $(objtree)/$(obj)/$$(dir %)

	$(call cmd,h16tofw)



$(firmware-dirs):
@@ -186,5 +186,3 @@ targets := $(fw-shipped-) $(patsubst $(obj)/%,%, \ 
# Without this, built-in.o won't be created when it's empty, and the

# final vmlinux link will fail.

obj-n := dummy
 


hostprogs-y := ihex2fw