diff options
| author | Tom Rini <trini@ti.com> | 2012-10-19 18:23:38 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-10-19 18:23:38 -0700 |
| commit | 99070db0dc0b0e881841a0091f06d53351244a34 (patch) | |
| tree | f54a53d89cf1125c8fe433bc51539144de43074c /boards.cfg | |
| parent | 7f14f30a6d6c80f9fbe3fd8d5b0c294575e3094e (diff) | |
| parent | 39826f09978a0a7070999acc15babf88f03e4051 (diff) | |
| download | u-boot-99070db0dc0b0e881841a0091f06d53351244a34.tar.gz u-boot-99070db0dc0b0e881841a0091f06d53351244a34.tar.xz u-boot-99070db0dc0b0e881841a0091f06d53351244a34.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts:
drivers/serial/serial_lh7a40x.c
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 df62251253..83e7084de7 100644 --- a/boards.cfg +++ b/boards.cfg @@ -295,6 +295,7 @@ dvlhost arm ixp pdnb3 arm ixp pdnb3 prodrive scpu arm ixp pdnb3 prodrive - pdnb3:SCPU balloon3 arm pxa +h2200 arm pxa lubbock arm pxa palmld arm pxa palmtc arm pxa |