configs/rtl8730e: Reorganize 8730 defconfigs

In order to satisfy the above changes, this commit makes the following modifications: 1. Enable SMP in loadable_apps config of rtl8730 by default 2. rtl8730e/loadable apps - Will have smp, xip and PM with single app and common binary 3. we are dropping loadable_apps_smp and loadable_apps_xip defconfigs 4. Change app1 to wifi and app2 to micom in all other defconfigs 5. Fix build issues Signed-off-by: Neelkumar Patel <[email protected]>
Samsung · Jul 1, 2024 · 1702dc6 · 1702dc6
1 parent e1125be
commit 1702dc6
Show file tree

Hide file tree

Showing 19 changed files with 123 additions and 3,416 deletions.
diff --git a/build/configs/imxrt1020-evk/loadable_elf_apps/defconfig b/build/configs/imxrt1020-evk/loadable_elf_apps/defconfig
@@ -1580,17 +1580,17 @@ CONFIG_APP1_BIN_NAME="app1"
 CONFIG_APP1_BIN_TYPE="ELF"
 CONFIG_APP1_BIN_VER=190412
 CONFIG_APP1_BIN_DYN_RAMSIZE=512000
-CONFIG_APP1_BIN_LOADING_PRIORITY="HIGH"
-CONFIG_APP1_MAIN_STACKSIZE=4096
-CONFIG_APP1_MAIN_PRIORITY=220
+CONFIG_APP1_BIN_LOADING_PRIORITY="LOW"
+CONFIG_APP1_MAIN_STACKSIZE=8192
+CONFIG_APP1_MAIN_PRIORITY=180
 CONFIG_APP2_INFO=y
 CONFIG_APP2_BIN_NAME="app2"
 CONFIG_APP2_BIN_TYPE="ELF"
 CONFIG_APP2_BIN_VER=190412
 CONFIG_APP2_BIN_DYN_RAMSIZE=512000
-CONFIG_APP2_BIN_LOADING_PRIORITY="LOW"
-CONFIG_APP2_MAIN_STACKSIZE=8192
-CONFIG_APP2_MAIN_PRIORITY=180
+CONFIG_APP2_BIN_LOADING_PRIORITY="HIGH"
+CONFIG_APP2_MAIN_STACKSIZE=4096
+CONFIG_APP2_MAIN_PRIORITY=220
 
 #
 # Runtime Environment

diff --git a/build/configs/imxrt1050-evk/loadable_elf_apps/defconfig b/build/configs/imxrt1050-evk/loadable_elf_apps/defconfig
@@ -1024,17 +1024,17 @@ CONFIG_APP1_BIN_NAME="app1"
 CONFIG_APP1_BIN_TYPE="ELF"
 CONFIG_APP1_BIN_VER=190412
 CONFIG_APP1_BIN_DYN_RAMSIZE=512000
-CONFIG_APP1_BIN_LOADING_PRIORITY="HIGH"
-CONFIG_APP1_MAIN_STACKSIZE=4096
-CONFIG_APP1_MAIN_PRIORITY=220
+CONFIG_APP1_BIN_LOADING_PRIORITY="LOW"
+CONFIG_APP1_MAIN_STACKSIZE=8192
+CONFIG_APP1_MAIN_PRIORITY=180
 CONFIG_APP2_INFO=y
 CONFIG_APP2_BIN_NAME="app2"
 CONFIG_APP2_BIN_TYPE="ELF"
 CONFIG_APP2_BIN_VER=190412
 CONFIG_APP2_BIN_DYN_RAMSIZE=512000
-CONFIG_APP2_BIN_LOADING_PRIORITY="LOW"
-CONFIG_APP2_MAIN_STACKSIZE=8192
-CONFIG_APP2_MAIN_PRIORITY=180
+CONFIG_APP2_BIN_LOADING_PRIORITY="HIGH"
+CONFIG_APP2_MAIN_STACKSIZE=4096
+CONFIG_APP2_MAIN_PRIORITY=220
 
 #
 # Runtime Environment

diff --git a/build/configs/qemu/tc_16m/defconfig b/build/configs/qemu/tc_16m/defconfig
@@ -1245,16 +1245,16 @@ CONFIG_APP1_BIN_TYPE="ELF"
 CONFIG_APP1_BIN_VER=190412
 CONFIG_APP1_BIN_DYN_RAMSIZE=512000
 CONFIG_APP1_BIN_LOADING_PRIORITY="HIGH"
