diff options
| author | Tom Rini <trini@ti.com> | 2013-04-18 16:16:01 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-04-18 16:16:01 -0400 |
| commit | 17dcbfb0876385b13739b1b1f2026edc8163b629 (patch) | |
| tree | 5faa5949a895040398e70f6e8ef81dc9da88557e /include/configs/medcom-wide.h | |
| parent | 669dfc2ed8d853d6bcdcafa1de6aca22929465e5 (diff) | |
| parent | f2e8a87305a55652488af140adcf65b1e688f287 (diff) | |
| download | u-boot-imx-17dcbfb0876385b13739b1b1f2026edc8163b629.zip u-boot-imx-17dcbfb0876385b13739b1b1f2026edc8163b629.tar.gz u-boot-imx-17dcbfb0876385b13739b1b1f2026edc8163b629.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm into HEAD
Quick manual fixup to merge the USB boot related defines and TPM related
defines.
Conflicts:
include/configs/exynos5250-dt.h
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'include/configs/medcom-wide.h')
| -rw-r--r-- | include/configs/medcom-wide.h | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/include/configs/medcom-wide.h b/include/configs/medcom-wide.h index 57a50d7..eebf385 100644 --- a/include/configs/medcom-wide.h +++ b/include/configs/medcom-wide.h @@ -44,14 +44,21 @@ #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_LATE_INIT -#define CONFIG_ENV_IS_NOWHERE - /* SD/MMC */ #define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_TEGRA_MMC #define CONFIG_CMD_MMC +/* NAND support */ +#define CONFIG_CMD_NAND +#define CONFIG_TEGRA_NAND +#define CONFIG_SYS_MAX_NAND_DEVICE 1 + +/* Environment in NAND, aligned to start of last sector */ +#define CONFIG_ENV_IS_IN_NAND +#define CONFIG_ENV_OFFSET (SZ_512M - SZ_128K) /* 128K sectors */ + /* USB host support */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_TEGRA @@ -66,13 +73,6 @@ #define CONFIG_CMD_NET #define CONFIG_CMD_DHCP -#define CONFIG_FIT - -#define CONFIG_BOOTCOMMAND \ - "mmc rescan;" \ - "ext2load mmc 0 0x17000000 /boot/uImage;" \ - "bootm" - /* LCD support */ #define CONFIG_LCD #define CONFIG_PWM_TEGRA @@ -80,6 +80,9 @@ #define LCD_BPP LCD_COLOR16 #define CONFIG_SYS_WHITE_ON_BLACK +/* support the new (FDT-based) image format */ +#define CONFIG_FIT + #include "tegra-common-post.h" #endif /* __CONFIG_H */ |