michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Revert "Kconfig: Source Kconfig from Zephyr application directory."

Browse source 
This reverts commit 83edd615ca.

Causes the documentation build to fail on Kconfig parsing, needs fixing.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2017-06-20 10:10:32 -04:00 • committed by Anas Nashif
commit e3806d9766
8 changed files with 0 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Kconfig.zephyr
View file

@ -28,12 +28,6 @@ source "ext/Kconfig"
source "tests/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. # The following are for Kconfig files for default values only.
# These should be parsed at the end. # These should be parsed at the end.

5
samples/application_development/app_kconfig/Kconfig
View file

@ -1,5 +0,0 @@
menu "APPLICATION CONFIGURATION"
source "$PROJECT_BASE/src/Kconfig"
endmenu

4
samples/application_development/app_kconfig/Makefile
View file

@ -1,4 +0,0 @@
BOARD ?= qemu_x86
CONF_FILE = prj.conf
include ${ZEPHYR_BASE}/Makefile.test

1
samples/application_development/app_kconfig/prj.conf
View file

@ -1 +0,0 @@
# nothing here

6
samples/application_development/app_kconfig/src/Kconfig
View file

@ -1,6 +0,0 @@
config MERGE_PATCH
bool "Merge patch"
default y
help
Will this patch, supporting application
Kconfig configuration, be merged?

1
samples/application_development/app_kconfig/src/Makefile
View file

@ -1 +0,0 @@
obj-y = main.o

15
samples/application_development/app_kconfig/src/main.c
View file

@ -1,15 +0,0 @@
/*
* SPDX-License-Identifier: Apache-2.0
*/
#include <zephyr.h>
#include <misc/printk.h>
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
}

4
samples/application_development/app_kconfig/testcase.ini
View file

@ -1,4 +0,0 @@
[test]
tags = appdev
build_only = true
platform_whitelist = qemu_x86