From patchwork Wed Nov 11 16:46:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eugen Hristev X-Patchwork-Id: 1398424 X-Patchwork-Delegate: eugen.hristev@microchip.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=quarantine dis=none) header.from=microchip.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=microchip.com header.i=@microchip.com header.a=rsa-sha256 header.s=mchp header.b=KBApetil; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CWVxv6fBZz9sRK for ; Thu, 12 Nov 2020 03:46:49 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A05FC8250A; Wed, 11 Nov 2020 17:46:34 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=quarantine dis=none) header.from=microchip.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=microchip.com header.i=@microchip.com header.b="KBApetil"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 95E6582522; Wed, 11 Nov 2020 17:46:32 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from esa2.microchip.iphmx.com (esa2.microchip.iphmx.com [68.232.149.84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 641F38000F for ; Wed, 11 Nov 2020 17:46:25 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=microchip.com Authentication-Results: phobos.denx.de; spf=fail smtp.mailfrom=Eugen.Hristev@microchip.com DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1605113185; x=1636649185; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=T1lB+ReYqU1gvUIvNIldRdYrMmNCZiW0zgNaN7778Jw=; b=KBApetilrQld36RJy4QKyB6booN9C6AaWcArvIkpyvrYJhmg+pPX4hBJ 6Xbi17RNNpuHzsXKpFnwwX7Mg9RuGWBjzmzS12g+E2HluDSCOcOju4zbM QijVHYi/hiLM9P71ab70SPa6cb7eiSJ4NQe0n+SXGwjfsdro3LlHZLk3L EA+Z2+gDiNkR3n6kzDWXeL3xs/EQi79EZ8FppgbzwoSh8kjt3GfKkXtZV xixljoLB83hfUu8sCHJiLDv87SSQf099kEyJ6kd5iaIjeOD8mVnTMGp+F eMy3APUf+VsptGg2Ee7mOU29+zDgJE2F1fX4EiZfV+nFn+rsRGKaYwsS7 w==; IronPort-SDR: RAsK+sivMD2AhLeYfplBo5zeZqGIDk+8Kvnqc85Q+ZbyjcqIwOJvZr7pd1Elt8pJcLMwflPW/k V5xkWrs97wkHsJKLWMWG9wAInVrqwkVzns34gQA3MNIqLyhJpD3YAOVa5PXzYj1vXJQN3VyDAN qAqrbT91IMygaWmRUqoiVJDmYwPZmrzvXzYm3vpegMYtllnTPuv+JOH0CLZodjh714b49fH5m5 vO9vTjBTI4W4565K+TRMV+UCXNabV6MhGz3ER5Zbq94uKC4m32zSC0etOylqfLZGE8FrlZUiVA J4s= X-IronPort-AV: E=Sophos;i="5.77,470,1596524400"; d="scan'208";a="95937790" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa2.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 11 Nov 2020 09:46:23 -0700 Received: from chn-vm-ex02.mchp-main.com (10.10.85.144) by chn-vm-ex03.mchp-main.com (10.10.85.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Wed, 11 Nov 2020 09:46:22 -0700 Received: from ROB-ULT-M18282.microchip.com (10.10.115.15) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server id 15.1.1979.3 via Frontend Transport; Wed, 11 Nov 2020 09:46:13 -0700 From: Eugen Hristev To: CC: , Eugen Hristev Subject: [PATCH] ARM: mach-at91: fix timer.o compile condition Date: Wed, 11 Nov 2020 18:46:03 +0200 Message-ID: <20201111164603.288797-1-eugen.hristev@microchip.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean The AT91 architecture now has two possible timer blocks, the old PIT timer and the new PIT64B. The timer.c file has an old non DM driver that works for platforms that do not use the ATMEL_PIT_TIMER DM-based driver. Update the Makefile to select this old driver in case neither of the ATMEL_PIT_TIMER and the MCHP_PIT64B_TIMER are selected. Suggested-by: Claudiu Beznea Signed-off-by: Eugen Hristev --- arch/arm/mach-at91/armv7/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-at91/armv7/Makefile b/arch/arm/mach-at91/armv7/Makefile index b46b90b28e..f5b2665957 100644 --- a/arch/arm/mach-at91/armv7/Makefile +++ b/arch/arm/mach-at91/armv7/Makefile @@ -12,6 +12,9 @@ obj-$(CONFIG_SAMA5D4) += sama5d4_devices.o clock.o obj-$(CONFIG_SAMA7G5) += sama7g5_devices.o obj-y += cpu.o obj-y += reset.o -ifeq ($(CONFIG_ATMEL_PIT_TIMER),) +ifneq ($(CONFIG_ATMEL_PIT_TIMER),y) +ifneq ($(CONFIG_MCHP_PIT64B_TIMER),y) +# old non-DM timer driver obj-y += timer.o endif +endif