Merge tag 'versal-qspi-for-v2022.10' of https://gitlab.denx.de/u-boot/custodians...

[platform/kernel/u-boot.git] / include / configs / khadas-vim3_android.h

diff --git a/include/configs/khadas-vim3_android.h b/include/configs/khadas-vim3_android.h
index a6f6dd0..da6adf6 100644 (file)
--- a/include/configs/khadas-vim3_android.h
+++ b/include/configs/khadas-vim3_android.h
@@ -12,6 +12,21 @@
 #define LOGO_UUID "43a3305d-150f-4cc9-bd3b-38fca8693846;"
 #define ROOT_UUID "ddb8c3f6-d94d-4394-b633-3134139cc2e0;"
 
+#if defined(CONFIG_CMD_AB_SELECT)
+#define PARTS_DEFAULT \
+       "uuid_disk=${uuid_gpt_disk};" \
+       "name=logo,start=512K,size=2M,uuid=" LOGO_UUID \
+       "name=misc,size=512K,uuid=${uuid_gpt_misc};" \
+       "name=dtbo_a,size=8M,uuid=${uuid_gpt_dtbo_a};" \
+       "name=dtbo_b,size=8M,uuid=${uuid_gpt_dtbo_b};" \
+       "name=vbmeta_a,size=512K,uuid=${uuid_gpt_vbmeta_a};" \
+       "name=vbmeta_b,size=512K,uuid=${uuid_gpt_vbmeta_b};" \
+       "name=boot_a,size=32M,bootable,uuid=${uuid_gpt_boot_a};" \
+       "name=boot_b,size=32M,bootable,uuid=${uuid_gpt_boot_b};" \
+       "name=super,size=3072M,uuid=${uuid_gpt_super};" \
+       "name=userdata,size=11282M,uuid=${uuid_gpt_userdata};" \
+       "name=rootfs,size=-,uuid=" ROOT_UUID
+#else
 #define PARTS_DEFAULT \
        "uuid_disk=${uuid_gpt_disk};" \
        "name=logo,start=512K,size=2M,uuid=" LOGO_UUID \
@@ -24,6 +39,7 @@
        "name=super,size=1792M,uuid=${uuid_gpt_super};" \
        "name=userdata,size=12786M,uuid=${uuid_gpt_userdata};" \
        "name=rootfs,size=-,uuid=" ROOT_UUID
+#endif
 
 #define EXTRA_ANDROID_ENV_SETTINGS \
        "board=vim3\0" \