From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755303AbYGVSvw (ORCPT ); Tue, 22 Jul 2008 14:51:52 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752811AbYGVSvo (ORCPT ); Tue, 22 Jul 2008 14:51:44 -0400 Received: from bombadil.infradead.org ([18.85.46.34]:44987 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750852AbYGVSvn (ORCPT ); Tue, 22 Jul 2008 14:51:43 -0400 Subject: Re: Firmware breakage From: David Woodhouse To: Alan Cox Cc: linux-kernel@vger.kernel.org, sam@ravnborg.org, "Rafael J. Wysocki" In-Reply-To: <1216752196.3019.32.camel@shinybook.infradead.org> References: <20080722173420.6f90556d@lxorguk.ukuu.org.uk> <1216748431.3019.6.camel@shinybook.infradead.org> <20080722190516.4ee477f4@lxorguk.ukuu.org.uk> <1216751464.3019.29.camel@shinybook.infradead.org> <20080722191910.11eef7c4@lxorguk.ukuu.org.uk> <1216752196.3019.32.camel@shinybook.infradead.org> Content-Type: text/plain Date: Tue, 22 Jul 2008 14:51:30 -0400 Message-Id: <1216752690.3019.35.camel@shinybook.infradead.org> Mime-Version: 1.0 X-Mailer: Evolution 2.22.3.1 (2.22.3.1-1.fc9) Content-Transfer-Encoding: 7bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 2008-07-22 at 14:43 -0400, David Woodhouse wrote: > I'm testing this now... This one stands a better chance of working. Does it work for both of you? diff --git a/Makefile b/Makefile index 6192922..3b43ddb 100644 --- a/Makefile +++ b/Makefile @@ -1061,6 +1061,7 @@ modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order @echo ' Building modules, stage 2.'; $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost + $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.fwinst obj=firmware __fw_modbuild # Target to prepare building external modules diff --git a/scripts/Makefile.fwinst b/scripts/Makefile.fwinst index c972c0f..f63a663 100644 --- a/scripts/Makefile.fwinst +++ b/scripts/Makefile.fwinst @@ -17,14 +17,15 @@ include $(srctree)/$(obj)/Makefile include scripts/Makefile.host -mod-fw := $(addprefix $(INSTALL_FW_PATH)/,$(fw-shipped-m)) - +mod-fw := $(fw-shipped-m) # If CONFIG_FIRMWARE_IN_KERNEL isn't set, then install the # firmware for in-kernel drivers too. ifndef CONFIG_FIRMWARE_IN_KERNEL -mod-fw += $(addprefix $(INSTALL_FW_PATH)/,$(fw-shipped-y)) +mod-fw += $(fw-shipped-y) endif +installed-mod-fw := $(addprefix $(INSTALL_FW_PATH)/,$(mod-fw)) + installed-fw := $(addprefix $(INSTALL_FW_PATH)/,$(fw-shipped-all)) installed-fw-dirs := $(sort $(dir $(installed-fw))) $(INSTALL_FW_PATH)/. @@ -49,7 +50,8 @@ PHONY += __fw_install __fw_modinst FORCE .PHONY: $(PHONY) __fw_install: $(installed-fw) -__fw_modinst: $(mod-fw) +__fw_modinst: $(installed-mod-fw) +__fw_modbuild: $(addprefix $(obj)/,$(mod-fw)) FORCE: -- David Woodhouse Open Source Technology Centre David.Woodhouse@intel.com Intel Corporation