Merge branch 'master' of git://git.denx.de/u-boot-spi

[platform/kernel/u-boot.git] / include / environment / ti / boot.h

diff --git a/include/environment/ti/boot.h b/include/environment/ti/boot.h
index a05f5ba..5891009 100644 (file)
--- a/include/environment/ti/boot.h
+++ b/include/environment/ti/boot.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Boot related environment variable definitions on TI boards.
  *
  * (C) Copyright 2017 Linaro Ltd.
  * Sam Protsenko <semen.protsenko@linaro.org>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __TI_BOOT_H
@@ -14,8 +13,54 @@
 #define CONSOLEDEV "ttyO2"
 #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
-#define PARTS_DEFAULT
+/* Define the default GPT table for eMMC */
+#define PARTS_DEFAULT \
+       /* Linux partitions */ \
+       "uuid_disk=${uuid_gpt_disk};" \
+       "name=bootloader,start=384K,size=1792K,uuid=${uuid_gpt_bootloader};" \
+       "name=rootfs,start=2688K,size=-,uuid=${uuid_gpt_rootfs}\0" \
+       /* Android partitions */ \
+       "partitions_android=" \
+       "uuid_disk=${uuid_gpt_disk};" \
+       "name=xloader,start=128K,size=256K,uuid=${uuid_gpt_xloader};" \
+       "name=bootloader,size=2048K,uuid=${uuid_gpt_bootloader};" \
+       "name=reserved,start=2432K,size=256K,uuid=${uuid_gpt_reserved};" \
+       "name=misc,size=128K,uuid=${uuid_gpt_misc};" \
+       "name=efs,size=16M,uuid=${uuid_gpt_efs};" \
+       "name=crypto,size=16K,uuid=${uuid_gpt_crypto};" \
+       "name=recovery,size=40M,uuid=${uuid_gpt_recovery};" \
+       "name=boot,size=10M,uuid=${uuid_gpt_boot};" \
+       "name=system,size=768M,uuid=${uuid_gpt_system};" \
+       "name=vendor,size=256M,uuid=${uuid_gpt_vendor};" \
+       "name=cache,size=256M,uuid=${uuid_gpt_cache};" \
+       "name=ipu1,size=1M,uuid=${uuid_gpt_ipu1};" \
+       "name=ipu2,size=1M,uuid=${uuid_gpt_ipu2};" \
+       VBMETA_PART \
+       "name=userdata,size=-,uuid=${uuid_gpt_userdata}"
+#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 \
@@ -26,26 +71,30 @@
        "bootfile=zImage\0" \
        "usbtty=cdc_acm\0" \
        "vram=16M\0" \
+       AVB_VERIFY_CMD \
        "partitions=" PARTS_DEFAULT "\0" \
        "optargs=\0" \
        "dofastboot=0\0" \
+       "emmc_linux_boot=" \
+               "echo Trying to boot Linux from eMMC ...; " \
+               "setenv mmcdev 1; " \
+               "setenv bootpart 1:2; " \
+               "setenv mmcroot /dev/mmcblk0p2 rw; " \
+               "run mmcboot;\0" \
        "emmc_android_boot=" \
+               "echo Trying to boot Android from eMMC ...; " \
+               "run update_to_fit; " \
                "setenv eval_bootargs setenv bootargs $bootargs; " \
                "run eval_bootargs; " \
                "setenv mmcdev 1; " \
-               "setenv fdt_part 3; " \
-               "setenv boot_part 9; " \
                "setenv machid fe6; " \
                "mmc dev $mmcdev; " \
                "mmc rescan; " \
-               "part start mmc ${mmcdev} ${fdt_part} fdt_start; " \
-               "part size mmc ${mmcdev} ${fdt_part} fdt_size; " \
-               "part start mmc ${mmcdev} ${boot_part} boot_start; " \
-               "part size mmc ${mmcdev} ${boot_part} boot_size; " \
-               "mmc read ${fdtaddr} ${fdt_start} ${fdt_size}; " \
+               AVB_VERIFY_CHECK \
+               "part start mmc ${mmcdev} boot boot_start; " \
+               "part size mmc ${mmcdev} boot boot_size; " \
                "mmc read ${loadaddr} ${boot_start} ${boot_size}; " \
-               "echo Booting from eMMC ...; " \
-               "bootm $loadaddr $loadaddr $fdtaddr;\0"
+               "bootm ${loadaddr}#${fdtfile};\0 "
 
 #ifdef CONFIG_OMAP54XX
 
@@ -61,12 +110,18 @@
                        "setenv fdtfile dra72-evm.dtb; fi;" \
                "if test $board_name = dra71x; then " \
                        "setenv fdtfile dra71-evm.dtb; fi;" \
+               "if test $board_name = dra76x_acd; then " \
+                       "setenv fdtfile dra76-evm.dtb; fi;" \
                "if test $board_name = beagle_x15; then " \
                        "setenv fdtfile am57xx-beagle-x15.dtb; fi;" \
                "if test $board_name = beagle_x15_revb1; then " \
                        "setenv fdtfile am57xx-beagle-x15-revb1.dtb; fi;" \
+               "if test $board_name = beagle_x15_revc; then " \
+                       "setenv fdtfile am57xx-beagle-x15-revc.dtb; fi;" \
                "if test $board_name = am572x_idk; then " \
                        "setenv fdtfile am572x-idk.dtb; fi;" \
+               "if test $board_name = am574x_idk; then " \
+                       "setenv fdtfile am574x-idk.dtb; fi;" \
                "if test $board_name = am57xx_evm; then " \
                        "setenv fdtfile am57xx-beagle-x15.dtb; fi;" \
                "if test $board_name = am57xx_evm_reva3; then " \
@@ -89,10 +144,7 @@
        "run findfdt; " \
        "run envboot; " \
        "run mmcboot;" \
-       "setenv mmcdev 1; " \
-       "setenv bootpart 1:2; " \
-       "setenv mmcroot /dev/mmcblk0p2 rw; " \
-       "run mmcboot;" \
+       "run emmc_linux_boot; " \
        "run emmc_android_boot; " \
        ""