Adjust the PKG selection position.

2024-05-27 17:32:45 +08:00 · 2024-05-27 17:32:45 +08:00 · b65b922f6c
parent 0d2d5e88c7
commit b65b922f6c
15 changed files with 28 additions and 49 deletions
--- a/bsp/Infineon/libraries/Kconfig
+++ b/bsp/Infineon/libraries/Kconfig
@ -5,8 +5,21 @@ config SOC_SERIES_IFX_PSOC62
    bool
    select ARCH_ARM_CORTEX_M4
    select SOC_FAMILY_IFX
+    select PKG_USING_INFINEON_CAT1CM0P
+    select PKG_USING_INFINEON_CMSIS
+    select PKG_USING_INFINEON_CORE_LIB
+    select PKG_USING_INFINEON_MTB_HAL_CAT1
+    select PKG_USING_INFINEON_MTB_PDL_CAT1
+    select PKG_USING_INFINEON_RETARGET_IO
+    select PKG_USING_INFINEON_CAPSENSE

 config SOC_SERIES_IFX_XMC
    bool
    select ARCH_ARM_CORTEX_M7
-    select SOC_FAMILY_IFX
+    select SOC_FAMILY_IFX
+    select PKG_USING_INFINEON_CAT1CM0P
+    select PKG_USING_INFINEON_CMSIS
+    select PKG_USING_INFINEON_CORE_LIB
+    select PKG_USING_INFINEON_MTB_HAL_CAT1
+    select PKG_USING_INFINEON_MTB_PDL_CAT1
+    select PKG_USING_INFINEON_RETARGET_IO
--- a/bsp/Infineon/psoc6-cy8ckit-062-BLE/SConstruct
+++ b/bsp/Infineon/psoc6-cy8ckit-062-BLE/SConstruct
@ -36,6 +36,8 @@ Export('rtconfig')

 SDK_ROOT = os.path.abspath('./')

+libraries_path_prefix = SDK_ROOT
+
 if os.path.exists(SDK_ROOT + '/packages'):
    libraries_path_prefix = SDK_ROOT + '/packages'
 else:
--- a/bsp/Infineon/psoc6-cy8ckit-062-BLE/board/Kconfig
+++ b/bsp/Infineon/psoc6-cy8ckit-062-BLE/board/Kconfig
@ -5,13 +5,6 @@ config SOC_CY8C6347BZI_BLD53
    select SOC_SERIES_IFX_PSOC63
    select RT_USING_COMPONENTS_INIT
    select RT_USING_USER_MAIN
-    select PKG_USING_INFINEON_CAT1CM0P
-    select PKG_USING_INFINEON_CMSIS
-    select PKG_USING_INFINEON_CORE_LIB
-    select PKG_USING_INFINEON_MTB_HAL_CAT1
-    select PKG_USING_INFINEON_MTB_PDL_CAT1
-    select PKG_USING_INFINEON_RETARGET_IO
-    select PKG_USING_INFINEON_CAPSENSE
    default y

 menu "Onboard Peripheral Drivers"
--- a/bsp/Infineon/psoc6-cy8ckit-062-WIFI-BT/SConstruct
+++ b/bsp/Infineon/psoc6-cy8ckit-062-WIFI-BT/SConstruct
@ -36,6 +36,8 @@ Export('rtconfig')

 SDK_ROOT = os.path.abspath('./')

+libraries_path_prefix = SDK_ROOT
+
 if os.path.exists(SDK_ROOT + '/packages'):
    libraries_path_prefix = SDK_ROOT + '/packages'
 else:
--- a/bsp/Infineon/psoc6-cy8ckit-062-WIFI-BT/board/Kconfig
+++ b/bsp/Infineon/psoc6-cy8ckit-062-WIFI-BT/board/Kconfig
@ -5,13 +5,6 @@ config SOC_CY8C6247BZI_D54
    select SOC_SERIES_IFX_PSOC61
    select RT_USING_COMPONENTS_INIT
    select RT_USING_USER_MAIN
-    select PKG_USING_INFINEON_CAT1CM0P
-    select PKG_USING_INFINEON_CMSIS
-    select PKG_USING_INFINEON_CORE_LIB
-    select PKG_USING_INFINEON_MTB_HAL_CAT1
-    select PKG_USING_INFINEON_MTB_PDL_CAT1
-    select PKG_USING_INFINEON_RETARGET_IO
-    select PKG_USING_INFINEON_CAPSENSE
    default y

 menu "Onboard Peripheral Drivers"
--- a/bsp/Infineon/psoc6-cy8ckit-062S2-43012/SConstruct
+++ b/bsp/Infineon/psoc6-cy8ckit-062S2-43012/SConstruct
@ -36,6 +36,8 @@ Export('rtconfig')

 SDK_ROOT = os.path.abspath('./')

+libraries_path_prefix = SDK_ROOT
+
 if os.path.exists(SDK_ROOT + '/packages'):
    libraries_path_prefix = SDK_ROOT + '/packages'
 else:
--- a/bsp/Infineon/psoc6-cy8ckit-062S2-43012/board/Kconfig
+++ b/bsp/Infineon/psoc6-cy8ckit-062S2-43012/board/Kconfig
@ -5,13 +5,6 @@ config SOC_CY8C624ABZI_S2D44
    select SOC_SERIES_IFX_PSOC62
    select RT_USING_COMPONENTS_INIT
    select RT_USING_USER_MAIN
-    select PKG_USING_INFINEON_CAT1CM0P
-    select PKG_USING_INFINEON_CMSIS
-    select PKG_USING_INFINEON_CORE_LIB
-    select PKG_USING_INFINEON_MTB_HAL_CAT1
-    select PKG_USING_INFINEON_MTB_PDL_CAT1
-    select PKG_USING_INFINEON_RETARGET_IO
-    select PKG_USING_INFINEON_CAPSENSE
    default y

 menu "Onboard Peripheral Drivers"
