diff options
author | Tom Rini <trini@ti.com> | 2012-09-12 10:26:06 -0700 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2012-09-12 10:26:06 -0700 |
commit | a9ae14fce312c65cb3d26710afdd9b64a868dafc (patch) | |
tree | 4d4f7a5ebde03703e8689eb64298d447aefdc26b /include/configs | |
parent | c60a57912a3efcdcc087422a1e9ce2dc1b61e39d (diff) | |
parent | 95b01c47ed97a7ca8b59308e35fb8c21e8d996a5 (diff) | |
download | u-boot-imx-a9ae14fce312c65cb3d26710afdd9b64a868dafc.zip u-boot-imx-a9ae14fce312c65cb3d26710afdd9b64a868dafc.tar.gz u-boot-imx-a9ae14fce312c65cb3d26710afdd9b64a868dafc.tar.bz2 |
Merge branch 'master' of git://www.denx.de/git/u-boot-mmc
Diffstat (limited to 'include/configs')
-rw-r--r-- | include/configs/paz00.h | 3 | ||||
-rw-r--r-- | include/configs/seaboard.h | 3 | ||||
-rw-r--r-- | include/configs/trats.h | 1 | ||||
-rw-r--r-- | include/configs/ventana.h | 3 | ||||
-rw-r--r-- | include/configs/whistler.h | 3 |
5 files changed, 9 insertions, 4 deletions
diff --git a/include/configs/paz00.h b/include/configs/paz00.h index 0eb9f3b..99b8753 100644 --- a/include/configs/paz00.h +++ b/include/configs/paz00.h @@ -51,8 +51,9 @@ /* Environment in eMMC, at the end of 2nd "boot sector" */ #define CONFIG_ENV_IS_IN_MMC -#define CONFIG_ENV_OFFSET ((2 * 1024 * 1024) - CONFIG_ENV_SIZE) +#define CONFIG_ENV_OFFSET ((1024 * 1024) - CONFIG_ENV_SIZE) #define CONFIG_SYS_MMC_ENV_DEV 0 +#define CONFIG_SYS_MMC_ENV_PART 2 /* USB Host support */ #define CONFIG_USB_EHCI diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h index afc4a85..8dc6d4b 100644 --- a/include/configs/seaboard.h +++ b/include/configs/seaboard.h @@ -77,8 +77,9 @@ /* Environment in eMMC, at the end of 2nd "boot sector" */ #define CONFIG_ENV_IS_IN_MMC -#define CONFIG_ENV_OFFSET ((2 * 512 * 1024) - CONFIG_ENV_SIZE) +#define CONFIG_ENV_OFFSET ((512 * 1024) - CONFIG_ENV_SIZE) #define CONFIG_SYS_MMC_ENV_DEV 0 +#define CONFIG_SYS_MMC_ENV_PART 2 /* USB Host support */ #define CONFIG_USB_EHCI diff --git a/include/configs/trats.h b/include/configs/trats.h index f8da9c01..794b6fb 100644 --- a/include/configs/trats.h +++ b/include/configs/trats.h @@ -78,6 +78,7 @@ #define CONFIG_MMC #define CONFIG_S5P_SDHCI #define CONFIG_SDHCI +#define CONFIG_MMC_SDMA /* PWM */ #define CONFIG_PWM diff --git a/include/configs/ventana.h b/include/configs/ventana.h index 25ec2eb..f5e1bf8 100644 --- a/include/configs/ventana.h +++ b/include/configs/ventana.h @@ -58,8 +58,9 @@ /* Environment in eMMC, at the end of 2nd "boot sector" */ #define CONFIG_ENV_IS_IN_MMC -#define CONFIG_ENV_OFFSET ((2 * 1024 * 1024) - CONFIG_ENV_SIZE) +#define CONFIG_ENV_OFFSET ((1024 * 1024) - CONFIG_ENV_SIZE) #define CONFIG_SYS_MMC_ENV_DEV 0 +#define CONFIG_SYS_MMC_ENV_PART 2 /* USB Host support */ #define CONFIG_USB_EHCI diff --git a/include/configs/whistler.h b/include/configs/whistler.h index b747d0e..3235718 100644 --- a/include/configs/whistler.h +++ b/include/configs/whistler.h @@ -72,8 +72,9 @@ * particular card is standard practice as far as I know. */ #define CONFIG_ENV_IS_IN_MMC -#define CONFIG_ENV_OFFSET ((2 * 512 * 1024) - CONFIG_ENV_SIZE) +#define CONFIG_ENV_OFFSET ((512 * 1024) - CONFIG_ENV_SIZE) #define CONFIG_SYS_MMC_ENV_DEV 0 +#define CONFIG_SYS_MMC_ENV_PART 2 /* USB Host support */ #define CONFIG_USB_EHCI |