AT91: fix TOP9000 build problem and change CONFIG_SYS_TEXT_BASE
PATCH 1/1 AT91: fix TOP9000 build problem and change CONFIG_SYS_TEXT_BASE
Signed-off-by Reinhard Meyer <[email protected]>
--- board/emk/top9000/Makefile | 6 +++--- board/emk/top9000/top9000.c | 2 +- include/configs/top9000.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)
board/emk/top9000/Makefile +3 -3
@@ -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)
board/emk/top9000/top9000.c +1 -1
@@ -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
include/configs/top9000.h +2 -2
@@ -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>
Signature · 1 line
1.5.6.5
PATCH 1/1 AT91: fix TOP9000 build problem and change CONFIG_SYS_TEXT_BASE
Quoted 6 lines · Reinhard Meyer
Signed-off-by Reinhard Meyer <[email protected]>--- board/emk/top9000/Makefile | 6 +++--- board/emk/top9000/top9000.c | 2 +- include/configs/top9000.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)
Applied to u-boot-atmel/for-upstream.