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 /boards.cfg | |
| parent | 669dfc2ed8d853d6bcdcafa1de6aca22929465e5 (diff) | |
| parent | f2e8a87305a55652488af140adcf65b1e688f287 (diff) | |
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 'boards.cfg')
| -rw-r--r-- | boards.cfg | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/boards.cfg b/boards.cfg index f785da8766..31483d623f 100644 --- a/boards.cfg +++ b/boards.cfg @@ -311,6 +311,7 @@ seaboard arm armv7:arm720t seaboard nvidia ventana arm armv7:arm720t ventana nvidia tegra20 whistler arm armv7:arm720t whistler nvidia tegra20 cardhu arm armv7:arm720t cardhu nvidia tegra30 +beaver arm armv7:arm720t cardhu nvidia tegra30 dalmore arm armv7:arm720t dalmore nvidia tegra114 colibri_t20_iris arm armv7:arm720t colibri_t20_iris toradex tegra20 u8500_href arm armv7 u8500 st-ericsson u8500 |