修改4分区与单分区兼容问题

diff --git a/code/sdk/build/config/target_config/brandy/config.py b/code/sdk/build/config/target_config/brandy/config.py
index 30356fe..cc94e1b 100755 (executable)
--- a/code/sdk/build/config/target_config/brandy/config.py
+++ b/code/sdk/build/config/target_config/brandy/config.py
@@ -401,6 +401,10 @@ target = {
                           ],
         'ram_component_set': ['pinctrl', 'dfx_set' ,'gpu']
     },
+    'brandy-native-js-r-4part': {
+        'base_target_name': 'brandy-native-js-r',
+        'defines': ['-:SINGLE_USER_PARTITION']
+    },
     'brandy-xts-r': {
         'board': 'evb',
         'base_target_name': 'target_brandy_recovery_template',
@@ -483,7 +487,7 @@ target_group = {
     'pack_brandy_native_js_obu': ['brandy-ssb', 'brandy-native-js-r', 'brandy-native-js-obu'],
     'pack_brandy_native_js_ct': ['brandy-ssb', 'brandy-native-js-r', 'brandy-native-js-ct'],
     'pack_brandy_native_js_cm': ['brandy-ssb', 'brandy-native-js-r', 'brandy-native-js-cm'],
-    'pack_brandy_native_js_4part': ['brandy-ssb', 'brandy-native-js-r', 'brandy-native-js-4part'],
+    'pack_brandy_native_js_4part': ['brandy-ssb', 'brandy-native-js-r-4part', 'brandy-native-js-4part'],
     'pack_brandy_xts': ['brandy-ssb', 'brandy-xts-r', 'brandy-xts'],
     'pack_brandy_native_js_oob128': ['brandy-ssb-oob128', 'brandy-native-js-r', 'brandy-native-js-oob128'],
     'brandy_all': ['brandy-ssb',

diff --git a/code/sdk/drivers/drivers/driver/nand_flash/nand/nandflash_config.c b/code/sdk/drivers/drivers/driver/nand_flash/nand/nandflash_config.c
index 6ff0446..a56b6c3 100755 (executable)
--- a/code/sdk/drivers/drivers/driver/nand_flash/nand/nandflash_config.c
+++ b/code/sdk/drivers/drivers/driver/nand_flash/nand/nandflash_config.c
@@ -266,11 +266,14 @@ int nandflash_filesystem_init(void)
     PRINT("yaffs filesystem init start!\n");
     int ret = formate_filesystem_init(freertos_nandflash_driver->total_block);
 
-    int i=0;
-    for(i=0;i<YF_VOLUMES_NUM;i++)
-    {
-        mount_partition_by_index(i);
-    }
+#ifdef  SINGLE_USER_PARTITION
+        mount_partition_by_index(0);
+    #else
+    mount_partition_by_index(0);
+    mount_partition_by_index(1);
+    mount_partition_by_index(2);
+    mount_partition_by_index(3);
+#endif
     //mount_partition_by_index(0);
     // mount_partition_by_index(1);
     // mount_partition_by_index(2);