diff options
author | Tom Rini <trini@ti.com> | 2013-07-12 14:36:48 (GMT) |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2013-07-12 14:36:48 (GMT) |
commit | fbbbc86e8ebac4f42f4ca39ceba80cea27c983bc (patch) | |
tree | 9c91526cefd027d9bd964572d4f92bd2d1376c5d /include/configs/mx6sabresd.h | |
parent | d72da1582895ca226b995758426ec3769b54a9b8 (diff) | |
parent | efc284e32503b240dbd35c6e8b8d098d702b4be7 (diff) | |
download | u-boot-fsl-qoriq-fbbbc86e8ebac4f42f4ca39ceba80cea27c983bc.tar.xz |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Fix a trivial conflict in arch/arm/dts/exynos5250.dtsi about gpio and
serial.
Conflicts:
arch/arm/dts/exynos5250.dtsi
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'include/configs/mx6sabresd.h')
-rw-r--r-- | include/configs/mx6sabresd.h | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h new file mode 100644 index 0000000..76675f4 --- /dev/null +++ b/include/configs/mx6sabresd.h @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2012 Freescale Semiconductor, Inc. + * + * Configuration settings for the Freescale i.MX6Q SabreSD board. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef __MX6QSABRESD_CONFIG_H +#define __MX6QSABRESD_CONFIG_H + +#define CONFIG_MACH_TYPE 3980 +#define CONFIG_MXC_UART_BASE UART1_BASE +#define CONFIG_CONSOLE_DEV "ttymxc0" +#define CONFIG_MMCROOT "/dev/mmcblk1p2" +#define CONFIG_DEFAULT_FDT_FILE "imx6q-sabresd.dtb" +#define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024) + +#include "mx6sabre_common.h" + +#define CONFIG_SYS_FSL_USDHC_NUM 3 +#if defined(CONFIG_ENV_IS_IN_MMC) +#define CONFIG_SYS_MMC_ENV_DEV 1 /* SDHC3 */ +#endif + +#endif /* __MX6QSABRESD_CONFIG_H */ |