From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A12F2C43219 for ; Mon, 6 Dec 2021 15:49:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1391610AbhLFPuU (ORCPT ); Mon, 6 Dec 2021 10:50:20 -0500 Received: from dfw.source.kernel.org ([139.178.84.217]:48428 "EHLO dfw.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1388288AbhLFPcc (ORCPT ); Mon, 6 Dec 2021 10:32:32 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 9D9E06130D; Mon, 6 Dec 2021 15:29:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8413AC34901; Mon, 6 Dec 2021 15:29:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1638804543; bh=JY+Wv0SOirE7UpuK3AObj9lwLRWcwiAQicAXkAAJmrg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a47EIuj5DSAIx1JrGecdcQzoLYEgxpvgYQiAbNJNWPKI9iyOwoBS/eBtQbUfISDSE Ba4pSkCQb9Gfvo9CSCUs/wuxV1p2PBTwJFG6zaNDWu7IVkIiACY4NTUddbXro7tA/Y itGiuApxf9Pux1ShNmBwqlSHovHocuLTcIFkJsQI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Helge Deller Subject: [PATCH 5.15 185/207] parisc: Fix KBUILD_IMAGE for self-extracting kernel Date: Mon, 6 Dec 2021 15:57:19 +0100 Message-Id: <20211206145616.680140092@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211206145610.172203682@linuxfoundation.org> References: <20211206145610.172203682@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Helge Deller commit 1d7c29b77725d05faff6754d2f5e7c147aedcf93 upstream. Default KBUILD_IMAGE to $(boot)/bzImage if a self-extracting (CONFIG_PARISC_SELF_EXTRACT=y) kernel is to be built. This fixes the bindeb-pkg make target. Signed-off-by: Helge Deller Cc: # v4.14+ Signed-off-by: Greg Kroah-Hartman --- arch/parisc/Makefile | 5 +++++ 1 file changed, 5 insertions(+) --- a/arch/parisc/Makefile +++ b/arch/parisc/Makefile @@ -17,7 +17,12 @@ # Mike Shaver, Helge Deller and Martin K. Petersen # +ifdef CONFIG_PARISC_SELF_EXTRACT +boot := arch/parisc/boot +KBUILD_IMAGE := $(boot)/bzImage +else KBUILD_IMAGE := vmlinuz +endif NM = sh $(srctree)/arch/parisc/nm CHECKFLAGS += -D__hppa__=1