diff --git a/Makefile b/Makefile
index fd01571b..2d76e5a8 100644
--- a/Makefile
+++ b/Makefile
@@ -4,8 +4,11 @@ APP_DIR?=examples
 APP?=helloworld
 CPU_ID?=none
 COMx?=
+BOOTROM?=n
 
 SUPPORT_FLOAT?=n
+SUPPORT_ROMAPI?=y
+
 INTERFACE?=uart
 BAUDRATE ?=2000000
 
@@ -15,8 +18,10 @@ export BOARD
 export CHIP
 export APP_DIR
 export APP
+export BOOTROM
 export CPU_ID
 export SUPPORT_FLOAT
+export SUPPORT_ROMAPI
 
 # The command to remove a file.
 RM = cmake -E rm -rf
diff --git a/project.build b/project.build
index c1d8876e..03fda0e3 100644
--- a/project.build
+++ b/project.build
@@ -5,8 +5,10 @@ endif
 cmake_definition+= -DCHIP=$(CHIP)
 cmake_definition+= -DBOARD=$(BOARD)
 cmake_definition+= -DSUPPORT_FLOAT=$(SUPPORT_FLOAT)
+cmake_definition+= -DSUPPORT_ROMAPI=$(SUPPORT_ROMAPI)
 cmake_definition+= -DAPP_DIR=$(APP_DIR)
 cmake_definition+= -DAPP=$(APP)
+cmake_definition+= -DBOOTROM=$(BOOTROM)
 
 __build:
 	cmake $(cmake_definition) ..
diff --git a/tools/cmake/tools.cmake b/tools/cmake/tools.cmake
index 70282400..a161ea36 100644
--- a/tools/cmake/tools.cmake
+++ b/tools/cmake/tools.cmake
@@ -86,6 +86,11 @@ function(generate_bin)
     string(REGEX REPLACE "(.*)/${current_relative_dir_name}$" "\\1" above_absolute_dir ${CMAKE_CURRENT_LIST_DIR})
     get_filename_component(above_relative_dir_name ${above_absolute_dir} NAME)
 
+    execute_process(
+    COMMAND git submodule status
+    OUTPUT_VARIABLE GIT_SUBMODULE_INFO
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+
     # Add common options
     add_compile_options(${GLOBAL_C_FLAGS})
     add_compile_options(-D${BOARD})
@@ -101,8 +106,25 @@ function(generate_bin)
 
     # add other libraries which are target or extern library
     if(TARGET_REQUIRED_LIBS)
+        file(GLOB_RECURSE lib_cmakelists_files ${CMAKE_SOURCE_DIR}/components/CMakeLists.txt)
         foreach(lib ${TARGET_REQUIRED_LIBS})
-        check_add_library(${lib} ${CMAKE_SOURCE_DIR}/components/${lib})
+            if(${lib} MATCHES "lib.*")
+                get_filename_component(exlib_absolute_dir ${lib} DIRECTORY)
+                get_filename_component(exlibrary_name ${lib} NAME_WE)
+                message(STATUS "[register extern library component: ${exlibrary_name}], path:${exlib_absolute_dir}")
+            elseif(lib_cmakelists_files)
+
+                foreach(lib_cmakelists_file ${lib_cmakelists_files})
+                get_filename_component(lib_absolute_dir ${lib_cmakelists_file} DIRECTORY)
+                get_filename_component(lib_absolute_dir_name ${lib_absolute_dir} NAME)
+
+                if(${lib_absolute_dir_name} STREQUAL "${lib}")
+                    check_add_library(${lib} ${lib_absolute_dir})
+                endif()
+                endforeach()
+            else()
+                message(FATAL_ERROR "${lib} is not a target or a extern library")
+            endif()
         endforeach()
     endif()
 
@@ -115,11 +137,20 @@ function(generate_bin)
         set(OUTPUT_DIR ${OUTPUT})
         set(target_name firmware)
     else()
-        if(${above_relative_dir_name} STREQUAL "examples")
-            set(OUTPUT_DIR ${CMAKE_SOURCE_DIR}/out/${APP_DIR}/${current_relative_dir_name})
-        else()
-            set(OUTPUT_DIR ${CMAKE_SOURCE_DIR}/out/${APP_DIR}/${above_relative_dir_name}/${current_relative_dir_name})
+        if(${APP_DIR} MATCHES "../") #if demo is not in sdk path
+            string(REPLACE "../" "" dir ${APP_DIR})
+            set(OUTPUT_DIR ${CMAKE_SOURCE_DIR}/out/${dir}/${current_relative_dir_name})
+        elseif(${APP_DIR} MATCHES "./")#if demo is in sdk peer path
+            set(OUTPUT_DIR ${CMAKE_SOURCE_DIR}/out/${current_relative_dir_name})
+        else()  #if demo is in sdk path not in peer path
+            if(${APP_DIR} MATCHES ${above_relative_dir_name}) #if demo has one-Layer Catalog
+                set(OUTPUT_DIR ${CMAKE_SOURCE_DIR}/out/${APP_DIR}/${current_relative_dir_name})
+            else() #if demo has Two-Layer Catalog
+                set(OUTPUT_DIR ${CMAKE_SOURCE_DIR}/out/${APP_DIR}/${above_relative_dir_name}/${current_relative_dir_name})
+            endif()
         endif()
+
+        file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/submodule_commit_info.txt ${GIT_SUBMODULE_INFO})
         set(target_name ${current_relative_dir_name})
     endif()
 
