On Fri, 2008-05-23 at 16:00 -0300, Alexandre Oliva wrote: > I see one of your patches simply renames a .h to a .c and makes the > blob a built-in firmware. > > Any reason to not have moved it to the firmware/ dir, as I expected > from looking at your patches? This attempts it, on top of the current git tree. Doesn't work with O= build though, because it doesn't create the firmware/korg/ directory: Real life calls... index f6b0c3c..f9d7f17 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -2,9 +2,12 @@ # kbuild file for firmware/ # +firmware-$(CONFIG_SND_KORG1212_FIRMWARE_IN_KERNEL) += korg/k1212 + firmware_bins := $(subst ",,$(CONFIG_BUILTIN_FIRMWARE)) -firmware_objs := $(patsubst %,%.o, $(firmware_bins)) -firmware_srcs := $(patsubst %,$(obj)/%.c, $(firmware_bins)) +firmware_srcs_generated := $(patsubst %,$(obj)/%.c, $(firmware_bins)) +firmware_objs := $(patsubst %,%.o, $(firmware_bins) $(firmware-y)) +firmware_dirs := $(dir $(firmware_objs)) quiet_cmd_fwbin = MK_FW $@ @@ -21,4 +24,4 @@ $(firmware_srcs): $(obj)/%.c: $(srctree)/$(obj)/% obj-y := $(firmware_objs) -targets := $(firmware_objs) +targets := $(firmware_objs) $(firmware_srcs_generated) diff --git a/sound/pci/korg1212/korg1212-firmware.c b/firmware/korg/k1212.c similarity index 100% rename from sound/pci/korg1212/korg1212-firmware.c rename to firmware/korg/k1212.c diff --git a/sound/pci/korg1212/Makefile b/sound/pci/korg1212/Makefile index 7a5ebdf..f11ce1b 100644 --- a/sound/pci/korg1212/Makefile +++ b/sound/pci/korg1212/Makefile @@ -7,4 +7,3 @@ snd-korg1212-objs := korg1212.o # Toplevel Module Dependency obj-$(CONFIG_SND_KORG1212) += snd-korg1212.o -obj-$(CONFIG_SND_KORG1212_FIRMWARE_IN_KERNEL) += korg1212-firmware.o -- dwmw2 -- fedora-devel-list mailing list fedora-devel-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/fedora-devel-list
