| Message ID | 1455909933-18961-2-git-send-email-semen.protsenko@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
On Fri, Feb 26, 2016 at 5:37 PM, Tom Rini <trini@konsulko.com> wrote: > On Fri, Feb 19, 2016 at 09:25:32PM +0200, Semen Protsenko wrote: > >> From: Sam Protsenko <semen.protsenko@linaro.org> >> >> "fastboot oem format" command reuses "gpt write" command, which in turn >> requires correct partitions defined in $partitions variable. This patch >> adds such definition of Android partitions for DRA7XX EVM board. >> >> While at it, enable CONFIG_RANDOM_UUID to spare user from providing >> UUIDs for each partition manually. >> >> Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org> >> --- >> include/configs/dra7xx_evm.h | 20 ++++++++++++++++++++ >> 1 file changed, 20 insertions(+) >> >> diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h >> index 4658283..e7e074d 100644 >> --- a/include/configs/dra7xx_evm.h >> +++ b/include/configs/dra7xx_evm.h >> @@ -42,10 +42,29 @@ >> #define CONFIG_SYS_OMAP_ABE_SYSCK >> >> #ifndef CONFIG_SPL_BUILD >> + >> /* Define the default GPT table for eMMC */ >> +#ifndef CONFIG_ANDROID_BOOT >> #define PARTS_DEFAULT \ >> "uuid_disk=${uuid_gpt_disk};" \ >> "name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}" >> +#else >> +#define PARTS_DEFAULT \ >> + "uuid_disk=${uuid_gpt_disk};" \ >> + "name=xloader,start=128K,size=128K,uuid=${uuid_gpt_xloader};" \ >> + "name=bootloader,size=384K,uuid=${uuid_gpt_bootloader};" \ >> + "name=environment,size=128K,uuid=${uuid_gpt_environment};" \ >> + "name=misc,size=128K,uuid=${uuid_gpt_misc};" \ >> + "name=efs,start=1280K,size=16M,uuid=${uuid_gpt_efs};" \ >> + "name=crypto,size=16K,uuid=${uuid_gpt_crypto};" \ >> + "name=recovery,size=10M,uuid=${uuid_gpt_recovery};" \ >> + "name=boot,size=10M,uuid=${uuid_gpt_boot};" \ >> + "name=system,size=768M,uuid=${uuid_gpt_system};" \ >> + "name=cache,size=256M,uuid=${uuid_gpt_cache};" \ >> + "name=ipu1,size=1M,uuid=${uuid_gpt_ipu1};" \ >> + "name=ipu2,size=1M,uuid=${uuid_gpt_ipu2};" \ >> + "name=userdata,size=-,uuid=${uuid_gpt_userdata}" >> +#endif >> >> #define DFU_ALT_INFO_MMC \ >> "dfu_alt_info_mmc=" \ >> @@ -116,6 +135,7 @@ >> /* Enhance our eMMC support / experience. */ >> #define CONFIG_CMD_GPT >> #define CONFIG_EFI_PARTITION >> +#define CONFIG_RANDOM_UUID >> #define CONFIG_HSMMC2_8BIT >> >> /* CPSW Ethernet */ > > I'm OK with the concept here. But I think what I'd rather see instead > of a 3 part series here is just changing the defaults to be what Android > requires here. No one else currently relies on the default layout we > offer so lets just change it for what's required here, it's still > functional enough for other possible uses. > > -- > Tom Consider this patch abandoned as new version was sent aside from this patchset: http://lists.denx.de/pipermail/u-boot/2016-February/246744.html _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 4658283..e7e074d 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -42,10 +42,29 @@ #define CONFIG_SYS_OMAP_ABE_SYSCK #ifndef CONFIG_SPL_BUILD + /* Define the default GPT table for eMMC */ +#ifndef CONFIG_ANDROID_BOOT #define PARTS_DEFAULT \ "uuid_disk=${uuid_gpt_disk};" \ "name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}" +#else +#define PARTS_DEFAULT \ + "uuid_disk=${uuid_gpt_disk};" \ + "name=xloader,start=128K,size=128K,uuid=${uuid_gpt_xloader};" \ + "name=bootloader,size=384K,uuid=${uuid_gpt_bootloader};" \ + "name=environment,size=128K,uuid=${uuid_gpt_environment};" \ + "name=misc,size=128K,uuid=${uuid_gpt_misc};" \ + "name=efs,start=1280K,size=16M,uuid=${uuid_gpt_efs};" \ + "name=crypto,size=16K,uuid=${uuid_gpt_crypto};" \ + "name=recovery,size=10M,uuid=${uuid_gpt_recovery};" \ + "name=boot,size=10M,uuid=${uuid_gpt_boot};" \ + "name=system,size=768M,uuid=${uuid_gpt_system};" \ + "name=cache,size=256M,uuid=${uuid_gpt_cache};" \ + "name=ipu1,size=1M,uuid=${uuid_gpt_ipu1};" \ + "name=ipu2,size=1M,uuid=${uuid_gpt_ipu2};" \ + "name=userdata,size=-,uuid=${uuid_gpt_userdata}" +#endif #define DFU_ALT_INFO_MMC \ "dfu_alt_info_mmc=" \ @@ -116,6 +135,7 @@ /* Enhance our eMMC support / experience. */ #define CONFIG_CMD_GPT #define CONFIG_EFI_PARTITION +#define CONFIG_RANDOM_UUID #define CONFIG_HSMMC2_8BIT /* CPSW Ethernet */