[update] add fal component. (#5662)

* [update] add fal component.

* [update] format code.

* [update] change PKG_USING_FAL to RT_USING_FAL

* [update] format code.

* [update] fal

* [update] delete FAL_SW_VERSION

45 files changed, 93 insertions, 93 deletions

diff --git a/bsp/at32/Libraries/rt_drivers/drv_flash.c b/bsp/at32/Libraries/rt_drivers/drv_flash.c
index a1b381beaa..bd88f2cdca 100644
--- a/bsp/at32/Libraries/rt_drivers/drv_flash.c
+++ b/bsp/at32/Libraries/rt_drivers/drv_flash.c
@@ -14,7 +14,7 @@
 #ifdef BSP_USING_ON_CHIP_FLASH
 #include "drv_flash.h"
 
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
 #include "fal.h"
 #endif
 
@@ -171,7 +171,7 @@ __exit:
     return size;
 }
 
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
 
 static int fal_flash_read(long offset, rt_uint8_t *buf, size_t size);
 static int fal_flash_write(long offset, const rt_uint8_t *buf, size_t size);
diff --git a/bsp/bluetrum/libraries/hal_drivers/drv_flash.c b/bsp/bluetrum/libraries/hal_drivers/drv_flash.c
index 2e98f793cf..d45213743f 100644
--- a/bsp/bluetrum/libraries/hal_drivers/drv_flash.c
+++ b/bsp/bluetrum/libraries/hal_drivers/drv_flash.c
@@ -13,7 +13,7 @@
 
 #ifdef BSP_USING_ON_CHIP_FLASH
 
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
 #include "fal.h"
 #endif
 
@@ -21,7 +21,7 @@
 #define LOG_TAG                "drv.flash"
 #include <drv_log.h>
 
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
 
 #define AB32_FLASH_START_ADDRESS    0x00000000
 #define AB32_FLASH_SIZE             (1024 * 1024)
diff --git a/bsp/maxim/MAX32660_EVSYS/board/Kconfig b/bsp/maxim/MAX32660_EVSYS/board/Kconfig
index 63fd7067b2..e8523e0e1a 100644
--- a/bsp/maxim/MAX32660_EVSYS/board/Kconfig
+++ b/bsp/maxim/MAX32660_EVSYS/board/Kconfig
@@ -63,7 +63,7 @@ menu "On-chip Peripheral Drivers"
             endif
         endif
     config BSP_USING_ON_CHIP_FLASH
-        select PKG_USING_FAL
+        select RT_USING_FAL
         bool "Enable on-chip FLASH"
         default n
     config BSP_USING_I2C
diff --git a/bsp/mm32f327x/drivers/Kconfig b/bsp/mm32f327x/drivers/Kconfig
index bbffa008bd..70a1ad6c71 100644
--- a/bsp/mm32f327x/drivers/Kconfig
+++ b/bsp/mm32f327x/drivers/Kconfig
@@ -25,7 +25,7 @@ menu "Hardware Drivers Config"
             config OCFLASH_USE_FAL
                 bool "Enable On Chip Flash FAL Driver"
                 depends on BSP_USING_OCFLASH
-                select PKG_USING_FAL
+                select RT_USING_FAL
                 default n
             config OCFLASH_USE_LFS
                 bool "Enable On Chip Flash DFS Driver"
diff --git a/bsp/n32g452xx/Libraries/rt_drivers/drv_flash.c b/bsp/n32g452xx/Libraries/rt_drivers/drv_flash.c
index cba0b38768..3201292753 100644
--- a/bsp/n32g452xx/Libraries/rt_drivers/drv_flash.c
+++ b/bsp/n32g452xx/Libraries/rt_drivers/drv_flash.c
@@ -15,7 +15,7 @@
 #ifdef BSP_USING_ON_CHIP_FLASH
 #include "drv_flash.h"
 
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
     #include "fal.h"
 #endif
 
@@ -172,7 +172,7 @@ __exit:
     return size;
 }
 
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
 
 static int fal_flash_read(long offset, rt_uint8_t *buf, size_t size);
 static int fal_flash_write(long offset, const rt_uint8_t *buf, size_t size);
diff --git a/bsp/nrf5x/libraries/drivers/drv_flash.c b/bsp/nrf5x/libraries/drivers/drv_flash.c
index f4ae713132..2366716ae7 100644
--- a/bsp/nrf5x/libraries/drivers/drv_flash.c
+++ b/bsp/nrf5x/libraries/drivers/drv_flash.c
@@ -14,7 +14,7 @@
 
 #ifdef BSP_USING_ON_CHIP_FLASH
 
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
 #include "fal.h"
 #endif
 
@@ -155,7 +155,7 @@ int mcu_flash_erase(rt_uint32_t addr, size_t size)
     return size;
 }
 
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
 
 static int fal_flash_read(long offset, rt_uint8_t *buf, size_t size);
 static int fal_flash_write(long offset, const rt_uint8_t *buf, size_t size);
diff --git a/bsp/nrf5x/libraries/drivers/drv_qspi_flash.c b/bsp/nrf5x/libraries/drivers/drv_qspi_flash.c
index ba4923283d..41b70ef1b4 100644
--- a/bsp/nrf5x/libraries/drivers/drv_qspi_flash.c
+++ b/bsp/nrf5x/libraries/drivers/drv_qspi_flash.c
@@ -11,7 +11,7 @@
 #include <stdint.h>
 #include "board.h"
 #include "nrfx_qspi.h"
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
 #include <fal.h>
 
 //log
