summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/configs/dra7xx_evm.h2
-rw-r--r--include/configs/omap5_common.h13
-rw-r--r--include/configs/omap5_uevm.h18
3 files changed, 25 insertions, 8 deletions
diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h
index 10a4939..28a306b 100644
--- a/include/configs/dra7xx_evm.h
+++ b/include/configs/dra7xx_evm.h
@@ -28,6 +28,8 @@
#ifndef __CONFIG_DRA7XX_EVM_H
#define __CONFIG_DRA7XX_EVM_H
+#define CONFIG_ENV_IS_NOWHERE /* For now. */
+
#include <configs/omap5_common.h>
#define CONFIG_DRA7XX /* in a TI DRA7XX core */
diff --git a/include/configs/omap5_common.h b/include/configs/omap5_common.h
index da0ead9..f5e575a 100644
--- a/include/configs/omap5_common.h
+++ b/include/configs/omap5_common.h
@@ -94,19 +94,12 @@
#define CONFIG_DRIVER_OMAP34XX_I2C
#define CONFIG_I2C_MULTI_BUS
-
/* MMC */
#define CONFIG_GENERIC_MMC
#define CONFIG_MMC
#define CONFIG_OMAP_HSMMC
#define CONFIG_DOS_PARTITION
-/* MMC ENV related defines */
-#define CONFIG_ENV_IS_IN_MMC
-#define CONFIG_SYS_MMC_ENV_DEV 1 /* SLOT2: eMMC(1) */
-#define CONFIG_ENV_OFFSET 0xE0000
-#define CONFIG_CMD_SAVEENV
-
#define CONFIG_SYS_CONSOLE_IS_IN_ENV
/* Flash */
@@ -124,7 +117,6 @@
#define CONFIG_CMD_FAT /* FAT support */
#define CONFIG_CMD_I2C /* I2C serial bus support */
#define CONFIG_CMD_MMC /* MMC support */
-#define CONFIG_CMD_SAVEENV
/* Disabled commands */
#undef CONFIG_CMD_NET
@@ -144,6 +136,10 @@
#define CONFIG_ENV_OVERWRITE
+#ifndef PARTS_DEFAULT
+#define PARTS_DEFAULT
+#endif
+
#define CONFIG_EXTRA_ENV_SETTINGS \
"loadaddr=0x82000000\0" \
"console=ttyO2,115200n8\0" \
@@ -154,6 +150,7 @@
"bootfile=zImage\0" \
"usbtty=cdc_acm\0" \
"vram=16M\0" \
+ "partitions=" PARTS_DEFAULT "\0" \
"mmcdev=0\0" \
"mmcroot=/dev/mmcblk0p2 rw\0" \
"mmcrootfstype=ext3 rootwait\0" \
diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h
index 22a8e13..e490523 100644
--- a/include/configs/omap5_uevm.h
+++ b/include/configs/omap5_uevm.h
@@ -28,6 +28,12 @@
#ifndef __CONFIG_OMAP5_EVM_H
#define __CONFIG_OMAP5_EVM_H
+/* Define the default GPT table for eMMC */
+#define PARTS_DEFAULT \
+ "uuid_disk=${uuid_gpt_disk};" \
+ "name=u-boot,size=1792KiB,uuid=${uuid_gpt_u-boot};" \
+ "name=rootfs,size=-,uuid=${uuid_gpt_rootfs}"
+
#include <configs/omap5_common.h>
/* TWL6035 */
@@ -35,6 +41,18 @@
#define CONFIG_TWL6035_POWER
#endif
+/* MMC ENV related defines */
+#define CONFIG_ENV_IS_IN_MMC
+#define CONFIG_SYS_MMC_ENV_DEV 1 /* SLOT2: eMMC(1) */
+#define CONFIG_ENV_OFFSET 0xE0000
+#define CONFIG_CMD_SAVEENV
+
+/* Enhance our eMMC support / experience. */
+#define CONFIG_CMD_GPT
+#define CONFIG_EFI_PARTITION
+#define CONFIG_PARTITION_UUIDS
+#define CONFIG_CMD_PART
+
#define CONFIG_SYS_PROMPT "OMAP5430 EVM # "
#endif /* __CONFIG_OMAP5_EVM_H */