Skip to contentSkip to conversation

carl9170: remove include references to config.cmake

PATCH New Jason Self 1 participant 1 message Mar 4, 2019

lore
Share & tools
lore

Jason Self

author
#0 lore raw

PATCH 1/1 carl9170: remove include references to config.cmake

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(-)
CMakeLists.txt +0 -2
index fb18f15..ebbdee3 100644
@@ -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)
carlfw/CMakeLists.txt +0 -1
index 8647a75..ae540fd 100644
@@ -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")
minifw/CMakeLists.txt +0 -1
index adf5e08..9e5ad26 100644
@@ -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)
tools/CMakeLists.txt +0 -2
index 13262d6..8f6ac4a 100644
@@ -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)
Signature · 1 line
2.20.1