diff --git a/bsp/nrf5x/nrf52832/applications/mnt.c b/bsp/nrf5x/nrf52832/applications/mnt.c
index d4af1d2b6c..119bdf7105 100644
--- a/bsp/nrf5x/nrf52832/applications/mnt.c
+++ b/bsp/nrf5x/nrf52832/applications/mnt.c
@@ -14,7 +14,7 @@
 
 #ifdef BSP_USING_ON_CHIP_FS
 
-#ifndef PKG_USING_FAL
+#ifndef RT_USING_FAL
 #error "if you want to use on chip filesystem, you need to enable FAL package()"
 #endif
 
diff --git a/bsp/nrf5x/nrf52832/board/Kconfig b/bsp/nrf5x/nrf52832/board/Kconfig
index 61881a78fd..ed43c3f763 100644
--- a/bsp/nrf5x/nrf52832/board/Kconfig
+++ b/bsp/nrf5x/nrf52832/board/Kconfig
@@ -338,7 +338,7 @@ menu "On-chip Peripheral Drivers"
 
         endif
     config BSP_USING_ON_CHIP_FLASH
-        select PKG_USING_FAL
+        select RT_USING_FAL
         bool "Enable on-chip FLASH"
         default n
     
diff --git a/bsp/nrf5x/nrf52840/board/Kconfig b/bsp/nrf5x/nrf52840/board/Kconfig
index f52beb2f31..d8f8247b8d 100644
--- a/bsp/nrf5x/nrf52840/board/Kconfig
+++ b/bsp/nrf5x/nrf52840/board/Kconfig
@@ -37,7 +37,7 @@ menu "Onboard Peripheral Drivers"
 
 
     menuconfig BSP_USING_QSPI_FLASH
-        select PKG_USING_FAL
+        select RT_USING_FAL
         bool "Enable QSPI FLASH(MX25R64 8MB)"
         default n
         depends on BSP_BOARD_PCA_10056
@@ -378,7 +378,7 @@ menu "On-chip Peripheral Drivers"
 
 
     config BSP_USING_ON_CHIP_FLASH
-        select PKG_USING_FAL
+        select RT_USING_FAL
         bool "Enable on-chip FLASH"
         default n
 
diff --git a/bsp/nuvoton/libraries/m031/rtt_port/Kconfig b/bsp/nuvoton/libraries/m031/rtt_port/Kconfig
index 1b1d57fca3..8ec7e2e005 100644
--- a/bsp/nuvoton/libraries/m031/rtt_port/Kconfig
+++ b/bsp/nuvoton/libraries/m031/rtt_port/Kconfig
@@ -28,7 +28,7 @@ config SOC_SERIES_M032
 
     config BSP_USING_FMC
         bool "Enable Flash Memory Controller(FMC)"
-        select PKG_USING_FAL
+        select RT_USING_FAL
         default n
 
     config BSP_USING_GPIO
diff --git a/bsp/nuvoton/libraries/m031/rtt_port/drv_fmc.c b/bsp/nuvoton/libraries/m031/rtt_port/drv_fmc.c
index ec5f1b69dc..b52c60571a 100644
--- a/bsp/nuvoton/libraries/m031/rtt_port/drv_fmc.c
+++ b/bsp/nuvoton/libraries/m031/rtt_port/drv_fmc.c
@@ -16,7 +16,7 @@
 #include <rtdevice.h>
 #include "NuMicro.h"
 
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
     #include <fal.h>
 #endif
 
@@ -31,7 +31,7 @@
 
 /* Private functions ------------------------------------------------------------*/
 static int nu_fmc_init(void);
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
     static int aprom_read(long offset, uint8_t *buf, size_t size);
     static int aprom_write(long offset, const uint8_t *buf, size_t size);
     static int aprom_erase(long offset, size_t size);
@@ -39,7 +39,7 @@ static int nu_fmc_init(void);
     static int ldrom_read(long offset, uint8_t *buf, size_t size);
     static int ldrom_write(long offset, const uint8_t *buf, size_t size);
     static int ldrom_erase(long offset, size_t size);
-#endif  /* PKG_USING_FAL */
+#endif  /* RT_USING_FAL */
 
 /* Public functions -------------------------------------------------------------*/
 int nu_fmc_read(long offset, uint8_t *buf, size_t size);
@@ -50,10 +50,10 @@ int nu_fmc_erase(long offset, size_t size);
 static rt_mutex_t g_mutex_fmc = RT_NULL;
 
 /* Public variables -------------------------------------------------------------*/
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
 const struct fal_flash_dev Onchip_aprom_flash = { "OnChip_APROM", FMC_APROM_BASE, FMC_APROM_END, FMC_FLASH_PAGE_SIZE, {NULL, aprom_read, aprom_write, aprom_erase} };
 const struct fal_flash_dev Onchip_ldrom_flash = { "OnChip_LDROM", FMC_LDROM_BASE, FMC_LDROM_END, FMC_FLASH_PAGE_SIZE, {NULL, ldrom_read, ldrom_write, ldrom_erase} };
-#endif  /* PKG_USING_FAL */
+#endif  /* RT_USING_FAL */
 
 int nu_fmc_read(long addr, uint8_t *buf, size_t size)
 {
@@ -277,7 +277,7 @@ Exit3:
     return erased_size;
 }
 
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
 
 static int aprom_read(long offset, uint8_t *buf, size_t size)
 {
@@ -309,7 +309,7 @@ static int ldrom_erase(long offset, size_t size)
     return nu_fmc_erase(Onchip_ldrom_flash.addr + offset, size);
 }
 
