diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-12-17 19:55:55 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-12-17 19:55:55 +0100 |
| commit | 85579906cb241ab0f544a2d5ba6d9e33714ec897 (patch) | |
| tree | 85646b2816f849b9482be4061fccee5718997960 | |
| parent | 8a16f9c6747447aecda6619568d6747f0adf6561 (diff) | |
| parent | a138d96aa88b6487c1409dd47a4ece9c3e1c3115 (diff) | |
Merge branch 'for-upstream' of git://git.denx.de/u-boot-atmel
| -rw-r--r-- | arch/arm/include/asm/arch-at91/at91_pmc.h | 8 | ||||
| -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 |
4 files changed, 14 insertions, 6 deletions
diff --git a/arch/arm/include/asm/arch-at91/at91_pmc.h b/arch/arm/include/asm/arch-at91/at91_pmc.h index 2f9ad9600..fb8bb17c1 100644 --- a/arch/arm/include/asm/arch-at91/at91_pmc.h +++ b/arch/arm/include/asm/arch-at91/at91_pmc.h @@ -91,10 +91,18 @@ typedef struct at91_pmc { #define AT91_PMC_MCKR_PRES_64 0x00000018 #define AT91_PMC_MCKR_PRES_MASK 0x0000001C +#ifdef CONFIG_AT91RM9200 +#define AT91_PMC_MCKR_MDIV_1 0x00000000 +#define AT91_PMC_MCKR_MDIV_2 0x00000100 +#define AT91_PMC_MCKR_MDIV_3 0x00000200 +#define AT91_PMC_MCKR_MDIV_4 0x00000300 +#define AT91_PMC_MCKR_MDIV_MASK 0x00000300 +#else #define AT91_PMC_MCKR_MDIV_1 0x00000000 #define AT91_PMC_MCKR_MDIV_2 0x00000100 #define AT91_PMC_MCKR_MDIV_4 0x00000200 #define AT91_PMC_MCKR_MDIV_MASK 0x00000300 +#endif #define AT91_PMC_MCKR_PLLADIV_1 0x00001000 #define AT91_PMC_MCKR_PLLADIV_2 0x00002000 diff --git a/board/emk/top9000/Makefile b/board/emk/top9000/Makefile index 9b280482a..3ac6f14f8 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 b0fe2d68a..73dd70620 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 ff3933b19..0b23a5d6f 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> |