summaryrefslogtreecommitdiff
path: root/include/configs
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-10-02 08:10:36 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-10-02 08:10:36 +0200
commit5c8d5b6fc15fc2c52d74c266d9fe6eb5f75cbcb4 (patch)
tree10c4a86397d7ac6ae9a6bcc0e9438dd620246404 /include/configs
parent12eba1b49380988fd87cc0b3af44014cca8b71c4 (diff)
parent827512fb1154c05c6eb1e2259e936df55c98a535 (diff)
downloadu-boot-imx-5c8d5b6fc15fc2c52d74c266d9fe6eb5f75cbcb4.zip
u-boot-imx-5c8d5b6fc15fc2c52d74c266d9fe6eb5f75cbcb4.tar.gz
u-boot-imx-5c8d5b6fc15fc2c52d74c266d9fe6eb5f75cbcb4.tar.bz2
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'include/configs')
-rw-r--r--include/configs/am335x_evm.h6
-rw-r--r--include/configs/dra7xx_evm.h8
-rw-r--r--include/configs/pcm051.h1
3 files changed, 14 insertions, 1 deletions
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 3de30fc..cdf689f 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -170,6 +170,7 @@
"run mmcboot;" \
"setenv mmcdev 1; " \
"setenv bootpart 1:2; " \
+ "setenv mmcroot /dev/mmcblk1p2 ro; " \
"run mmcboot;" \
"run nandboot;"
@@ -189,8 +190,13 @@
#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2
#define CONFIG_SYS_I2C_MULTI_EEPROMS
+/* PMIC support */
+#define CONFIG_POWER_TPS65217
+#define CONFIG_POWER_TPS65910
+
/* SPL */
#ifndef CONFIG_NOR_BOOT
+#define CONFIG_SPL_POWER_SUPPORT
#define CONFIG_SPL_YMODEM_SUPPORT
/* CPSW support */
diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h
index 4fbe768..7b120de 100644
--- a/include/configs/dra7xx_evm.h
+++ b/include/configs/dra7xx_evm.h
@@ -14,7 +14,13 @@
#define CONFIG_DRA7XX
-#define CONFIG_ENV_IS_NOWHERE /* For now. */
+/* 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_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
+#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
+#define CONFIG_CMD_SAVEENV
#define CONSOLEDEV "ttyO0"
#define CONFIG_CONS_INDEX 1
diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h
index e2b4de7..2fff0be 100644
--- a/include/configs/pcm051.h
+++ b/include/configs/pcm051.h
@@ -201,6 +201,7 @@
/* Defines for SPL */
#define CONFIG_SPL
#define CONFIG_SPL_FRAMEWORK
+#define CONFIG_SPL_BOARD_INIT
/*
* Place the image at the start of the ROM defined image space.
* We limit our size to the ROM-defined downloaded image area, and use the