-#endif /* PKG_USING_FAL */
+#endif /* RT_USING_FAL */
 
 static int nu_fmc_init(void)
 {
@@ -319,8 +319,8 @@ static int nu_fmc_init(void)
 
     g_mutex_fmc = rt_mutex_create("nu_fmc_lock", RT_IPC_FLAG_PRIO);
 
-    /* PKG_USING_FAL */
-#if defined(PKG_USING_FAL)
+    /* RT_USING_FAL */
+#if defined(RT_USING_FAL)
     fal_init();
 #endif
 
diff --git a/bsp/nuvoton/libraries/m2354/rtt_port/Kconfig b/bsp/nuvoton/libraries/m2354/rtt_port/Kconfig
index 5d06999d6b..0e6ace662a 100644
--- a/bsp/nuvoton/libraries/m2354/rtt_port/Kconfig
+++ b/bsp/nuvoton/libraries/m2354/rtt_port/Kconfig
@@ -28,7 +28,7 @@ config SOC_SERIES_M2354
 
     config BSP_USING_FMC
         bool "Enable Flash Memory Controller(FMC)"
-        select PKG_USING_FAL
+        select RT_USING_FAL
         default n
 
     config BSP_USING_GPIO
diff --git a/bsp/nuvoton/libraries/m2354/rtt_port/drv_fmc.c b/bsp/nuvoton/libraries/m2354/rtt_port/drv_fmc.c
index 66e251c020..04cb90f5c6 100644
--- a/bsp/nuvoton/libraries/m2354/rtt_port/drv_fmc.c
+++ b/bsp/nuvoton/libraries/m2354/rtt_port/drv_fmc.c
@@ -16,7 +16,7 @@
 #include <rtdevice.h>
 #include "NuMicro.h"
 
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
     #include <fal.h>
 #endif
 
@@ -28,7 +28,7 @@
 
 /* Private functions ------------------------------------------------------------*/
 static int nu_fmc_init(void);
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
     static int aprom_read(long offset, uint8_t *buf, size_t size);
     static int aprom_write(long offset, const uint8_t *buf, size_t size);
     static int aprom_erase(long offset, size_t size);
@@ -36,7 +36,7 @@ static int nu_fmc_init(void);
     static int ldrom_read(long offset, uint8_t *buf, size_t size);
     static int ldrom_write(long offset, const uint8_t *buf, size_t size);
     static int ldrom_erase(long offset, size_t size);
-#endif  /* PKG_USING_FAL */
+#endif  /* RT_USING_FAL */
 
 /* Public functions -------------------------------------------------------------*/
 int nu_fmc_read(long offset, uint8_t *buf, size_t size);
@@ -47,10 +47,10 @@ int nu_fmc_erase(long offset, size_t size);
 static rt_mutex_t g_mutex_fmc = RT_NULL;
 
 /* Public variables -------------------------------------------------------------*/
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
 const struct fal_flash_dev Onchip_aprom_flash = { "OnChip_APROM", FMC_APROM_BASE, FMC_APROM_END, FMC_FLASH_PAGE_SIZE, {NULL, aprom_read, aprom_write, aprom_erase} };
 const struct fal_flash_dev Onchip_ldrom_flash = { "OnChip_LDROM", FMC_LDROM_BASE, FMC_LDROM_END, FMC_FLASH_PAGE_SIZE, {NULL, ldrom_read, ldrom_write, ldrom_erase} };
-#endif  /* PKG_USING_FAL */
+#endif  /* RT_USING_FAL */
 
 int nu_fmc_read(long addr, uint8_t *buf, size_t size)
 {
@@ -274,7 +274,7 @@ Exit3:
     return erased_size;
 }
 
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
 
 static int aprom_read(long offset, uint8_t *buf, size_t size)
 {
@@ -306,7 +306,7 @@ static int ldrom_erase(long offset, size_t size)
     return nu_fmc_erase(Onchip_ldrom_flash.addr + offset, size);
 }
 
-#endif /* PKG_USING_FAL */
+#endif /* RT_USING_FAL */
 
 static int nu_fmc_init(void)
 {
@@ -316,8 +316,8 @@ static int nu_fmc_init(void)
 
     g_mutex_fmc = rt_mutex_create("nu_fmc_lock", RT_IPC_FLAG_PRIO);
 
-    /* PKG_USING_FAL */
-#if defined(PKG_USING_FAL)
+    /* RT_USING_FAL */
+#if defined(RT_USING_FAL)
     fal_init();
 #endif
 
diff --git a/bsp/nuvoton/libraries/m480/rtt_port/Kconfig b/bsp/nuvoton/libraries/m480/rtt_port/Kconfig
index 0d529462a3..2fabca76de 100644
--- a/bsp/nuvoton/libraries/m480/rtt_port/Kconfig
+++ b/bsp/nuvoton/libraries/m480/rtt_port/Kconfig
@@ -28,7 +28,7 @@ config SOC_SERIES_M480
 
     config BSP_USING_FMC
         bool "Enable Flash Memory Controller(FMC)"
-        select PKG_USING_FAL
+        select RT_USING_FAL
         default n
 
     config BSP_USING_GPIO
diff --git a/bsp/nuvoton/libraries/m480/rtt_port/drv_fmc.c b/bsp/nuvoton/libraries/m480/rtt_port/drv_fmc.c
index 07cc212ede..c1bb823dd2 100644
--- a/bsp/nuvoton/libraries/m480/rtt_port/drv_fmc.c
+++ b/bsp/nuvoton/libraries/m480/rtt_port/drv_fmc.c
@@ -16,7 +16,7 @@
 #include <rtdevice.h>
 #include "NuMicro.h"
 
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
     #include <fal.h>
 #endif
 
@@ -28,7 +28,7 @@
 
 /* Private functions ------------------------------------------------------------*/
 static int nu_fmc_init(void);
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
     static int aprom_read(long offset, uint8_t *buf, size_t size);
     static int aprom_write(long offset, const uint8_t *buf, size_t size);
     static int aprom_erase(long offset, size_t size);
@@ -36,7 +36,7 @@ static int nu_fmc_init(void);
     static int ldrom_read(long offset, uint8_t *buf, size_t size);
     static int ldrom_write(long offset, const uint8_t *buf, size_t size);
     static int ldrom_erase(long offset, size_t size);
-#endif  /* PKG_USING_FAL */
+#endif  /* RT_USING_FAL */
 
 /* Public functions -------------------------------------------------------------*/
 int nu_fmc_read(long offset, uint8_t *buf, size_t size);
@@ -47,10 +47,10 @@ int nu_fmc_erase(long offset, size_t size);
 static rt_mutex_t g_mutex_fmc = RT_NULL;
 
 /* Public variables -------------------------------------------------------------*/
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
 const struct fal_flash_dev Onchip_aprom_flash = { "OnChip_APROM", FMC_APROM_BASE, FMC_APROM_END, FMC_FLASH_PAGE_SIZE, {NULL, aprom_read, aprom_write, aprom_erase} };
 const struct fal_flash_dev Onchip_ldrom_flash = { "OnChip_LDROM", FMC_LDROM_BASE, FMC_LDROM_END, FMC_FLASH_PAGE_SIZE, {NULL, ldrom_read, ldrom_write, ldrom_erase} };
-#endif  /* PKG_USING_FAL */
+#endif  /* RT_USING_FAL */
 
 int nu_fmc_read(long addr, uint8_t *buf, size_t size)
 {
@@ -291,7 +291,7 @@ Exit3:
     return erased_size;
 }
 
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
 
 static int aprom_read(long offset, uint8_t *buf, size_t size)
 {
@@ -323,7 +323,7 @@ static int ldrom_erase(long offset, size_t size)
     return nu_fmc_erase(Onchip_ldrom_flash.addr + offset, size);
 }
 
-#endif /* PKG_USING_FAL */
+#endif /* RT_USING_FAL */
 
 static int nu_fmc_init(void)
 {
@@ -334,8 +334,8 @@ static int nu_fmc_init(void)
     g_mutex_fmc = rt_mutex_create("nu_fmc_lock", RT_IPC_FLAG_PRIO);
     RT_ASSERT(g_mutex_fmc != RT_NULL);
 
-    /* PKG_USING_FAL */
-#if defined(PKG_USING_FAL)
+    /* RT_USING_FAL */
+#if defined(RT_USING_FAL)
     fal_init();
 #endif
 
diff --git a/bsp/nuvoton/nk-980iot/applications/mnt.c b/bsp/nuvoton/nk-980iot/applications/mnt.c
index 07905a6b13..2d45dc84e7 100644
--- a/bsp/nuvoton/nk-980iot/applications/mnt.c
+++ b/bsp/nuvoton/nk-980iot/applications/mnt.c
@@ -28,7 +28,7 @@
 #include <sys/stat.h>
 #include <sys/statfs.h>
 
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
     #include <fal.h>
 #endif
 
@@ -214,7 +214,7 @@ INIT_ENV_EXPORT(filesystem_init);
 #if defined(BOARD_USING_STORAGE_SPIFLASH)
 int mnt_init_spiflash0(void)
 {
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
     extern int fal_init_check(void);
     if (!fal_init_check())
         fal_init();
diff --git a/bsp/nuvoton/nk-n9h30/applications/mnt.c b/bsp/nuvoton/nk-n9h30/applications/mnt.c
index 9fdf7ec3a1..feb455316c 100644
--- a/bsp/nuvoton/nk-n9h30/applications/mnt.c
+++ b/bsp/nuvoton/nk-n9h30/applications/mnt.c
@@ -28,7 +28,7 @@
 #include <sys/stat.h>
 #include <sys/statfs.h>
 
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
     #include <fal.h>
 #endif
 
@@ -212,7 +212,7 @@ INIT_ENV_EXPORT(filesystem_init);
 #if defined(BOARD_USING_STORAGE_SPIFLASH)
 int mnt_init_spiflash0(void)
 {
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
     extern int fal_init_check(void);
     if (!fal_init_check())
         fal_init();
diff --git a/bsp/nuvoton/nk-n9h30/rtconfig.h b/bsp/nuvoton/nk-n9h30/rtconfig.h
index c4a233f2d1..f542288a73 100644
--- a/bsp/nuvoton/nk-n9h30/rtconfig.h
+++ b/bsp/nuvoton/nk-n9h30/rtconfig.h
@@ -315,13 +315,13 @@
 
 /* Micrium: Micrium software products porting for RT-Thread */
 
-#define PKG_USING_FAL
+#define RT_USING_FAL
 #define FAL_DEBUG_CONFIG
 #define FAL_DEBUG 1
 #define FAL_PART_HAS_TABLE_CFG
 #define FAL_USING_SFUD_PORT
 #define FAL_USING_NOR_FLASH_DEV_NAME "norflash0"
-#define PKG_USING_FAL_LATEST_VERSION
+#define RT_USING_FAL_LATEST_VERSION
 #define PKG_FAL_VER_NUM 0x99999
 #define PKG_USING_RAMDISK
 #define PKG_USING_RAMDISK_LATEST_VERSION
diff --git a/bsp/nuvoton/nk-rtu980/applications/mnt.c b/bsp/nuvoton/nk-rtu980/applications/mnt.c
index 1c834fcb3e..4830402a70 100644
--- a/bsp/nuvoton/nk-rtu980/applications/mnt.c
+++ b/bsp/nuvoton/nk-rtu980/applications/mnt.c
@@ -28,7 +28,7 @@
 #include <sys/stat.h>
 #include <sys/statfs.h>
 
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
     #include <fal.h>
 #endif
 
@@ -211,7 +211,7 @@ INIT_ENV_EXPORT(filesystem_init);
 #if defined(BOARD_USING_STORAGE_SPIFLASH)
 int mnt_init_spiflash0(void)
 {
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
     extern int fal_init_check(void);
     if (!fal_init_check())
         fal_init();
diff --git a/bsp/nuvoton/nk-rtu980/rtconfig.h b/bsp/nuvoton/nk-rtu980/rtconfig.h
index aadaa670fc..bfa96e1f3a 100644
--- a/bsp/nuvoton/nk-rtu980/rtconfig.h
+++ b/bsp/nuvoton/nk-rtu980/rtconfig.h
@@ -334,13 +334,13 @@
 
 /* Micrium: Micrium software products porting for RT-Thread */
 
-#define PKG_USING_FAL
+#define RT_USING_FAL
 #define FAL_DEBUG_CONFIG
 #define FAL_DEBUG 1
 #define FAL_PART_HAS_TABLE_CFG
 #define FAL_USING_SFUD_PORT
 #define FAL_USING_NOR_FLASH_DEV_NAME "norflash0"
-#define PKG_USING_FAL_LATEST_VERSION
+#define RT_USING_FAL_LATEST_VERSION
 #define PKG_FAL_VER_NUM 0x99999
 #define PKG_USING_RAMDISK
 #define PKG_USING_RAMDISK_LATEST_VERSION
diff --git a/bsp/nuvoton/numaker-iot-m487/applications/mnt.c b/bsp/nuvoton/numaker-iot-m487/applications/mnt.c
index 9abcd5de26..85ced8cdab 100644
--- a/bsp/nuvoton/numaker-iot-m487/applications/mnt.c
+++ b/bsp/nuvoton/numaker-iot-m487/applications/mnt.c
@@ -19,7 +19,7 @@
 #include <sys/stat.h>
 #include <sys/statfs.h>
 
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
     #include <fal.h>
 #endif
 
diff --git a/bsp/nuvoton/numaker-m032ki/applications/mnt.c b/bsp/nuvoton/numaker-m032ki/applications/mnt.c
index 7ac94f7f0f..680e5f2e86 100644
--- a/bsp/nuvoton/numaker-m032ki/applications/mnt.c
+++ b/bsp/nuvoton/numaker-m032ki/applications/mnt.c
@@ -19,7 +19,7 @@
 #include <sys/stat.h>
 #include <sys/statfs.h>
 
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
     #include <fal.h>
 #endif
 
diff --git a/bsp/nuvoton/numaker-m2354/rtconfig.h b/bsp/nuvoton/numaker-m2354/rtconfig.h
index cb299e27e5..2937b671c7 100644
--- a/bsp/nuvoton/numaker-m2354/rtconfig.h
+++ b/bsp/nuvoton/numaker-m2354/rtconfig.h
@@ -296,11 +296,11 @@
 
 /* Micrium: Micrium software products porting for RT-Thread */
 
-#define PKG_USING_FAL
+#define RT_USING_FAL
 #define FAL_DEBUG_CONFIG
 #define FAL_DEBUG 1
 #define FAL_PART_HAS_TABLE_CFG
-#define PKG_USING_FAL_LATEST_VERSION
+#define RT_USING_FAL_LATEST_VERSION
 #define PKG_FAL_VER_NUM 0x99999
 
 /* peripheral libraries and drivers */
diff --git a/bsp/nuvoton/numaker-pfm-m487/applications/mnt.c b/bsp/nuvoton/numaker-pfm-m487/applications/mnt.c
index 0b4ed458b1..30728692d0 100644
--- a/bsp/nuvoton/numaker-pfm-m487/applications/mnt.c
+++ b/bsp/nuvoton/numaker-pfm-m487/applications/mnt.c
@@ -19,7 +19,7 @@
 #include <sys/stat.h>
 #include <sys/statfs.h>
 
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
     #include <fal.h>
 #endif
 
diff --git a/bsp/nuvoton/numaker-pfm-m487/rtconfig.h b/bsp/nuvoton/numaker-pfm-m487/rtconfig.h
index 0ca57bd49e..bda35ecac5 100644
--- a/bsp/nuvoton/numaker-pfm-m487/rtconfig.h
+++ b/bsp/nuvoton/numaker-pfm-m487/rtconfig.h
@@ -323,11 +323,11 @@
 
 /* Micrium: Micrium software products porting for RT-Thread */
 
-#define PKG_USING_FAL
+#define RT_USING_FAL
 #define FAL_DEBUG_CONFIG
 #define FAL_DEBUG 1
 #define FAL_PART_HAS_TABLE_CFG
-#define PKG_USING_FAL_LATEST_VERSION
+#define RT_USING_FAL_LATEST_VERSION
 #define PKG_FAL_VER_NUM 0x99999
 
 /* peripheral libraries and drivers */
diff --git a/bsp/renesas/libraries/HAL_Drivers/drv_flash.c b/bsp/renesas/libraries/HAL_Drivers/drv_flash.c
index 4a4fc0fc6b..3ae3b5a1ea 100644
--- a/bsp/renesas/libraries/HAL_Drivers/drv_flash.c
+++ b/bsp/renesas/libraries/HAL_Drivers/drv_flash.c
@@ -18,7 +18,7 @@
 
 #include <rtthread.h>
 
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
     #include "fal.h"
 #endif
 
@@ -190,7 +190,7 @@ int _flash_erase_32k(rt_uint32_t addr, size_t size)
     return size;
 }
 
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
 
 static int fal_flash_read_8k(long offset, rt_uint8_t *buf, size_t size);
 static int fal_flash_read_32k(long offset, rt_uint8_t *buf, size_t size);
diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_flash/drv_flash_f0.c b/bsp/stm32/libraries/HAL_Drivers/drv_flash/drv_flash_f0.c
index 778fbe1a84..0a8f3906ae 100644
--- a/bsp/stm32/libraries/HAL_Drivers/drv_flash/drv_flash_f0.c
+++ b/bsp/stm32/libraries/HAL_Drivers/drv_flash/drv_flash_f0.c
@@ -14,7 +14,7 @@
 #include "drv_config.h"
 #include "drv_flash.h"
 
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
 #include "fal.h"
 #endif
 
@@ -170,7 +170,7 @@ __exit:
     return size;
 }
 
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
 
 static int fal_flash_read(long offset, rt_uint8_t *buf, size_t size);
 static int fal_flash_write(long offset, const rt_uint8_t *buf, size_t size);
diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_flash/drv_flash_f1.c b/bsp/stm32/libraries/HAL_Drivers/drv_flash/drv_flash_f1.c
index 624bf60070..e4cce77b1b 100644
--- a/bsp/stm32/libraries/HAL_Drivers/drv_flash/drv_flash_f1.c
+++ b/bsp/stm32/libraries/HAL_Drivers/drv_flash/drv_flash_f1.c
@@ -16,7 +16,7 @@
 #include "drv_config.h"
 #include "drv_flash.h"
 
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
 #include "fal.h"
 #endif
 
@@ -246,7 +246,7 @@ __exit:
 }
 
 
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
 
 static int fal_flash_read(long offset, rt_uint8_t *buf, size_t size);
 static int fal_flash_write(long offset, const rt_uint8_t *buf, size_t size);
diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_flash/drv_flash_f2.c b/bsp/stm32/libraries/HAL_Drivers/drv_flash/drv_flash_f2.c
index d716b46ffe..578c9abc78 100644
--- a/bsp/stm32/libraries/HAL_Drivers/drv_flash/drv_flash_f2.c
+++ b/bsp/stm32/libraries/HAL_Drivers/drv_flash/drv_flash_f2.c
@@ -14,7 +14,7 @@
 #include "drv_config.h"
 #include "drv_flash.h"
 
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
 #include "fal.h"
 #endif
 
@@ -251,7 +251,7 @@ __exit:
     return result;
 }
 
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
 
 static int fal_flash_read_16k(long offset, rt_uint8_t *buf, size_t size);
 static int fal_flash_read_64k(long offset, rt_uint8_t *buf, size_t size);
diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_flash/drv_flash_f4.c b/bsp/stm32/libraries/HAL_Drivers/drv_flash/drv_flash_f4.c
index c65ecb20f3..9e308d45ac 100644
--- a/bsp/stm32/libraries/HAL_Drivers/drv_flash/drv_flash_f4.c
+++ b/bsp/stm32/libraries/HAL_Drivers/drv_flash/drv_flash_f4.c
@@ -14,7 +14,7 @@
 #include "drv_config.h"
 #include "drv_flash.h"
 
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
 #include "fal.h"
 #endif
 
@@ -359,7 +359,7 @@ __exit:
     return size;
 }
 
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
 
 static int fal_flash_read_16k(long offset, rt_uint8_t *buf, size_t size);
 static int fal_flash_read_64k(long offset, rt_uint8_t *buf, size_t size);
diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_flash/drv_flash_f7.c b/bsp/stm32/libraries/HAL_Drivers/drv_flash/drv_flash_f7.c
index a88dd6bf80..a1347794af 100644
--- a/bsp/stm32/libraries/HAL_Drivers/drv_flash/drv_flash_f7.c
+++ b/bsp/stm32/libraries/HAL_Drivers/drv_flash/drv_flash_f7.c
@@ -17,7 +17,7 @@
 #include "drv_config.h"
 #include "drv_flash.h"
 
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
 #include "fal.h"
 #endif
 
@@ -307,7 +307,7 @@ __exit:
     return size;
 }
 
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
 #define FLASH_SIZE_GRANULARITY_32K      (4 * 32 * 1024)
 #define FLASH_SIZE_GRANULARITY_128K     (128 * 1024)
 #define FLASH_SIZE_GRANULARITY_256K     (7 * 256 *1024)
diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_flash/drv_flash_g0.c b/bsp/stm32/libraries/HAL_Drivers/drv_flash/drv_flash_g0.c
index 90bb633c86..559c3bad8c 100644
--- a/bsp/stm32/libraries/HAL_Drivers/drv_flash/drv_flash_g0.c
+++ b/bsp/stm32/libraries/HAL_Drivers/drv_flash/drv_flash_g0.c
@@ -14,7 +14,7 @@
 #include "drv_config.h"
 #include "drv_flash.h"
 
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
 #include "fal.h"
 #endif
 
@@ -203,7 +203,7 @@ __exit:
     return size;
 }
 
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
 
 static int fal_flash_read(long offset, rt_uint8_t *buf, size_t size);
 static int fal_flash_write(long offset, const rt_uint8_t *buf, size_t size);
diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_flash/drv_flash_h7.c b/bsp/stm32/libraries/HAL_Drivers/drv_flash/drv_flash_h7.c
index 5ca6d76327..a6dbfecee3 100644
--- a/bsp/stm32/libraries/HAL_Drivers/drv_flash/drv_flash_h7.c
+++ b/bsp/stm32/libraries/HAL_Drivers/drv_flash/drv_flash_h7.c
@@ -18,7 +18,7 @@
 #include "drv_config.h"
 #include "drv_flash.h"
 
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
 #include "fal.h"
 #endif
 