-CONFIG_APP1_MAIN_STACKSIZE=4096
-CONFIG_APP1_MAIN_PRIORITY=220
+CONFIG_APP1_MAIN_STACKSIZE=8192
+CONFIG_APP1_MAIN_PRIORITY=180
 CONFIG_APP2_INFO=y
 CONFIG_APP2_BIN_NAME="app2"
 CONFIG_APP2_BIN_TYPE="ELF"
 CONFIG_APP2_BIN_VER=190412
 CONFIG_APP2_BIN_DYN_RAMSIZE=512000
 CONFIG_APP2_BIN_LOADING_PRIORITY="HIGH"
-CONFIG_APP2_MAIN_STACKSIZE=8192
-CONFIG_APP2_MAIN_PRIORITY=180
+CONFIG_APP2_MAIN_STACKSIZE=4096
+CONFIG_APP2_MAIN_PRIORITY=220
 
 #
 # Runtime Environment

diff --git a/build/configs/rtl8720e/loadable_apps/defconfig b/build/configs/rtl8720e/loadable_apps/defconfig
@@ -288,7 +288,7 @@ CONFIG_ARCH_BOARD_HAVE_FLASH=y
 #
 CONFIG_FLASH_PARTITION=y
 CONFIG_FLASH_MINOR=0
-CONFIG_FLASH_PART_SIZE="32,28,16,4,432,2608,20,440,2608,20,440,512,1024,8,"
+CONFIG_FLASH_PART_SIZE="32,28,16,4,432,2608,440,20,2608,440,20,512,1024,8,"
 CONFIG_FLASH_PART_TYPE="none,none,none,none,none,kernel,bin,bin,kernel,bin,bin,smartfs,ftl,bootparam,"
 CONFIG_FLASH_PART_NAME="bl1,reserved,ftl,system_data,ss,kernel,app1,app2,kernel,app1,app2,userfs,reserved,bootparam,"
 # CONFIG_ARCH_BOARD_HAVE_SECOND_FLASH is not set
@@ -1518,17 +1518,17 @@ CONFIG_APP1_BIN_NAME="app1"
 CONFIG_APP1_BIN_TYPE="ELF"
 CONFIG_APP1_BIN_VER=190412
 CONFIG_APP1_BIN_DYN_RAMSIZE=512000
-CONFIG_APP1_BIN_LOADING_PRIORITY="HIGH"
-CONFIG_APP1_MAIN_STACKSIZE=4096
-CONFIG_APP1_MAIN_PRIORITY=220
+CONFIG_APP1_BIN_LOADING_PRIORITY="LOW"
+CONFIG_APP1_MAIN_STACKSIZE=8192
+CONFIG_APP1_MAIN_PRIORITY=180
 CONFIG_APP2_INFO=y
 CONFIG_APP2_BIN_NAME="app2"
 CONFIG_APP2_BIN_TYPE="ELF"
 CONFIG_APP2_BIN_VER=190412
 CONFIG_APP2_BIN_DYN_RAMSIZE=512000
-CONFIG_APP2_BIN_LOADING_PRIORITY="LOW"
-CONFIG_APP2_MAIN_STACKSIZE=8192
-CONFIG_APP2_MAIN_PRIORITY=180
+CONFIG_APP2_BIN_LOADING_PRIORITY="HIGH"
+CONFIG_APP2_MAIN_STACKSIZE=4096
+CONFIG_APP2_MAIN_PRIORITY=220
 
 #
 # Runtime Environment

diff --git a/build/configs/rtl8721csm/cpp_loadable/defconfig b/build/configs/rtl8721csm/cpp_loadable/defconfig
@@ -280,7 +280,7 @@ CONFIG_ARCH_BOARD_HAVE_FLASH=y
 #
 CONFIG_FLASH_PARTITION=y
 CONFIG_FLASH_MINOR=0
-CONFIG_FLASH_PART_SIZE="16,8,16,472,8,1000,1000,1292,1292,512,512,516,516,1024,8,"
+CONFIG_FLASH_PART_SIZE="16,8,16,472,8,1000,1000,1292,1292,516,516,512,512,1024,8,"
 CONFIG_FLASH_PART_TYPE="none,none,none,none,none,kernel,kernel,bin,bin,bin,bin,bin,bin,smartfs,bootparam,"
 CONFIG_FLASH_PART_NAME="bl1,bl2,reserved,ss,system_data,kernel,kernel,common,common,app1,app1,app2,app2,userfs,bootparam,"
 # CONFIG_ARCH_BOARD_HAVE_SECOND_FLASH is not set
