Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp580910pxk; Wed, 2 Sep 2020 09:16:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyJAwBwuN2djX/O5br/AiibGcGY+IN4LR247jIKWCY3+xGv4CSt9HMvgV4SyNWbKiKnPdCC X-Received: by 2002:a17:906:d78c:: with SMTP id pj12mr798653ejb.36.1599063368336; Wed, 02 Sep 2020 09:16:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599063368; cv=none; d=google.com; s=arc-20160816; b=Il6ytSx+44SfIWDsRDHwPHl6YEC9bi0k5Rth/B0tmZZ7zqZhLXU5cxuK7YcvyRWwpe ZfMfcQMHdvhssHSxXeD2kBXWWzo1i3DvkDUPArhG6BwaVq1b5bHoWlLE5SqeTFq1LTu3 eGCDcl0KYZgy/s9IKbPe4ms6ggM/bC3cHhlQlSe3+Fi6a9Pzt3wFIS2cOPwHeExm03NP d7lDql3OA5yIwieGTNQS/PAEZBdmmdvYdyml/rX6nleA5FRAWCJAQSWtIRO/y3Gv3JPH uY7dPTRP9xeWyBMD6ckWdBn5cThl25mUlG2HvHv2H96V9MnllIPG/DV4JGfYtjjedK2k /mTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:to:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:from :dkim-signature; bh=Y5zP9N0YWmRsXlmwqsjGrk18Z+us3rhWvqVfno2bY44=; b=Nqd+whszP4rtbQqNvYvfvUgwR6JzPUC81g+YFgmQJYx+JRqMag0p4I8OJP20aY+UgP FrEFNxyAJFY7K4v35oieuw4n6Y4X4ch2AdEGvPpF2OG+lzmYPfL0sMiqyaOqsLflT4nx VobpHO2bnplAuyJigMtk0ILLaGqs6C0q0hJTj/rme9ruw/1ZEuu2J9uMyyfj6PqEa2O1 SfWzIK5slqXmIOJioxrdQgjDZkrEpwFaqYyb4MjUsLxUa7Vfm6X4B8ta14O9uq+JJ4cn 4wtVUbGedMB67cGPKx13oHLw5WxdtpcqhrjtgBAVROnNvMIQ3+Qqf8JAtrR3QMKZzZxh nz+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@kernel.org header.s=default header.b="Z5UQUpl/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t15si3047840ejx.688.2020.09.02.09.15.44; Wed, 02 Sep 2020 09:16:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=fail header.i=@kernel.org header.s=default header.b="Z5UQUpl/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728149AbgIBQOY (ORCPT + 99 others); Wed, 2 Sep 2020 12:14:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:54040 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728328AbgIBQK4 (ORCPT ); Wed, 2 Sep 2020 12:10:56 -0400 Received: from mail.kernel.org (ip5f5ad5c3.dynamic.kabel-deutschland.de [95.90.213.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7352A21D93; Wed, 2 Sep 2020 16:10:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599063046; bh=QRcYkbu7JvtjVp54e+chCMVF4TavZnBWpxUSfCm0mkI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Z5UQUpl/qc1DM1RcLM0MuJiiLxCHWujkZzq6lqMLt3BtfVDuZrQGWuqCiJZwH1/TY Dle5y4L+H+sWF+JhO49ZQnXBzDy1UI0n8r1PIyfcXaVywKsUR+p7JZF6pBkaJjjB57 /Ln8X10C8Q4dXSKQPyNe9IlYUaQrLPm41QOj0uj4= Received: from mchehab by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1kDVLQ-000tB7-L4; Wed, 02 Sep 2020 18:10:44 +0200 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , Sakari Ailus , Greg Kroah-Hartman , linux-media@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH 30/38] media: atomisp: don't check for ISP version for includes Date: Wed, 2 Sep 2020 18:10:33 +0200 Message-Id: <7f589c4f14c767228278e0dd029faa037ce00bcf.1599062230.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit To: unlisted-recipients:; (no To-header on input) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org As there aren't duplicated names anymore, and the end goal is to do runtime checks between ISP2400 and ISP2401, remove the part of the Makefile which changes the include places based on the compile-time version. This shouldn't cause any effect, but it will make easier for further patches meant to remove conditional compiler decisions between ISP versions to be replaced by runtime ones. Signed-off-by: Mauro Carvalho Chehab --- drivers/staging/media/atomisp/Makefile | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/drivers/staging/media/atomisp/Makefile b/drivers/staging/media/atomisp/Makefile index 205d0f8cc2e1..1dfad0dd02d0 100644 --- a/drivers/staging/media/atomisp/Makefile +++ b/drivers/staging/media/atomisp/Makefile @@ -307,18 +307,12 @@ INCLUDES += \ -I$(atomisp)/pci/runtime/queue/src/ \ -I$(atomisp)/pci/runtime/rmgr/interface/ \ -I$(atomisp)/pci/runtime/spctrl/interface/ \ - -I$(atomisp)/pci/runtime/tagger/interface/ - -INCLUDES_byt += \ + -I$(atomisp)/pci/runtime/tagger/interface/ \ -I$(atomisp)/pci/css_2400_system/hive/ \ - -INCLUDES_cht += \ -I$(atomisp)/pci/css_2401_system/ \ -I$(atomisp)/pci/css_2401_system/host/ \ -I$(atomisp)/pci/css_2401_system/hive/ \ - -I$(atomisp)/pci/css_2401_system/hrt/ \ - -# -I$(atomisp)/pci/css_2401_system/hive_isp_css_2401_system_generated/ \ + -I$(atomisp)/pci/css_2401_system/hrt/ DEFINES := -DHRT_HW -DHRT_ISP_CSS_CUSTOM_HOST -DHRT_USE_VIR_ADDRS -D__HOST__ #DEFINES += -DUSE_DYNAMIC_BIN @@ -330,11 +324,9 @@ DEFINES := -DHRT_HW -DHRT_ISP_CSS_CUSTOM_HOST -DHRT_USE_VIR_ADDRS -D__HOST__ ifeq ($(CONFIG_VIDEO_ATOMISP_ISP2401),y) atomisp-objs += $(obj-cht) -INCLUDES += $(INCLUDES_cht) DEFINES += -DISP2401 -DISP2401_NEW_INPUT_SYSTEM -DSYSTEM_hive_isp_css_2401_system else atomisp-objs += $(obj-byt) -INCLUDES += $(INCLUDES_byt) DEFINES += -DISP2400 -DSYSTEM_hive_isp_css_2400_system endif -- 2.26.2