Wolfgang Please pull from git://www.denx.de/git/u-boot-arm.git

This is the apollon port - tested on apollon by Kyungmin Park - MAKEALL tested by Peter Pearse

Signed-off-by: Peter Pearse peter.pearse@arm.com Signed-off-by: Kyungmin Park kmpark@infradead.org

Regards

Peter

--- The following changes since commit 1ce55151c85d068f70317a8d65c61058b891afb4: Heiko Schocher (1): [UC101] SRAM now with 2 MB working.

are found in the git repository at:

git://www.denx.de/git/u-boot-arm.git

Peter Pearse (4): Add apollon board support Merge with git://www.denx.de/git/u-boot.git Correction patch Remove warnings re CONFIG_EXTRA_ENV_SETTINGS

MAKEALL | 1 + Makefile | 5 +- board/apollon/Makefile | 48 +++ board/apollon/apollon.c | 472 +++++++++++++++++++++++++++++++ board/apollon/config.mk | 25 ++ board/apollon/lowlevel_init.S | 337 ++++++++++++++++++++++ board/apollon/mem.c | 235 +++++++++++++++ board/apollon/mem.h | 170 +++++++++++ board/apollon/sys_info.c | 403 ++++++++++++++++++++++++++ board/apollon/u-boot.lds | 63 ++++ common/env_onenand.c | 4 +- include/asm-arm/arch-arm1136/mux.h | 18 ++ include/asm-arm/arch-arm1136/omap2420.h | 33 ++- include/asm-arm/mach-types.h | 13 + include/configs/apollon.h | 238 ++++++++++++++++ 15 files changed, 2058 insertions(+), 7 deletions(-) create mode 100644 board/apollon/Makefile create mode 100644 board/apollon/apollon.c create mode 100644 board/apollon/config.mk create mode 100644 board/apollon/lowlevel_init.S create mode 100644 board/apollon/mem.c create mode 100644 board/apollon/mem.h create mode 100644 board/apollon/sys_info.c create mode 100644 board/apollon/u-boot.lds create mode 100755 include/configs/apollon.h

---