[Realtek] Adjust files struct (project-chip#39239)

* [Realtek] Adjust files struct

* [Realtek] restore chip_device_platform

* [Realtek] Restyle files

Author: pankore

.gitmodules

@@ -50,7 +50,7 @@
 	path = third_party/freertos/repo
 	url = https://github.com/FreeRTOS/FreeRTOS-Kernel.git
 	branch  = V10.3.1-kernel-only
-	platforms = ameba,cc13xx_26xx,bouffalolab,esp32,infineon,qpg,cc32xx,realtek_bee
+	platforms = ameba,cc13xx_26xx,bouffalolab,esp32,infineon,qpg,cc32xx,realtek
 [submodule "simw-top-mini"]
 	path = third_party/simw-top-mini/repo
 	url = https://github.com/NXP/plug-and-trust.git
@@ -353,4 +353,4 @@
 [submodule "third_party/openthread/ot-realtek"]
 	path = third_party/openthread/ot-realtek
 	url = https://github.com/rtkconnectivity/ot-realtek.git
-	platforms = realtek_bee
+	platforms = realtek

config/realtek_bee/.gn config/realtek/bee/.gnconfig/realtek_bee/.gn renamed to config/realtek/bee/.gn

@@ -15,7 +15,7 @@
 import("//build_overrides/build.gni")
 
 # The location of the build configuration file.
-buildconfig = "${build_root}/config/BUILDCONFIG.gn"
+buildconfig = "//build/config/BUILDCONFIG.gn"
 
 # CHIP uses angle bracket includes.
 check_system_includes = true
@@ -24,5 +24,5 @@ default_args = {
   target_cpu = "arm"
   target_os = "freertos"
 
-  import("//args.gni")
+  import("//config/realtek/bee/args.gni")
 }

config/realtek_bee/BUILD.gn config/realtek/bee/BUILD.gnconfig/realtek_bee/BUILD.gn renamed to config/realtek/bee/BUILD.gn

@@ -18,17 +18,17 @@
 import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
 
-import("${chip_root}/build/chip/tests.gni")
+import("//build/chip/tests.gni")
 
 declare_args() {
   chip_build_pw_rpc_lib = false
 }
 
-group("realtek_bee") {
-  deps = [ "${chip_root}/src/lib" ]
+group("bee") {
+  deps = [ "//src/lib" ]
 
   if (chip_build_pw_rpc_lib) {
-    deps += [ "//lib/pw_rpc" ]
+    deps += [ "//config/realtek/bee/lib/pw_rpc" ]
   }
 
   if (chip_build_tests) {

config/realtek_bee/args.gni config/realtek/bee/args.gniconfig/realtek_bee/args.gni renamed to config/realtek/bee/args.gni

@@ -21,13 +21,13 @@ import("//build_overrides/pigweed.gni")
 chip_device_platform = "realtek_bee"
 
 # ARM architecture flags will be set for Bee
-arm_platform_config = "${chip_root}/config/realtek_bee/bee_arm.gni"
+arm_platform_config = "//config/realtek/bee/bee_arm.gni"
 
 chip_project_config_include = ""
 chip_system_project_config_include = ""
 chip_ble_project_config_include = ""
 
-mbedtls_target = "//mbedtls:mbedtls"
+mbedtls_target = "//config/realtek/bee/mbedtls:mbedtls"
 lwip_platform = "external"
 
 chip_build_tests = false
@@ -43,8 +43,7 @@ chip_enable_ota_requestor = false
 chip_system_config_use_openthread_inet_endpoints = true
 chip_with_lwip = false
 openthread_root = ""
-chip_openthread_target = "${chip_root}/config/realtek_bee/openthread:openthread"
+chip_openthread_target = "//config/realtek/bee/openthread:openthread"
 
 chip_config_network_layer_ble = true
-custom_toolchain =
-    "//third_party/connectedhomeip/config/realtek_bee/toolchain:realtek_bee"
+custom_toolchain = "//config/realtek/bee/toolchain:bee"

config/realtek_bee/bee_arm.gni config/realtek/bee/bee_arm.gniconfig/realtek_bee/bee_arm.gni renamed to config/realtek/bee/bee_arm.gni

@@ -23,7 +23,6 @@ list(
     -DCHIP_PROJECT=1
     -DCONFIG_USE_MBEDTLS_ROM_ALG
     -DDM_ODM_SUPPORT_TYPE=32
-    -DCHIP_DEVICE_LAYER_TARGET=Realtek_bee
     -D_POSIX_REALTIME_SIGNALS
     -DCHIP_SHELL_MAX_TOKENS=11
 )
@@ -58,13 +57,13 @@ list(
     APPEND CHIP_INC
 
 	${inc_path}
-    ${CHIP_ROOT}/config/realtek_bee
+    ${CHIP_ROOT}/config/realtek/bee
     ${CHIP_ROOT}/src/include
     ${CHIP_ROOT}/src/lib
     ${CHIP_ROOT}/src
     ${CHIP_ROOT}/src/system
     ${CHIP_ROOT}/src/app
-    ${CHIP_ROOT}/src/platform/Realtek_bee
+    ${CHIP_ROOT}/src/platform/realtek/BEE
     ${CHIP_ROOT}/src/platform/OpenThread
     ${CHIP_ROOT}/third_party/nlassert/repo/include
     ${CHIP_ROOT}/third_party/nlio/repo/include
@@ -101,7 +100,7 @@ foreach(tmp IN LISTS GLOBAL_CXX_FLAGS)
 endforeach()
 string(APPEND chip_cpp_flags "${chip_c_flags}")
 
-set(import_str "import(\"//args.gni\")\n" )
+set(import_str "import(\"//config/realtek/bee/args.gni\")\n" )
 
 string(APPEND CHIP_GN_ARGS "${import_str}")
 
@@ -134,12 +133,12 @@ endif (matter_enable_persistentstorage_audit)
 # Build RPC
 if (matter_enable_rpc)
 string(APPEND CHIP_GN_ARGS "chip_build_pw_rpc_lib = true\n")
-string(APPEND CHIP_GN_ARGS "pw_log_BACKEND = \"//third_party/connectedhomeip/third_party/pigweed/repo/pw_log_basic\"\n")
-string(APPEND CHIP_GN_ARGS "pw_assert_BACKEND = \"//third_party/connectedhomeip/third_party/pigweed/repo/pw_assert_log:check_backend\"\n")
-string(APPEND CHIP_GN_ARGS "pw_sys_io_BACKEND = \"//third_party/connectedhomeip/examples/platform/realtek_bee/pw_sys_io:pw_sys_io_bee\"\n")
-string(APPEND CHIP_GN_ARGS "dir_pw_third_party_nanopb = \"//third_party/connectedhomeip/third_party/nanopb/repo\"\n")
-string(APPEND CHIP_GN_ARGS "pw_build_LINK_DEPS = [\"//third_party/connectedhomeip/third_party/pigweed/repo/pw_assert:impl\", \"//third_party/connectedhomeip/third_party/pigweed/repo/pw_log:impl\"]\n")
-string(APPEND CHIP_GN_ARGS "pw_rpc_CONFIG = \"//third_party/connectedhomeip/third_party/pigweed/repo/pw_rpc:disable_global_mutex\"")
+string(APPEND CHIP_GN_ARGS "pw_log_BACKEND = \"//third_party/pigweed/repo/pw_log_basic\"\n")
+string(APPEND CHIP_GN_ARGS "pw_assert_BACKEND = \"//third_party/pigweed/repo/pw_assert_log:check_backend\"\n")
+string(APPEND CHIP_GN_ARGS "pw_sys_io_BACKEND = \"//examples/platform/realtek/bee/pw_sys_io:pw_sys_io_bee\"\n")
+string(APPEND CHIP_GN_ARGS "dir_pw_third_party_nanopb = \"//third_party/nanopb/repo\"\n")
+string(APPEND CHIP_GN_ARGS "pw_build_LINK_DEPS = [\"//third_party/pigweed/repo/pw_assert:impl\", \"//third_party/pigweed/repo/pw_log:impl\"]\n")
+string(APPEND CHIP_GN_ARGS "pw_rpc_CONFIG = \"//third_party/pigweed/repo/pw_rpc:disable_global_mutex\"")
 endif (matter_enable_rpc)
 
 if(matter_enable_ftd)
@@ -182,12 +181,19 @@ ExternalProject_Add(
     PREFIX                  ${CMAKE_CURRENT_BINARY_DIR}
     SOURCE_DIR              ${CHIP_ROOT}
     BINARY_DIR              ${CMAKE_CURRENT_BINARY_DIR}
-    CONFIGURE_COMMAND       gn --root=${CHIP_ROOT}/config/realtek_bee gen --check --fail-on-unused-args ${CHIP_OUTPUT}
-    BUILD_COMMAND           ninja -C ${CHIP_OUTPUT} :realtek_bee
+    CONFIGURE_COMMAND       gn
+                            --root=${CHIP_ROOT}
+                            --root-target=${CHIP_ROOT}/config/realtek/bee
+                            --dotfile=${CHIP_ROOT}/config/realtek/bee/.gn
+                            gen
+                            --check
+                            --fail-on-unused-args
+                            "${CHIP_OUTPUT}"
+    BUILD_COMMAND           ninja -C "${CHIP_OUTPUT}" bee
     INSTALL_COMMAND         ""
     BUILD_BYPRODUCTS        -lCHIP -lPwRpc
-	CONFIGURE_ALWAYS        TRUE
+    CONFIGURE_ALWAYS        TRUE
     BUILD_ALWAYS            TRUE
     USES_TERMINAL_CONFIGURE TRUE
     USES_TERMINAL_BUILD     TRUE
-)
+)

config/realtek_bee/chip.cmake config/realtek/bee/chip.cmakeconfig/realtek_bee/chip.cmake renamed to config/realtek/bee/chip.cmake

@@ -23,7 +23,7 @@ static_library("pw_rpc") {
   deps = [
     "$dir_pw_rpc:server",
     "$dir_pw_rpc/nanopb:echo_service",
-    "${chip_root}/examples/platform/realtek_bee/pw_sys_io:pw_sys_io_bee",
+    "${chip_root}/examples/platform/realtek/bee/pw_sys_io:pw_sys_io_bee",
     dir_pw_assert,
     dir_pw_hdlc,
     dir_pw_log,

config/realtek_bee/lib/pw_rpc/BUILD.gn config/realtek/bee/lib/pw_rpc/BUILD.gnconfig/realtek_bee/lib/pw_rpc/BUILD.gn renamed to config/realtek/bee/lib/pw_rpc/BUILD.gn

@@ -24,7 +24,7 @@ declare_args() {
   bee_cpu = ""
 }
 
-gcc_toolchain("realtek_bee") {
+gcc_toolchain("bee") {
   ar = bee_ar
   cc = bee_cc
   cxx = bee_cxx
@@ -33,6 +33,6 @@ gcc_toolchain("realtek_bee") {
     current_os = "freertos"
     current_cpu = bee_cpu
     is_clang = false
-    import("${chip_root}/src/platform/Realtek_bee/args.gni")
+    import("${chip_root}/src/platform/realtek/BEE/args.gni")
   }
 }