@@ -227,7 +227,7 @@ __exit:
     return size;
 }
 
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
 static int fal_flash_read_128k(long offset, rt_uint8_t *buf, size_t size);
 static int fal_flash_write_128k(long offset, const rt_uint8_t *buf, size_t size);
 static int fal_flash_erase_128k(long offset, size_t size);
diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_flash/drv_flash_l4.c b/bsp/stm32/libraries/HAL_Drivers/drv_flash/drv_flash_l4.c
index 434217ea10..b56ee84403 100644
--- a/bsp/stm32/libraries/HAL_Drivers/drv_flash/drv_flash_l4.c
+++ b/bsp/stm32/libraries/HAL_Drivers/drv_flash/drv_flash_l4.c
@@ -14,7 +14,7 @@
 #include "drv_config.h"
 #include "drv_flash.h"
 
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
 #include "fal.h"
 #endif
 
@@ -264,7 +264,7 @@ __exit:
     return size;
 }
 
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
 
 static int fal_flash_read(long offset, rt_uint8_t *buf, size_t size);
 static int fal_flash_write(long offset, const rt_uint8_t *buf, size_t size);
diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_flash/drv_flash_wb.c b/bsp/stm32/libraries/HAL_Drivers/drv_flash/drv_flash_wb.c
index 33cbc78c3f..316fd606c5 100644
--- a/bsp/stm32/libraries/HAL_Drivers/drv_flash/drv_flash_wb.c
+++ b/bsp/stm32/libraries/HAL_Drivers/drv_flash/drv_flash_wb.c
@@ -14,7 +14,7 @@
 #include "drv_config.h"
 #include "drv_flash.h"
 
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
 #include "fal.h"
 #endif
 