@@ -1539,17 +1539,17 @@ CONFIG_APP1_BIN_NAME="app1"
 CONFIG_APP1_BIN_TYPE="ELF"
 CONFIG_APP1_BIN_VER=190412
 CONFIG_APP1_BIN_DYN_RAMSIZE=512000
-CONFIG_APP1_BIN_LOADING_PRIORITY="HIGH"
-CONFIG_APP1_MAIN_STACKSIZE=4096
-CONFIG_APP1_MAIN_PRIORITY=220
+CONFIG_APP1_BIN_LOADING_PRIORITY="LOW"
+CONFIG_APP1_MAIN_STACKSIZE=8192
+CONFIG_APP1_MAIN_PRIORITY=180
 CONFIG_APP2_INFO=y
 CONFIG_APP2_BIN_NAME="app2"
 CONFIG_APP2_BIN_TYPE="ELF"
 CONFIG_APP2_BIN_VER=190412
 CONFIG_APP2_BIN_DYN_RAMSIZE=512000
-CONFIG_APP2_BIN_LOADING_PRIORITY="LOW"
-CONFIG_APP2_MAIN_STACKSIZE=8192
-CONFIG_APP2_MAIN_PRIORITY=180
+CONFIG_APP2_BIN_LOADING_PRIORITY="HIGH"
+CONFIG_APP2_MAIN_STACKSIZE=4096
+CONFIG_APP2_MAIN_PRIORITY=220
 
 #
 # Runtime Environment

diff --git a/build/configs/rtl8721csm/loadable_apps/defconfig b/build/configs/rtl8721csm/loadable_apps/defconfig
@@ -264,7 +264,7 @@ CONFIG_ARCH_BOARD_HAVE_FLASH=y
 #
 CONFIG_FLASH_PARTITION=y
 CONFIG_FLASH_MINOR=0
-CONFIG_FLASH_PART_SIZE="16,8,16,472,8,1792,1792,512,512,1016,1016,1024,8,"
+CONFIG_FLASH_PART_SIZE="16,8,16,472,8,1792,1792,1016,1016,512,512,1024,8,"
 CONFIG_FLASH_PART_TYPE="none,none,none,none,none,kernel,kernel,bin,bin,bin,bin,smartfs,bootparam,"
 CONFIG_FLASH_PART_NAME="bl1,bl2,reserved,ss,system_data,kernel,kernel,app1,app1,app2,app2,userfs,bootparam,"
 # CONFIG_ARCH_BOARD_HAVE_SECOND_FLASH is not set
@@ -1458,17 +1458,17 @@ CONFIG_APP1_BIN_NAME="app1"
 CONFIG_APP1_BIN_TYPE="ELF"
 CONFIG_APP1_BIN_VER=190412
 CONFIG_APP1_BIN_DYN_RAMSIZE=512000
-CONFIG_APP1_BIN_LOADING_PRIORITY="HIGH"
-CONFIG_APP1_MAIN_STACKSIZE=4096
-CONFIG_APP1_MAIN_PRIORITY=220
+CONFIG_APP1_BIN_LOADING_PRIORITY="LOW"
+CONFIG_APP1_MAIN_STACKSIZE=8192
+CONFIG_APP1_MAIN_PRIORITY=180
 CONFIG_APP2_INFO=y
 CONFIG_APP2_BIN_NAME="app2"
 CONFIG_APP2_BIN_TYPE="ELF"
 CONFIG_APP2_BIN_VER=190412
 CONFIG_APP2_BIN_DYN_RAMSIZE=512000
-CONFIG_APP2_BIN_LOADING_PRIORITY="LOW"
-CONFIG_APP2_MAIN_STACKSIZE=8192
-CONFIG_APP2_MAIN_PRIORITY=180
+CONFIG_APP2_BIN_LOADING_PRIORITY="HIGH"
+CONFIG_APP2_MAIN_STACKSIZE=4096
+CONFIG_APP2_MAIN_PRIORITY=220
 
 #
 # Runtime Environment

diff --git a/build/configs/rtl8730e/flat_apps/defconfig b/build/configs/rtl8730e/flat_apps/defconfig
@@ -364,11 +364,13 @@ CONFIG_PREALLOC_TIMERS=8
 #
 # Tasks and Scheduling
 #
-# CONFIG_SPINLOCK is not set
+CONFIG_SPINLOCK=y
 CONFIG_INIT_ENTRYPOINT=y
