diff options
| author | Reinhard Meyer <u-boot@emk-elektronik.de> | 2010-12-09 10:07:31 +0100 |
|---|---|---|
| committer | Reinhard Meyer <u-boot@emk-elektronik.de> | 2010-12-17 08:47:26 +0100 |
| commit | f805548b28f90aa76374b16f86206dd3a5743d23 (patch) | |
| tree | da49bcdd435c8e7667a17f679d98bb425e1906c0 | |
| parent | 6741b5310f81ae5ae0132ad85b09fb31d6377b6c (diff) | |
| download | u-boot-imx-f805548b28f90aa76374b16f86206dd3a5743d23.zip u-boot-imx-f805548b28f90aa76374b16f86206dd3a5743d23.tar.gz u-boot-imx-f805548b28f90aa76374b16f86206dd3a5743d23.tar.bz2 | |
AT91: fix TOP9000 build problem and change CONFIG_SYS_TEXT_BASE
Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
| -rw-r--r-- | board/emk/top9000/Makefile | 6 | ||||
| -rw-r--r-- | board/emk/top9000/top9000.c | 2 | ||||
| -rw-r--r-- | include/configs/top9000.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/board/emk/top9000/Makefile b/board/emk/top9000/Makefile index 9b28048..3ac6f14 100644 --- a/board/emk/top9000/Makefile +++ b/board/emk/top9000/Makefile @@ -26,9 +26,9 @@ include $(TOPDIR)/config.mk -LIB = $(obj)lib$(BOARD).a +LIB = $(obj)lib$(BOARD).o -COBJS-y += top9000.o +COBJS-y += $(BOARD).o COBJS-$(CONFIG_ATMEL_SPI) += spi.o SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c) @@ -36,7 +36,7 @@ OBJS := $(addprefix $(obj),$(COBJS-y)) SOBJS := $(addprefix $(obj),$(SOBJS)) $(LIB): $(obj).depend $(OBJS) $(SOBJS) - $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) + $(call cmd_link_o_target, $(OBJS) $(SOBJS)) clean: rm -f $(SOBJS) $(OBJS) diff --git a/board/emk/top9000/top9000.c b/board/emk/top9000/top9000.c index b0fe2d6..73dd706 100644 --- a/board/emk/top9000/top9000.c +++ b/board/emk/top9000/top9000.c @@ -120,7 +120,7 @@ int board_mmc_getcd(u8 *cd, struct mmc *mmc) int board_early_init_f(void) { - at91_shdwn_t *shdwn = (at91_shdwn_t *)AT91_SHDWN_BASE; + struct at91_shdwn *shdwn = (struct at91_shdwn *)AT91_SHDWN_BASE; /* * make sure the board can be powered on by diff --git a/include/configs/top9000.h b/include/configs/top9000.h index ff3933b..0b23a5d 100644 --- a/include/configs/top9000.h +++ b/include/configs/top9000.h @@ -40,9 +40,9 @@ /* * Warning: changing CONFIG_SYS_TEXT_BASE requires - * adapting the initial boot program + * adapting the initial boot program. */ -#define CONFIG_SYS_TEXT_BASE 0x21f00000 /* 31 MB into RAM */ +#define CONFIG_SYS_TEXT_BASE 0x20000000 /* start of SDRAM */ /* Command line configuration */ #include <config_cmd_default.h> |