From patchwork Mon Mar 4 04:17:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Self X-Patchwork-Id: 10837313 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8E18814DE for ; Mon, 4 Mar 2019 04:25:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6B696285A2 for ; Mon, 4 Mar 2019 04:25:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5978A28B06; Mon, 4 Mar 2019 04:25:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B79A6285A2 for ; Mon, 4 Mar 2019 04:25:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726017AbfCDEYy (ORCPT ); Sun, 3 Mar 2019 23:24:54 -0500 Received: from bluehome.net ([96.66.250.149]:59004 "EHLO bluehome.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725938AbfCDEYx (ORCPT ); Sun, 3 Mar 2019 23:24:53 -0500 X-Greylist: delayed 411 seconds by postgrey-1.27 at vger.kernel.org; Sun, 03 Mar 2019 23:24:53 EST Received: from pc.lan (pc.lan [10.0.0.51]) by bluehome.net (Postfix) with ESMTPSA id 697294B4065A; Sun, 3 Mar 2019 20:18:01 -0800 (PST) From: Jason Self To: linux-wireless@vger.kernel.org Cc: chunkeey@gmail.com, Jason Self Subject: [PATCH] carl9170: remove include references to config.cmake Date: Sun, 3 Mar 2019 20:17:43 -0800 Message-Id: <20190304041743.32648-1-j@jxself.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The build scripts fail because config.cmake is no longer generated, having been removed by Christian Lamparter in commit 786134321b6ef391f04409de1200482e7693284d. But: The include was not updated, and the file was still expected to be present. This removes the references to it in the CMakeLists.txt files. --- CMakeLists.txt | 2 -- carlfw/CMakeLists.txt | 1 - minifw/CMakeLists.txt | 1 - tools/CMakeLists.txt | 2 -- 4 files changed, 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fb18f15..ebbdee3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,8 +5,6 @@ project(carl9170) #if you don't want the full compiler output, remove the following line #set(CMAKE_VERBOSE_MAKEFILE ON) -include("config.cmake") - add_subdirectory(carlfw) if (CONFIG_CARL9170FW_BUILD_MINIBOOT) diff --git a/carlfw/CMakeLists.txt b/carlfw/CMakeLists.txt index 8647a75..ae540fd 100644 --- a/carlfw/CMakeLists.txt +++ b/carlfw/CMakeLists.txt @@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 2.8) project(carl9170.fw) include("../extra/sh-elf-linux.cmake") -include("../config.cmake") set(CARL9170_FW_ELF carl9170.elf) set(CARLFW_CFLAGS_WARNING "-W -Wall -Wextra -Wunreachable-code -Winline -Wlogical-op -Wno-packed-bitfield-compat -Winit-self -Wshadow -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wformat=2 -Wcast-align -Wmissing-format-attribute -Wmissing-prototypes -Wtype-limits -Wmissing-declarations -Wmissing-noreturn -Wredundant-decls -Wnested-externs -Wdisabled-optimization -Wpointer-arith -Wvolatile-register-var -Waddress -Wbad-function-cast -Wunsafe-loop-optimizations") diff --git a/minifw/CMakeLists.txt b/minifw/CMakeLists.txt index adf5e08..9e5ad26 100644 --- a/minifw/CMakeLists.txt +++ b/minifw/CMakeLists.txt @@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 2.8) project(miniboot.fw) include("../extra/sh-elf-linux.cmake") -include("../config.cmake") set(miniboot_src miniboot.S) set_source_files_properties(miniboot.S PROPERTIES LANGUAGE C) diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 13262d6..8f6ac4a 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -8,8 +8,6 @@ endif (CONFIG_CARL9170FW_MAKE_RELEASE) set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/extra) -include("../config.cmake") - include_directories (../include/linux ../include/shared ../include lib include) add_subdirectory(lib) add_subdirectory(src)