# Pastebin 5A8SWGVX
commit d452f5a6138e820ec98fe78857a045bac5fae288
Author: Mattijs Korpershoek <mkorpershoek@baylibre.com>
Date:   Thu Jul 6 15:04:35 2023 +0200

    WIP: migrate configs vim3_android to txt file
    
    Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>

diff --git a/board/amlogic/vim3/vim3.env b/board/amlogic/vim3/vim3.env
new file mode 100644
index 000000000000..3727176f8315
--- /dev/null
+++ b/board/amlogic/vim3/vim3.env
@@ -0,0 +1,31 @@
+uuid_gpt_logo=43a3305d-150f-4cc9-bd3b-38fca8693846
+uuid_gpt_rootfs=ddb8c3f6-d94d-4394-b633-3134139cc2e0
+
+// note: += is needed because \n is converted by space in .env files
+partitions=uuid_disk=${uuid_gpt_disk};
+partitions+=name=logo,start=512K,size=2M,uuid=${uuid_gpt_logo};
+partitions+=name=misc,size=512K,uuid=${uuid_gpt_misc};
+
+#if CONFIG_CMD_AB_SELECT
+partitions+=name=dtbo_a,size=8M,uuid=${uuid_gpt_dtbo_a};
+partitions+=name=dtbo_b,size=8M,uuid=${uuid_gpt_dtbo_b};
+partitions+=name=vbmeta_a,size=512K,uuid=${uuid_gpt_vbmeta_a};
+partitions+=name=vbmeta_b,size=512K,uuid=${uuid_gpt_vbmeta_b};
+partitions+=name=boot_a,size=32M,bootable,uuid=${uuid_gpt_boot_a};
+partitions+=name=boot_b,size=32M,bootable,uuid=${uuid_gpt_boot_b};
+partitions+=name=super,size=3072M,uuid=${uuid_gpt_super};
+partitions+=name=userdata,size=11282M,uuid=${uuid_gpt_userdata};
+partitions+=name=rootfs,size=-,uuid=${uuid_gpt_rootfs}
+#else
+partitions+=name=dtbo,size=8M,uuid=${uuid_gpt_dtbo};
+partitions+=name=vbmeta,size=512K,uuid=${uuid_gpt_vbmeta};
+partitions+=name=boot,size=32M,bootable,uuid=${uuid_gpt_boot};
+partitions+=name=recovery,size=32M,uuid=${uuid_gpt_recovery};
+partitions+=name=cache,size=256M,uuid=${uuid_gpt_cache};
+partitions+=name=super,size=1792M,uuid=${uuid_gpt_super};
+partitions+=name=userdata,size=12786M,uuid=${uuid_gpt_userdata};
+partitions+=name=rootfs,size=-,uuid=${uuid_gpt_rootfs}
+#endif
+
+board=vim3
+board_name=vim3
diff --git a/include/configs/khadas-vim3_android.h b/include/configs/khadas-vim3_android.h
index da6adf6c413a..5a125358b8a6 100644
--- a/include/configs/khadas-vim3_android.h
+++ b/include/configs/khadas-vim3_android.h
@@ -9,42 +9,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#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 \
-	"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=32M,bootable,uuid=${uuid_gpt_boot};" \
-	"name=recovery,size=32M,uuid=${uuid_gpt_recovery};" \
-	"name=cache,size=256M,uuid=${uuid_gpt_cache};" \
-	"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" \
-	"board_name=vim3\0" \
-
 #include <configs/meson64_android.h>
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/meson64_android.h b/include/configs/meson64_android.h
index c0e977abb01f..2fefcdc5362c 100644
--- a/include/configs/meson64_android.h
+++ b/include/configs/meson64_android.h
@@ -23,10 +23,6 @@
 #define CONTROL_PARTITION "misc"
 #endif
 
-#ifndef EXTRA_ANDROID_ENV_SETTINGS
-#define EXTRA_ANDROID_ENV_SETTINGS ""
-#endif
-
 #if defined(CONFIG_CMD_AVB)
 #define AVB_VERIFY_CHECK \
 	"if test \"${force_avb}\" -eq 1; then " \
@@ -280,8 +276,6 @@
 	"fi;"
 
 #define CFG_EXTRA_ENV_SETTINGS                                     \
-	EXTRA_ANDROID_ENV_SETTINGS                                    \
-	"partitions=" PARTS_DEFAULT "\0"                              \
 	"mmcdev=2\0"                                                  \
 	"fastboot_raw_partition_bootloader=0x1 0xfff mmcpart 1\0"     \
 	"fastboot_raw_partition_bootenv=0x0 0xfff mmcpart 2\0"        \