Update the VIM3 and VIM3L GPT layout for the AOSP Android builds. Add the missing frp, vendor_boot, init_boot, DLKM vbmeta and metadata partitions. Grow super to 4 GiB, resize userdata and remove rootfs.
Set the vendor_boot and init_boot staging addresses and advertise metadata as f2fs for fastboot format. With the non-A/B defconfigs removed, keep only the A/B layout and drop the unused ROOT_UUID. Signed-off-by: Guillaume La Roque <[email protected]> --- include/configs/khadas-vim3_android.h | 34 +++++++++++++++------------------- include/configs/khadas-vim3l_android.h | 34 +++++++++++++++------------------- 2 files changed, 30 insertions(+), 38 deletions(-) diff --git a/include/configs/khadas-vim3_android.h b/include/configs/khadas-vim3_android.h index 551ab51c881..18632bb95a0 100644 --- a/include/configs/khadas-vim3_android.h +++ b/include/configs/khadas-vim3_android.h @@ -10,36 +10,29 @@ #define __CONFIG_H #define LOGO_UUID "43a3305d-150f-4cc9-bd3b-38fca8693846;" -#define ROOT_UUID "ddb8c3f6-d94d-4394-b633-3134139cc2e0;" -#if defined(CONFIG_CMD_BCB) && defined(CONFIG_ANDROID_AB) #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=frp,size=512K,uuid=${uuid_gpt_frp};" \ "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=vbmeta_vendor_dlkm_a,size=64K,uuid=${uuid_gpt_vbmeta_vendor_dlkm_a};" \ + "name=vbmeta_vendor_dlkm_b,size=64K,uuid=${uuid_gpt_vbmeta_vendor_dlkm_b};" \ + "name=vbmeta_system_dlkm_a,size=64K,uuid=${uuid_gpt_vbmeta_system_dlkm_a};" \ + "name=vbmeta_system_dlkm_b,size=64K,uuid=${uuid_gpt_vbmeta_system_dlkm_b};" \ "name=boot_a,size=64M,bootable,uuid=${uuid_gpt_boot_a};" \ "name=boot_b,size=64M,bootable,uuid=${uuid_gpt_boot_b};" \ - "name=super,size=3072M,uuid=${uuid_gpt_super};" \ - "name=userdata,size=11218M,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 \ - "name=misc,size=512K,uuid=${uuid_gpt_misc};" \ - "name=dtbo,size=8M,uuid=${uuid_gpt_dtbo};" \ - "name=vbmeta,size=512K,uuid=${uuid_gpt_vbmeta};" \ - "name=boot,size=64M,bootable,uuid=${uuid_gpt_boot};" \ - "name=recovery,size=64M,uuid=${uuid_gpt_recovery};" \ - "name=cache,size=256M,uuid=${uuid_gpt_cache};" \ - "name=super,size=1792M,uuid=${uuid_gpt_super};" \ - "name=userdata,size=12722M,uuid=${uuid_gpt_userdata};" \ - "name=rootfs,size=-,uuid=" ROOT_UUID -#endif + "name=vendor_boot_a,size=32M,uuid=${uuid_gpt_vendor_boot_a};" \ + "name=vendor_boot_b,size=32M,uuid=${uuid_gpt_vendor_boot_b};" \ + "name=init_boot_a,size=8M,uuid=${uuid_gpt_init_boot_a};" \ + "name=init_boot_b,size=8M,uuid=${uuid_gpt_init_boot_b};" \ + "name=super,size=4096M,uuid=${uuid_gpt_super};" \ + "name=metadata,size=64M,uuid=${uuid_gpt_metadata};" \ + "name=userdata,size=10240M,uuid=${uuid_gpt_userdata};" #define CFG_EXTRA_ENV_SETTINGS \ "board=vim3\0" \ @@ -61,6 +54,9 @@ "kernel_addr_r=0x01080000\0" \ "pxefile_addr_r=0x01080000\0" \ "ramdisk_addr_r=0x13000000\0" \ + "vendor_boot_comp_addr_r=0x39000000\0" \ + "init_boot_comp_addr_r=0x41000000\0" \ + "fastboot.partition-type:metadata=f2fs\0" #include <configs/meson64.h> diff --git a/include/configs/khadas-vim3l_android.h b/include/configs/khadas-vim3l_android.h index 1869249e7c9..e84820a0d6d 100644 --- a/include/configs/khadas-vim3l_android.h +++ b/include/configs/khadas-vim3l_android.h @@ -10,36 +10,29 @@ #define __CONFIG_H #define LOGO_UUID "43a3305d-150f-4cc9-bd3b-38fca8693846;" -#define ROOT_UUID "ddb8c3f6-d94d-4394-b633-3134139cc2e0;" -#if defined(CONFIG_CMD_BCB) && defined(CONFIG_ANDROID_AB) #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=frp,size=512K,uuid=${uuid_gpt_frp};" \ "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=vbmeta_vendor_dlkm_a,size=64K,uuid=${uuid_gpt_vbmeta_vendor_dlkm_a};" \ + "name=vbmeta_vendor_dlkm_b,size=64K,uuid=${uuid_gpt_vbmeta_vendor_dlkm_b};" \ + "name=vbmeta_system_dlkm_a,size=64K,uuid=${uuid_gpt_vbmeta_system_dlkm_a};" \ + "name=vbmeta_system_dlkm_b,size=64K,uuid=${uuid_gpt_vbmeta_system_dlkm_b};" \ "name=boot_a,size=64M,bootable,uuid=${uuid_gpt_boot_a};" \ "name=boot_b,size=64M,bootable,uuid=${uuid_gpt_boot_b};" \ - "name=super,size=3072M,uuid=${uuid_gpt_super};" \ - "name=userdata,size=11218M,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 \ - "name=misc,size=512K,uuid=${uuid_gpt_misc};" \ - "name=dtbo,size=8M,uuid=${uuid_gpt_dtbo};" \ - "name=vbmeta,size=512K,uuid=${uuid_gpt_vbmeta};" \ - "name=boot,size=64M,bootable,uuid=${uuid_gpt_boot};" \ - "name=recovery,size=64M,uuid=${uuid_gpt_recovery};" \ - "name=cache,size=256M,uuid=${uuid_gpt_cache};" \ - "name=super,size=1792M,uuid=${uuid_gpt_super};" \ - "name=userdata,size=12722M,uuid=${uuid_gpt_userdata};" \ - "name=rootfs,size=-,uuid=" ROOT_UUID -#endif + "name=vendor_boot_a,size=32M,uuid=${uuid_gpt_vendor_boot_a};" \ + "name=vendor_boot_b,size=32M,uuid=${uuid_gpt_vendor_boot_b};" \ + "name=init_boot_a,size=8M,uuid=${uuid_gpt_init_boot_a};" \ + "name=init_boot_b,size=8M,uuid=${uuid_gpt_init_boot_b};" \ + "name=super,size=4096M,uuid=${uuid_gpt_super};" \ + "name=metadata,size=64M,uuid=${uuid_gpt_metadata};" \ + "name=userdata,size=10240M,uuid=${uuid_gpt_userdata};" #define CFG_EXTRA_ENV_SETTINGS \ "board=vim3l\0" \ @@ -61,6 +54,9 @@ "kernel_addr_r=0x01080000\0" \ "pxefile_addr_r=0x01080000\0" \ "ramdisk_addr_r=0x13000000\0" \ + "vendor_boot_comp_addr_r=0x39000000\0" \ + "init_boot_comp_addr_r=0x41000000\0" \ + "fastboot.partition-type:metadata=f2fs\0" #include <configs/meson64.h> -- 2.34.1
