summaryrefslogtreecommitdiff
path: root/include/configs/am43xx_evm.h
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-02-26 16:49:58 -0500
committerTom Rini <trini@ti.com>2014-02-26 16:49:58 -0500
commiteeb72e67619b98d2502fe634a3a5d9953de92ad0 (patch)
treeedea4b04062ec956158c163b13c9a31fcfdccde8 /include/configs/am43xx_evm.h
parent715b56fe2b47e073e6f2425e0cedba0e92a4014d (diff)
parent1551df35f296f0a8df32f4f2054254f46e8be252 (diff)
downloadu-boot-imx-eeb72e67619b98d2502fe634a3a5d9953de92ad0.zip
u-boot-imx-eeb72e67619b98d2502fe634a3a5d9953de92ad0.tar.gz
u-boot-imx-eeb72e67619b98d2502fe634a3a5d9953de92ad0.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts: arch/arm/cpu/armv7/config.mk board/ti/am43xx/mux.c include/configs/am43xx_evm.h Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'include/configs/am43xx_evm.h')
-rw-r--r--include/configs/am43xx_evm.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h
index 9a44990..c773a18 100644
--- a/include/configs/am43xx_evm.h
+++ b/include/configs/am43xx_evm.h
@@ -104,6 +104,12 @@
#define CONFIG_SPL_SPI_CS 0
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000
+/* Enhance our eMMC support / experience. */
+#define CONFIG_CMD_GPT
+#define CONFIG_EFI_PARTITION
+#define CONFIG_PARTITION_UUIDS
+#define CONFIG_CMD_PART
+
#ifndef CONFIG_SPL_BUILD
#define CONFIG_EXTRA_ENV_SETTINGS \
"loadaddr=0x80200000\0" \
@@ -115,6 +121,9 @@
"bootdir=/boot\0" \
"bootfile=zImage\0" \
"console=ttyO0,115200n8\0" \
+ "partitions=" \
+ "uuid_disk=${uuid_gpt_disk};" \
+ "name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}\0" \
"optargs=\0" \
"mmcdev=0\0" \
"mmcroot=/dev/mmcblk0p2 rw\0" \