From e3806d976645c9e634c1692d4cf5d708797755b4 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Tue, 20 Jun 2017 10:10:32 -0400 Subject: [PATCH] Revert "Kconfig: Source Kconfig from Zephyr application directory." This reverts commit 83edd615cad9ca5e7b846190b5142799908f51bc. Causes the documentation build to fail on Kconfig parsing, needs fixing. Signed-off-by: Anas Nashif --- Kconfig.zephyr | 6 ------ .../application_development/app_kconfig/Kconfig | 5 ----- .../application_development/app_kconfig/Makefile | 4 ---- .../application_development/app_kconfig/prj.conf | 1 - .../app_kconfig/src/Kconfig | 6 ------ .../app_kconfig/src/Makefile | 1 - .../app_kconfig/src/main.c | 15 --------------- .../app_kconfig/testcase.ini | 4 ---- 8 files changed, 42 deletions(-) delete mode 100644 samples/application_development/app_kconfig/Kconfig delete mode 100644 samples/application_development/app_kconfig/Makefile delete mode 100644 samples/application_development/app_kconfig/prj.conf delete mode 100644 samples/application_development/app_kconfig/src/Kconfig delete mode 100644 samples/application_development/app_kconfig/src/Makefile delete mode 100644 samples/application_development/app_kconfig/src/main.c delete mode 100644 samples/application_development/app_kconfig/testcase.ini diff --git a/Kconfig.zephyr b/Kconfig.zephyr index ea89bafa29e..45b52acaf6e 100644 --- a/Kconfig.zephyr +++ b/Kconfig.zephyr @@ -28,12 +28,6 @@ source "ext/Kconfig" source "tests/Kconfig" -config PROJECT_BASE - string - option env="PROJECT_BASE" - -source "$PROJECT_BASE/Kconfig" - # # The following are for Kconfig files for default values only. # These should be parsed at the end. diff --git a/samples/application_development/app_kconfig/Kconfig b/samples/application_development/app_kconfig/Kconfig deleted file mode 100644 index beb2eb8a796..00000000000 --- a/samples/application_development/app_kconfig/Kconfig +++ /dev/null @@ -1,5 +0,0 @@ -menu "APPLICATION CONFIGURATION" - -source "$PROJECT_BASE/src/Kconfig" - -endmenu diff --git a/samples/application_development/app_kconfig/Makefile b/samples/application_development/app_kconfig/Makefile deleted file mode 100644 index e70a750a88d..00000000000 --- a/samples/application_development/app_kconfig/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -BOARD ?= qemu_x86 -CONF_FILE = prj.conf - -include ${ZEPHYR_BASE}/Makefile.test diff --git a/samples/application_development/app_kconfig/prj.conf b/samples/application_development/app_kconfig/prj.conf deleted file mode 100644 index b2a4ba59104..00000000000 --- a/samples/application_development/app_kconfig/prj.conf +++ /dev/null @@ -1 +0,0 @@ -# nothing here diff --git a/samples/application_development/app_kconfig/src/Kconfig b/samples/application_development/app_kconfig/src/Kconfig deleted file mode 100644 index d5b0443c94b..00000000000 --- a/samples/application_development/app_kconfig/src/Kconfig +++ /dev/null @@ -1,6 +0,0 @@ -config MERGE_PATCH - bool "Merge patch" - default y - help - Will this patch, supporting application - Kconfig configuration, be merged? diff --git a/samples/application_development/app_kconfig/src/Makefile b/samples/application_development/app_kconfig/src/Makefile deleted file mode 100644 index 00066e15678..00000000000 --- a/samples/application_development/app_kconfig/src/Makefile +++ /dev/null @@ -1 +0,0 @@ -obj-y = main.o diff --git a/samples/application_development/app_kconfig/src/main.c b/samples/application_development/app_kconfig/src/main.c deleted file mode 100644 index 8a2ceedcd34..00000000000 --- a/samples/application_development/app_kconfig/src/main.c +++ /dev/null @@ -1,15 +0,0 @@ -/* - * SPDX-License-Identifier: Apache-2.0 - */ - -#include -#include - -void main(void) -{ -#if defined(CONFIG_MERGE_PATCH) - printk("This patch will be merged!\n"); -#else - printk("This patch will not be merged!\n"); -#endif -} diff --git a/samples/application_development/app_kconfig/testcase.ini b/samples/application_development/app_kconfig/testcase.ini deleted file mode 100644 index c3d0fa6f664..00000000000 --- a/samples/application_development/app_kconfig/testcase.ini +++ /dev/null @@ -1,4 +0,0 @@ -[test] -tags = appdev -build_only = true -platform_whitelist = qemu_x86