-# CONFIG_IRQCOUNT is not set
-# CONFIG_SCHED_RESUMESCHEDULER is not set
-# CONFIG_SMP is not set
+CONFIG_IRQCOUNT=y
+CONFIG_SCHED_RESUMESCHEDULER=y
+CONFIG_SMP=y
+CONFIG_CPU_GATING=y
+CONFIG_SMP_NCPUS=2
 CONFIG_RR_INTERVAL=10
 CONFIG_TASK_NAME_SIZE=31
 CONFIG_MAX_TASKS=128
@@ -1394,7 +1396,9 @@ CONFIG_EXAMPLES_HELLO=y
 # CONFIG_EXAMPLES_SMART is not set
 # CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMARTFS_POWERCUT is not set
-# CONFIG_EXAMPLES_SPEECH_DETECTOR_TEST is not set
+CONFIG_TESTING_SMP=y
+CONFIG_TESTING_SMP_NBARRIER_THREADS=8
+CONFIG_SMP_TEST_PTHREAD=y
 # CONFIG_EXAMPLES_ST_THINGS is not set
 # CONFIG_EXAMPLES_TESTCASE is not set
 

diff --git a/build/configs/rtl8730e/loadable_apps/defconfig b/build/configs/rtl8730e/loadable_apps/defconfig
@@ -23,9 +23,11 @@ CONFIG_FRAMEWORK_DIR="../framework"
 CONFIG_TOOLS_DIR="../tools"
 # CONFIG_BUILD_FLAT is not set
 CONFIG_APP_BINARY_SEPARATION=y
-CONFIG_NUM_APPS=2
+CONFIG_NUM_APPS=1
 # CONFIG_APPS_RAM_REGION_SHAREABLE is not set
-# CONFIG_SUPPORT_COMMON_BINARY is not set
+CONFIG_SUPPORT_COMMON_BINARY=y
+CONFIG_COMMON_BINARY_VERSION="200204"
+CONFIG_COMMON_BINARY_NAME="common"
 CONFIG_NUM_L2_PER_APP=4
 CONFIG_BUILD_PROTECTED=y
 CONFIG_BUILD_2PASS=y
@@ -322,9 +324,11 @@ CONFIG_ARCH_BOARD_HAVE_FLASH=y
 #
 CONFIG_FLASH_PARTITION=y
 CONFIG_FLASH_MINOR=0
-CONFIG_FLASH_PART_SIZE="60,40,12,400,1844,4808,384,1844,4808,384,512,1280,8,"
+CONFIG_FLASH_PART_SIZE="60,40,12,400,1844,3040,1384,1844,3040,1384,2048,1280,8,"
 CONFIG_FLASH_PART_TYPE="none,none,none,none,kernel,bin,bin,kernel,bin,bin,smartfs,ftl,bootparam,"
-CONFIG_FLASH_PART_NAME="bl1,reserved,ftl,ss,kernel,app1,app2,kernel,app1,app2,userfs,reserved,bootparam,"
+CONFIG_FLASH_PART_NAME="bl1,reserved,ftl,ss,kernel,common,app1,kernel,common,app1,userfs,micom,bootparam,"
+CONFIG_TRPK_CONTAINS_MULTIPLE_BINARY=y
+CONFIG_FLASH_VSTART_LOADABLE=0xe000000
 # CONFIG_ARCH_BOARD_HAVE_SECOND_FLASH is not set
 CONFIG_AUTOMOUNT=y
 CONFIG_AUTOMOUNT_USERFS=y
@@ -379,11 +383,14 @@ CONFIG_PREALLOC_TIMERS=8
 #
 # Tasks and Scheduling
 #
-# CONFIG_SPINLOCK is not set
+CONFIG_SPINLOCK=y
 CONFIG_INIT_ENTRYPOINT=y
-# CONFIG_IRQCOUNT is not set
-# CONFIG_SCHED_RESUMESCHEDULER is not set
-# CONFIG_SMP is not set
+CONFIG_IRQCOUNT=y
+CONFIG_SCHED_RESUMESCHEDULER=y
+CONFIG_SMP=y
+CONFIG_CPU_GATING=y
+CONFIG_CPU_HOTPLUG=y
+CONFIG_SMP_NCPUS=2
 CONFIG_RR_INTERVAL=10
 CONFIG_TASK_NAME_SIZE=31
 CONFIG_MAX_TASKS=128
@@ -1213,7 +1220,7 @@ CONFIG_LIBC_SCANSET=y
 # CONFIG_NOPRINTF_LONGLONG_TO_ASCII is not set
 CONFIG_LIBC_IOCTL_VARIADIC=y
 CONFIG_LIBC_WCHAR=y