@@ -169,7 +200,7 @@ function(generate_bin)
     target_link_libraries(${target_name}.elf ${CHIP}_driver c)
 
     if(TARGET_REQUIRED_LIBS)
-        target_link_libraries(${target_name}.elf ${TARGET_REQUIRED_LIBS})
+    target_link_libraries(${target_name}.elf ${TARGET_REQUIRED_LIBS})
     endif()
 
     target_link_libraries(${target_name}.elf m)
@@ -187,25 +218,34 @@ function(search_application component_path)
 
 if(DEFINED APP)
 
-    file(GLOB_RECURSE cmakelists_files ${component_path}/CMakeLists.txt)
-    set(app_find_ok 0)
+    # find CMakeLists in ${component_path}/${APP}/,${APP} is the first directory
+    file(GLOB_RECURSE first_dir_cmakelists ${component_path}/${APP}/CMakeLists.txt)
 
-    foreach(cmakelists_file ${cmakelists_files})
-    get_filename_component(app_relative_dir ${cmakelists_file} DIRECTORY)
-    get_filename_component(app_name ${app_relative_dir} NAME)
-        if("${APP}" STREQUAL "all")
-            message(STATUS "[run app:${app_name}], path:${app_relative_dir}")
-            add_subdirectory(${app_relative_dir})
-            set(app_find_ok 1)
-        elseif(${app_name} MATCHES "^${APP}")
-            message(STATUS "[run app:${app_name}], path:${app_relative_dir}")
-            add_subdirectory(${app_relative_dir})
-            set(app_find_ok 1)
-        endif()
-    endforeach()
-    if(NOT app_find_ok)
-    message(FATAL_ERROR "can not find app:${APP}")
+    if(first_dir_cmakelists)
+    list(APPEND cmakelists_files ${first_dir_cmakelists})
     endif()
+
+    # find CMakeLists in ${component_path}/*/${APP}*/,${APP} is the second directory
+    file(GLOB_RECURSE second_dir_cmakelists ${component_path}/*/${APP}*/CMakeLists.txt)
+
+    if(second_dir_cmakelists)
+    list(APPEND cmakelists_files ${second_dir_cmakelists})
+    endif()
+
+    list(REMOVE_DUPLICATES cmakelists_files)
+
+    if(cmakelists_files)
+        #build app finding
+        foreach(cmakelists_file IN LISTS cmakelists_files)
+        get_filename_component(app_absolute_dir ${cmakelists_file} DIRECTORY)
+        get_filename_component(app_absolute_dir_name ${app_absolute_dir} NAME)
+        message(STATUS "[run app:${app_absolute_dir_name}], path:${app_absolute_dir}")
+        add_subdirectory(${app_absolute_dir} ${CMAKE_SOURCE_DIR}/build/samples/${app_absolute_dir_name})
+        endforeach()
+    else()
+    message(FATAL_ERROR "can not find ${APP} in the first or second directory under the path:${component_path}")
+    endif()
+
 else()
 add_subdirectory($ENV{PROJECT_DIR}/src src)
 endif()
@@ -213,15 +253,7 @@ endif()
 endfunction()
 
 function(check_add_library target_name directory)
-    if(IS_DIRECTORY ${directory})
-        if(NOT TARGET ${target_name})
-        add_subdirectory(${directory} ${CMAKE_SOURCE_DIR}/build/libraries/${target_name})
-        endif()
-    elseif(EXISTS ${target_name})
-        get_filename_component(lib_relative_dir ${target_name} DIRECTORY)
-        get_filename_component(library_name ${target_name} NAME_WE)
-        message(STATUS "[register extern library component: ${library_name}], path:${lib_relative_dir}")
-    else()
-    message(FATAL_ERROR "both ${target_name} and ${directory} is not exist")
+    if(NOT TARGET ${target_name})
+    add_subdirectory(${directory} ${CMAKE_SOURCE_DIR}/build/libraries/${target_name})
     endif()
 endfunction()
\ No newline at end of file