michaelh/zephyr
1
0
Fork 0
Code Releases Activity

userspace: remove APP_SHARED_MEM Kconfig

Browse source 
This is an integral part of userspace and cannot be used
on its own. Fold into the main userspace configuration.

Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
This commit is contained in:
Andrew Boie 2019-02-22 16:08:44 -08:00 • committed by Anas Nashif
commit 4ce652e4b2
28 changed files with 57 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

1
subsys/testsuite/Kconfig
View file

@ -63,7 +63,6 @@ config TEST_USERSPACE
depends on ARCH_HAS_USERSPACE
depends on TEST
select USERSPACE
select APP_SHARED_MEM
select DYNAMIC_OBJECTS
default y
help

2
subsys/testsuite/ztest/include/ztest_test.h
View file

@ -143,7 +143,7 @@ static inline void unit_test_noop(void)
*/
/* definitions for use with testing application shared memory */
#ifdef CONFIG_APP_SHARED_MEM
#ifdef CONFIG_USERSPACE
#define ZTEST_DMEM K_APP_DMEM(ztest_mem_partition)
#define ZTEST_BMEM K_APP_BMEM(ztest_mem_partition)
#define ZTEST_SECTION K_APP_DMEM_SECTION(ztest_mem_partition)

8
subsys/testsuite/ztest/src/ztest.c
View file

@ -7,7 +7,7 @@
#include <ztest.h>
#include <stdio.h>
#include <app_memory/app_memdomain.h>
#ifdef CONFIG_APP_SHARED_MEM
#ifdef CONFIG_USERSPACE
#include <misc/libc-hooks.h>
#endif
@ -282,7 +282,7 @@ void end_report(void)
}
}
#ifdef CONFIG_APP_SHARED_MEM
#ifdef CONFIG_USERSPACE
struct k_mem_domain ztest_mem_domain;
K_APPMEM_PARTITION_DEFINE(ztest_mem_partition);
#endif
@ -299,7 +299,7 @@ int main(void)
#else
void main(void)
{
#ifdef CONFIG_APP_SHARED_MEM
#ifdef CONFIG_USERSPACE
struct k_mem_partition *parts[] = {
&ztest_mem_partition,
/* C library globals, stack canary storage, etc */
@ -314,7 +314,7 @@ void main(void)
*/
k_mem_domain_init(&ztest_mem_domain, ARRAY_SIZE(parts), parts);
k_mem_domain_add_thread(&ztest_mem_domain, k_current_get());
#endif /* CONFIG_APP_SHARED_MEM */
#endif /* CONFIG_USERSPACE */
_init_mock();
test_main();