@@ -204,7 +204,7 @@ __exit:
     return size;
 }
 
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
 
 static int fal_flash_read(long offset, rt_uint8_t *buf, size_t size);
 static int fal_flash_write(long offset, const rt_uint8_t *buf, size_t size);
diff --git a/bsp/stm32/stm32f407-atk-explorer/board/Kconfig b/bsp/stm32/stm32f407-atk-explorer/board/Kconfig
index fe11570e3a..615109cef6 100644
--- a/bsp/stm32/stm32f407-atk-explorer/board/Kconfig
+++ b/bsp/stm32/stm32f407-atk-explorer/board/Kconfig
@@ -129,7 +129,7 @@ menu "Onboard Peripheral Drivers"
             select RT_USING_MTD_NOR
             select BSP_USING_SPI_FLASH
             select BSP_USING_FS
-            select PKG_USING_FAL
+            select RT_USING_FAL
             select FAL_USING_AUTO_INIT
             select FAL_PART_HAS_TABLE_CFG
             select PKG_USING_LITTLEFS
diff --git a/bsp/stm32/stm32f429-st-disco/board/SConscript b/bsp/stm32/stm32f429-st-disco/board/SConscript
index 55924547ec..ab2a44b57c 100644
--- a/bsp/stm32/stm32f429-st-disco/board/SConscript
+++ b/bsp/stm32/stm32f429-st-disco/board/SConscript
@@ -15,7 +15,7 @@ CubeMX_Config/Src/stm32f4xx_hal_msp.c
 if GetDepend(['BSP_USING_QSPI_FLASH']):
     src += ['ports/drv_qspi_flash.c']
 
