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)
--
2.20.1
