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

Commit 556b0f58 authored by David Woodhouse's avatar David Woodhouse
Browse files

Revert "fix modules_install via NFS" 



This reverts commit 8b249b68.

This 'fix' is not necessary; we just need to undo the damage caused
accidentally by Igor/Mauro in 4b29631d
("V4L/DVB (9533): cx88: Add support for TurboSight TBS8910 DVB-S PCI card")

Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 8e320d02

firmware/.gitignore

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

*.csp

*.dsp

ihex2fw

firmware/Makefile

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



quiet_cmd_ihex2fw  = IHEX2FW $@

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

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



quiet_cmd_h16tofw  = H16TOFW $@

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

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



quiet_cmd_fwbin = MK_FW   $@

      cmd_fwbin = FWNAME="$(patsubst firmware/%.gen.S,%,$@)";		     \
@@ -184,11 +184,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  | $(objtree)/$(obj)/$$(dir %)

$(obj)/%.fw: $(obj)/%.HEX $(obj)/ihex2fw | $(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 | $(objtree)/$(obj)/$$(dir %)

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

	$(call cmd,h16tofw)



$(firmware-dirs):
@@ -205,3 +205,5 @@ 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

scripts/ihex2fw.c→firmware/ihex2fw.c

+0 −0

File moved.

View file

scripts/.gitignore

+0 −1
Original line number Diff line number Diff line 
#

# Generated files

#

ihex2fw

conmakehash

kallsyms

pnmtologo

scripts/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -2,12 +2,11 @@ 
# scripts contains sources for various helper programs used throughout

# the kernel for the build process.

# ---------------------------------------------------------------------------

# ihex2fw:       Parser/loader for IHEX formatted data

# kallsyms:      Find all symbols in vmlinux

# pnmttologo:    Convert pnm files to logo files

# conmakehash:   Create chartable

# conmakehash:	 Create arrays for initializing the kernel console tables



hostprogs-y                      := ihex2fw

hostprogs-$(CONFIG_KALLSYMS)     += kallsyms

hostprogs-$(CONFIG_LOGO)         += pnmtologo

hostprogs-$(CONFIG_VT)           += conmakehash