diff options
| author | Minkyu Kang <mk7.kang@samsung.com> | 2010-05-10 15:20:50 +0900 |
|---|---|---|
| committer | Minkyu Kang <mk7.kang@samsung.com> | 2010-05-10 15:20:50 +0900 |
| commit | 9d62f20d0861ef87460d073dc189c851715b46ae (patch) | |
| tree | 43a05c86e947f01079879735ddf93218870df50b /examples/api | |
| parent | 6596753387c3310b86f75bebe464684d70651052 (diff) | |
| parent | e0531f975ce124f4ebdd9c7b7b107673c5628f68 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts:
arch/arm/include/asm/mach-types.h
common/serial.c
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Diffstat (limited to 'examples/api')
| -rw-r--r-- | examples/api/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/api/Makefile b/examples/api/Makefile index bed16f1555..5b5f7a681c 100644 --- a/examples/api/Makefile +++ b/examples/api/Makefile @@ -20,7 +20,7 @@ # MA 02111-1307 USA # -ifeq ($(ARCH),ppc) +ifeq ($(ARCH),powerpc) LOAD_ADDR = 0x40000 endif ifeq ($(ARCH),arm) @@ -46,8 +46,8 @@ EXT_COBJ_FILES-$(CONFIG_API) += lib/div64.o EXT_COBJ_FILES-$(CONFIG_API) += lib/string.o EXT_COBJ_FILES-$(CONFIG_API) += lib/time.o EXT_COBJ_FILES-$(CONFIG_API) += lib/vsprintf.o -ifeq ($(ARCH),ppc) -EXT_SOBJ_FILES-$(CONFIG_API) += arch/ppc/lib/ppcstring.o +ifeq ($(ARCH),powerpc) +EXT_SOBJ_FILES-$(CONFIG_API) += arch/powerpc/lib/ppcstring.o endif # Create a list of source files so their dependencies can be auto-generated |