|
@@ -13,6 +13,16 @@
|
|
#define CONSOLEDEV "ttyO2"
|
|
#define CONSOLEDEV "ttyO2"
|
|
#endif
|
|
#endif
|
|
|
|
|
|
|
|
+#define VBMETA_PART_SIZE (64 * 1024)
|
|
|
|
+
|
|
|
|
+#if defined(CONFIG_LIBAVB)
|
|
|
|
+#define VBMETA_PART \
|
|
|
|
+ "name=vbmeta,size=" __stringify(VBMETA_PART_SIZE) \
|
|
|
|
+ ",uuid=${uuid_gpt_vbmeta};"
|
|
|
|
+#else
|
|
|
|
+#define VBMETA_PART ""
|
|
|
|
+#endif
|
|
|
|
+
|
|
#ifndef PARTS_DEFAULT
|
|
#ifndef PARTS_DEFAULT
|
|
/* Define the default GPT table for eMMC */
|
|
/* Define the default GPT table for eMMC */
|
|
#define PARTS_DEFAULT \
|
|
#define PARTS_DEFAULT \
|
|
@@ -37,9 +47,23 @@
|
|
"name=cache,size=256M,uuid=${uuid_gpt_cache};" \
|
|
"name=cache,size=256M,uuid=${uuid_gpt_cache};" \
|
|
"name=ipu1,size=1M,uuid=${uuid_gpt_ipu1};" \
|
|
"name=ipu1,size=1M,uuid=${uuid_gpt_ipu1};" \
|
|
"name=ipu2,size=1M,uuid=${uuid_gpt_ipu2};" \
|
|
"name=ipu2,size=1M,uuid=${uuid_gpt_ipu2};" \
|
|
|
|
+ VBMETA_PART \
|
|
"name=userdata,size=-,uuid=${uuid_gpt_userdata}"
|
|
"name=userdata,size=-,uuid=${uuid_gpt_userdata}"
|
|
#endif /* PARTS_DEFAULT */
|
|
#endif /* PARTS_DEFAULT */
|
|
|
|
|
|
|
|
+#if defined(CONFIG_CMD_AVB)
|
|
|
|
+#define AVB_VERIFY_CHECK "if run avb_verify; then " \
|
|
|
|
+ "echo AVB verification OK.;" \
|
|
|
|
+ "set bootargs $bootargs $avb_bootargs;" \
|
|
|
|
+ "else " \
|
|
|
|
+ "echo AVB verification failed.;" \
|
|
|
|
+ "exit; fi;"
|
|
|
|
+#define AVB_VERIFY_CMD "avb_verify=avb init 1; avb verify;\0"
|
|
|
|
+#else
|
|
|
|
+#define AVB_VERIFY_CHECK ""
|
|
|
|
+#define AVB_VERIFY_CMD ""
|
|
|
|
+#endif
|
|
|
|
+
|
|
#define DEFAULT_COMMON_BOOT_TI_ARGS \
|
|
#define DEFAULT_COMMON_BOOT_TI_ARGS \
|
|
"console=" CONSOLEDEV ",115200n8\0" \
|
|
"console=" CONSOLEDEV ",115200n8\0" \
|
|
"fdtfile=undefined\0" \
|
|
"fdtfile=undefined\0" \
|
|
@@ -48,6 +72,7 @@
|
|
"bootfile=zImage\0" \
|
|
"bootfile=zImage\0" \
|
|
"usbtty=cdc_acm\0" \
|
|
"usbtty=cdc_acm\0" \
|
|
"vram=16M\0" \
|
|
"vram=16M\0" \
|
|
|
|
+ AVB_VERIFY_CMD \
|
|
"partitions=" PARTS_DEFAULT "\0" \
|
|
"partitions=" PARTS_DEFAULT "\0" \
|
|
"optargs=\0" \
|
|
"optargs=\0" \
|
|
"dofastboot=0\0" \
|
|
"dofastboot=0\0" \
|
|
@@ -66,6 +91,7 @@
|
|
"setenv machid fe6; " \
|
|
"setenv machid fe6; " \
|
|
"mmc dev $mmcdev; " \
|
|
"mmc dev $mmcdev; " \
|
|
"mmc rescan; " \
|
|
"mmc rescan; " \
|
|
|
|
+ AVB_VERIFY_CHECK \
|
|
"part start mmc ${mmcdev} environment fdt_start; " \
|
|
"part start mmc ${mmcdev} environment fdt_start; " \
|
|
"part size mmc ${mmcdev} environment fdt_size; " \
|
|
"part size mmc ${mmcdev} environment fdt_size; " \
|
|
"part start mmc ${mmcdev} boot boot_start; " \
|
|
"part start mmc ${mmcdev} boot boot_start; " \
|