-if GetDepend(['PKG_USING_FAL']):
+if GetDepend(['RT_USING_FAL']):
     src += ['ports/qspi_mnt.c']
 
 if GetDepend(['BSP_USING_TOUCH']):
diff --git a/bsp/stm32/stm32f469-st-disco/board/Kconfig b/bsp/stm32/stm32f469-st-disco/board/Kconfig
index 27dc0b71eb..d528711cf4 100644
--- a/bsp/stm32/stm32f469-st-disco/board/Kconfig
+++ b/bsp/stm32/stm32f469-st-disco/board/Kconfig
@@ -38,7 +38,7 @@ menu "Onboard Peripheral Drivers"
         select BSP_USING_QSPI
         select RT_USING_SFUD
         select RT_SFUD_USING_QSPI
-        select PKG_USING_FAL
+        select RT_USING_FAL
         select FAL_USING_SFUD_PORT
         default n
         
diff --git a/bsp/stm32/stm32f469-st-disco/board/SConscript b/bsp/stm32/stm32f469-st-disco/board/SConscript
index 5f31252268..bd4cdf8775 100644
--- a/bsp/stm32/stm32f469-st-disco/board/SConscript
+++ b/bsp/stm32/stm32f469-st-disco/board/SConscript
@@ -15,7 +15,7 @@ CubeMX_Config/Src/stm32f4xx_hal_msp.c
 if GetDepend(['BSP_USING_QSPI_FLASH']):
     src += ['ports/drv_qspi_flash.c']
 