-# CONFIG_LIBC_LOCALE is not set
+CONFIG_LIBC_LOCALE=y
 CONFIG_LIB_RAND_ORDER=1
 # CONFIG_EOL_IS_CR is not set
 # CONFIG_EOL_IS_LF is not set
@@ -1274,7 +1281,7 @@ CONFIG_CXX_NEWLONG=y
 # LLVM C++ Library (libcxx)
 #
 CONFIG_LIBCXX=y
-# CONFIG_LIBCXX_EXCEPTION is not set
+CONFIG_LIBCXX_EXCEPTION=y
 CONFIG_LIBCXX_IOSTREAM_BUFSIZE=32
 CONFIG_LIBCXX_HAVE_LIBSUPCXX=y
 
@@ -1329,19 +1336,10 @@ CONFIG_STRESS_TOOL=y
 #
 CONFIG_BINFMT_ENABLE=y
 CONFIG_BINFMT_LOADABLE=y
-CONFIG_ELF=y
-# CONFIG_XIP_ELF is not set
-CONFIG_ELF_ALIGN_LOG2=2
-CONFIG_ELF_STACKSIZE=8192
-CONFIG_ELF_BUFFERSIZE=32
-CONFIG_ELF_BUFFERINCR=32
-CONFIG_ELF_EXCLUDE_SYMBOLS=y
-CONFIG_ELF_CACHE_READ=y
-CONFIG_ELF_CACHE_BLOCK_SIZE=2048
-CONFIG_ELF_CACHE_BLOCKS_COUNT=60
+# CONFIG_ELF is not set
+CONFIG_XIP_ELF=y
 CONFIG_BINFMT_CONSTRUCTORS=y
 # CONFIG_SYMTAB_ORDEREDBYNAME is not set
-CONFIG_OPTIMIZE_APP_RELOAD_TIME=y
 CONFIG_SAVE_BIN_SECTION_ADDR=y
 
 #
@@ -1362,6 +1360,8 @@ CONFIG_COMPRESSION_BLOCK_SIZE=16384
 # CONFIG_ENTRY_MANUAL is not set
 # CONFIG_ENTRY_CMSIS_NN is not set
 CONFIG_ENTRY_HELLO=y
+# CONFIG_ENTRY_HELLOXX is not set
+# CONFIG_ENTRY_TESTCASE is not set
 CONFIG_USER_ENTRYPOINT="hello_main"
 CONFIG_BUILTIN_APPS=y
 
@@ -1400,7 +1400,7 @@ CONFIG_BUILTIN_APPS=y
 #
 # CONFIG_EXAMPLES_HEAVY_SIGNAL_MESSAGE_TEST is not set
 CONFIG_EXAMPLES_HELLO=y
-# CONFIG_EXAMPLES_HELLOXX is not set
+CONFIG_EXAMPLES_HELLOXX=y
 # CONFIG_EXAMPLES_IOTBUS_TEST is not set
 # CONFIG_EXAMPLES_IOTIVITY is not set
 # CONFIG_EXAMPLES_IOTJS_STARTUP is not set
@@ -1546,18 +1546,11 @@ CONFIG_APP1_INFO=y
 CONFIG_APP1_BIN_NAME="app1"
 CONFIG_APP1_BIN_TYPE="ELF"
 CONFIG_APP1_BIN_VER=190412
-CONFIG_APP1_BIN_DYN_RAMSIZE=512000
-CONFIG_APP1_BIN_LOADING_PRIORITY="HIGH"
-CONFIG_APP1_MAIN_STACKSIZE=4096
-CONFIG_APP1_MAIN_PRIORITY=220
-CONFIG_APP2_INFO=y
-CONFIG_APP2_BIN_NAME="app2"
-CONFIG_APP2_BIN_TYPE="ELF"
-CONFIG_APP2_BIN_VER=190412
-CONFIG_APP2_BIN_DYN_RAMSIZE=512000
-CONFIG_APP2_BIN_LOADING_PRIORITY="LOW"
-CONFIG_APP2_MAIN_STACKSIZE=8192
-CONFIG_APP2_MAIN_PRIORITY=180
+CONFIG_APP1_BIN_DYN_RAMSIZE=1048576
+CONFIG_APP1_BIN_LOADING_PRIORITY="LOW"
+CONFIG_APP1_MAIN_STACKSIZE=8192
+CONFIG_APP1_MAIN_PRIORITY=180
+# CONFIG_APP2_INFO is not set
 
 #
 # Runtime Environment