diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-05-15 17:19:45 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-05-15 17:19:45 +0200 |
| commit | 44cfc3a83f2a62963af2de8d983daf4c77e1db0c (patch) | |
| tree | ccdd7943466b3f6fa0231c14de7686cca84caeb4 /include | |
| parent | 9f5f51540d0d6af03ff22f55b7afc3fda6a4120d (diff) | |
| parent | 2364e151e432b4ccf32dc9e6147121253d4ff86d (diff) | |
| download | u-boot-imx-44cfc3a83f2a62963af2de8d983daf4c77e1db0c.zip u-boot-imx-44cfc3a83f2a62963af2de8d983daf4c77e1db0c.tar.gz u-boot-imx-44cfc3a83f2a62963af2de8d983daf4c77e1db0c.tar.bz2 | |
Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master'
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/beaver.h | 3 | ||||
| -rw-r--r-- | include/configs/cardhu.h | 3 | ||||
| -rw-r--r-- | include/configs/tegra-common.h | 7 |
3 files changed, 13 insertions, 0 deletions
diff --git a/include/configs/beaver.h b/include/configs/beaver.h index df9a98b..9ff089e 100644 --- a/include/configs/beaver.h +++ b/include/configs/beaver.h @@ -21,6 +21,9 @@ #include "tegra30-common.h" +/* VDD core PMIC */ +#define CONFIG_TEGRA_VDD_CORE_TPS62366A_SET1 + /* Enable fdt support for Beaver. Flash the image in u-boot-dtb.bin */ #define CONFIG_DEFAULT_DEVICE_TREE tegra30-beaver #define CONFIG_OF_CONTROL diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h index e15b527..59f429c 100644 --- a/include/configs/cardhu.h +++ b/include/configs/cardhu.h @@ -21,6 +21,9 @@ #include "tegra30-common.h" +/* VDD core PMIC */ +#define CONFIG_TEGRA_VDD_CORE_TPS62361B_SET3 + /* Enable fdt support for Cardhu. Flash the image in u-boot-dtb.bin */ #define CONFIG_DEFAULT_DEVICE_TREE tegra30-cardhu #define CONFIG_OF_CONTROL diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h index ae786cf..129acf2 100644 --- a/include/configs/tegra-common.h +++ b/include/configs/tegra-common.h @@ -48,6 +48,13 @@ #define CONFIG_SYS_NS16550_CLK V_NS16550_CLK /* + * Common HW configuration. + * If this varies between SoCs later, move to tegraNN-common.h + * Note: This is number of devices, not max device ID. + */ +#define CONFIG_SYS_MMC_MAX_DEVICE 4 + +/* * select serial console configuration */ #define CONFIG_CONS_INDEX 1 |