--- a/bsp/Infineon/psoc6-cy8ckit-062s4/SConstruct
+++ b/bsp/Infineon/psoc6-cy8ckit-062s4/SConstruct
@ -36,6 +36,8 @@ Export('rtconfig')

 SDK_ROOT = os.path.abspath('./')

+libraries_path_prefix = SDK_ROOT
+
 if os.path.exists(SDK_ROOT + '/packages'):
    libraries_path_prefix = SDK_ROOT + '/packages'
 else:
--- a/bsp/Infineon/psoc6-cy8ckit-062s4/board/Kconfig
+++ b/bsp/Infineon/psoc6-cy8ckit-062s4/board/Kconfig
@ -5,13 +5,6 @@ config SOC_CY8C6244LQI_S4D92
    select SOC_SERIES_IFX_PSOC62
    select RT_USING_COMPONENTS_INIT
    select RT_USING_USER_MAIN
-    select PKG_USING_INFINEON_CAT1CM0P
-    select PKG_USING_INFINEON_CMSIS
-    select PKG_USING_INFINEON_CORE_LIB
-    select PKG_USING_INFINEON_MTB_HAL_CAT1
-    select PKG_USING_INFINEON_MTB_PDL_CAT1
-    select PKG_USING_INFINEON_RETARGET_IO
-    select PKG_USING_INFINEON_CAPSENSE
    default y

 menu "Onboard Peripheral Drivers"
--- a/bsp/Infineon/psoc6-cy8cproto-062S3-4343W/SConstruct
+++ b/bsp/Infineon/psoc6-cy8cproto-062S3-4343W/SConstruct
@ -36,6 +36,8 @@ Export('rtconfig')

 SDK_ROOT = os.path.abspath('./')

+libraries_path_prefix = SDK_ROOT
+
 if os.path.exists(SDK_ROOT + '/packages'):
    libraries_path_prefix = SDK_ROOT + '/packages'
 else:
--- a/bsp/Infineon/psoc6-cy8cproto-062S3-4343W/board/Kconfig
+++ b/bsp/Infineon/psoc6-cy8cproto-062S3-4343W/board/Kconfig
@ -5,13 +5,6 @@ config SOC_CY8C6245LQI_S3D72
    select SOC_SERIES_IFX_PSOC62
    select RT_USING_COMPONENTS_INIT
    select RT_USING_USER_MAIN
-    select PKG_USING_INFINEON_CAT1CM0P
-    select PKG_USING_INFINEON_CMSIS
-    select PKG_USING_INFINEON_CORE_LIB
-    select PKG_USING_INFINEON_MTB_HAL_CAT1
-    select PKG_USING_INFINEON_MTB_PDL_CAT1
-    select PKG_USING_INFINEON_RETARGET_IO
-    select PKG_USING_INFINEON_CAPSENSE
    default y

 menu "Onboard Peripheral Drivers"
--- a/bsp/Infineon/psoc6-evaluationkit-062S2/SConstruct
+++ b/bsp/Infineon/psoc6-evaluationkit-062S2/SConstruct
@ -36,6 +36,8 @@ Export('rtconfig')

 SDK_ROOT = os.path.abspath('./')

+libraries_path_prefix = SDK_ROOT
+
 if os.path.exists(SDK_ROOT + '/packages'):
    libraries_path_prefix = SDK_ROOT + '/packages'
 else:
--- a/bsp/Infineon/psoc6-evaluationkit-062S2/board/Kconfig
+++ b/bsp/Infineon/psoc6-evaluationkit-062S2/board/Kconfig
@ -5,13 +5,6 @@ config SOC_CY8C624ALQI_S2D42
    select SOC_SERIES_IFX_PSOC62
    select RT_USING_COMPONENTS_INIT
    select RT_USING_USER_MAIN
-    select PKG_USING_INFINEON_CAT1CM0P
-    select PKG_USING_INFINEON_CMSIS
-    select PKG_USING_INFINEON_CORE_LIB
-    select PKG_USING_INFINEON_MTB_HAL_CAT1
-    select PKG_USING_INFINEON_MTB_PDL_CAT1
-    select PKG_USING_INFINEON_RETARGET_IO
-    select PKG_USING_INFINEON_CAPSENSE
    default y

 menu "Onboard Peripheral Drivers"
--- a/bsp/Infineon/xmc7200-kit_xmc7200_evk/SConstruct
+++ b/bsp/Infineon/xmc7200-kit_xmc7200_evk/SConstruct
@ -36,6 +36,8 @@ Export('rtconfig')

 SDK_ROOT = os.path.abspath('./')

+libraries_path_prefix = SDK_ROOT
+
 if os.path.exists(SDK_ROOT + '/packages'):
    libraries_path_prefix = SDK_ROOT + '/packages'
 else:
--- a/bsp/Infineon/xmc7200-kit_xmc7200_evk/board/Kconfig
+++ b/bsp/Infineon/xmc7200-kit_xmc7200_evk/board/Kconfig
@ -5,12 +5,6 @@ config SOC_XMC7200D_E272K8384AA
    select SOC_SERIES_IFX_XMC
    select RT_USING_COMPONENTS_INIT
    select RT_USING_USER_MAIN
-    select PKG_USING_INFINEON_CAT1CM0P
-    select PKG_USING_INFINEON_CMSIS
-    select PKG_USING_INFINEON_CORE_LIB
-    select PKG_USING_INFINEON_MTB_HAL_CAT1
-    select PKG_USING_INFINEON_MTB_PDL_CAT1
-    select PKG_USING_INFINEON_RETARGET_IO
    default y

 menu "Onboard Peripheral Drivers"