diff options
| author | Tom Rini <[email protected]> | 2019-01-09 16:02:29 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2019-01-09 16:02:29 -0500 |
| commit | 43a6a1ec9055a53a11d6d735f11cceea13912bbe (patch) | |
| tree | a41a8a53c8e92be82d68a6b7862b50971ec2522a /include | |
| parent | 54707a942009fae083dd78b58ff057127ba0e900 (diff) | |
| parent | 4fb224638d608ba3bdc9200360663b4109038580 (diff) | |
Merge branch '2019-01-08-master-imports'
- stm32f7 GPIO fixes
- SATA env fixes
- More DM migration deadline warnings
- Regression fix for non-DM MMC drivers
- dma_alloc_coherent size fix on ARM.
Diffstat (limited to 'include')
| -rw-r--r-- | include/environment/ti/boot.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/include/environment/ti/boot.h b/include/environment/ti/boot.h index 86ff6d3ea7c..05bdbbc23e4 100644 --- a/include/environment/ti/boot.h +++ b/include/environment/ti/boot.h @@ -35,17 +35,12 @@ "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=uboot-env,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=1024M,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 */ |