-if GetDepend(['PKG_USING_FAL']):
+if GetDepend(['RT_USING_FAL']):
     src += ['ports/qspi_mnt.c']
     
 if GetDepend(['BSP_USING_LCD_OTM8009A']):
diff --git a/bsp/stm32/stm32f469-st-disco/board/ports/qspi_mnt.c b/bsp/stm32/stm32f469-st-disco/board/ports/qspi_mnt.c
index 5b311a391a..ad739c2931 100644
--- a/bsp/stm32/stm32f469-st-disco/board/ports/qspi_mnt.c
+++ b/bsp/stm32/stm32f469-st-disco/board/ports/qspi_mnt.c
@@ -8,7 +8,7 @@
  * 2019-04-11     ZYH          first version
  */
 #include <rtthread.h>
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
 #include <fal.h>
 #include <dfs_fs.h>
 
diff --git a/bsp/stm32/stm32h750-artpi-h750/board/Kconfig b/bsp/stm32/stm32h750-artpi-h750/board/Kconfig
index bfc8ecf04a..ae6c4e69a1 100644
--- a/bsp/stm32/stm32h750-artpi-h750/board/Kconfig
+++ b/bsp/stm32/stm32h750-artpi-h750/board/Kconfig
@@ -91,7 +91,7 @@ menu "Onboard Peripheral Drivers"
         bool "Enable SPI FLASH (spi1)"
         select BSP_USING_SPI
         select BSP_USING_SPI1
-        select PKG_USING_FAL
+        select RT_USING_FAL
         select FAL_USING_SFUD_PORT
         select RT_USING_SFUD
         default n
diff --git a/bsp/stm32/stm32l475-atk-pandora/board/Kconfig b/bsp/stm32/stm32l475-atk-pandora/board/Kconfig
index fabe7e50c8..9726d5a95d 100644
--- a/bsp/stm32/stm32l475-atk-pandora/board/Kconfig
+++ b/bsp/stm32/stm32l475-atk-pandora/board/Kconfig
@@ -156,7 +156,7 @@ menu "Onboard Peripheral Drivers"
             select RT_USING_LWIP
             select RT_USING_DFS
             select DFS_USING_POSIX
-            select PKG_USING_FAL
+            select RT_USING_FAL
             select PKG_USING_EASYFLASH
             select RT_USING_WIFI_6181_LIB
             select RT_USING_OTA_LIB
diff --git a/bsp/stm32/stm32l475-atk-pandora/board/ports/fal/SConscript b/bsp/stm32/stm32l475-atk-pandora/board/ports/fal/SConscript
index c8931044c5..3bb10e094d 100644
--- a/bsp/stm32/stm32l475-atk-pandora/board/ports/fal/SConscript
+++ b/bsp/stm32/stm32l475-atk-pandora/board/ports/fal/SConscript
@@ -17,6 +17,6 @@ elif rtconfig.PLATFORM == 'armcc':
 elif rtconfig.PLATFORM == 'armclang':
     LOCAL_CFLAGS += ' -std=c99'
 
-group = DefineGroup('FAL', src, depend = ['PKG_USING_FAL'], CPPPATH = CPPPATH, LOCAL_CFLAGS = LOCAL_CFLAGS)
+group = DefineGroup('FAL', src, depend = ['RT_USING_FAL'], CPPPATH = CPPPATH, LOCAL_CFLAGS = LOCAL_CFLAGS)
 
 Return('group')
diff --git a/bsp/wch/arm/Libraries/ch32_drivers/drv_flash_ch32f20x.c b/bsp/wch/arm/Libraries/ch32_drivers/drv_flash_ch32f20x.c
index 8e0f575cd4..44f4c5d96f 100644
--- a/bsp/wch/arm/Libraries/ch32_drivers/drv_flash_ch32f20x.c
+++ b/bsp/wch/arm/Libraries/ch32_drivers/drv_flash_ch32f20x.c
@@ -15,7 +15,7 @@
 
 #include "drv_flash.h"
 
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
 #include "fal.h"
 #endif
 
@@ -172,7 +172,7 @@ __exit:
     return size;
 }
 
-#if defined(PKG_USING_FAL)
+#if defined(RT_USING_FAL)
 
 static int fal_flash_read(long offset, rt_uint8_t *buf, size_t size);
 static int fal_flash_write(long offset, const rt_uint8_t *buf, size_t size);
@@ -208,6 +208,6 @@ static int fal_flash_erase(long offset, size_t size)
     return ch32_flash_erase(ch32_onchip_flash.addr + offset, size);
 }
 
-#endif /* PKG_USING_FAL */
+#endif /* RT_USING_FAL */
 
 #endif /* BSP_USING_ON_CHIP_FLASH */