mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-19 05:31:32 +00:00
Merge branch 'master' of git://git.denx.de/u-boot-arm
This commit is contained in:
commit
2a9a2339a4
4 changed files with 14 additions and 6 deletions
|
@ -91,10 +91,18 @@ typedef struct at91_pmc {
|
||||||
#define AT91_PMC_MCKR_PRES_64 0x00000018
|
#define AT91_PMC_MCKR_PRES_64 0x00000018
|
||||||
#define AT91_PMC_MCKR_PRES_MASK 0x0000001C
|
#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_1 0x00000000
|
||||||
#define AT91_PMC_MCKR_MDIV_2 0x00000100
|
#define AT91_PMC_MCKR_MDIV_2 0x00000100
|
||||||
#define AT91_PMC_MCKR_MDIV_4 0x00000200
|
#define AT91_PMC_MCKR_MDIV_4 0x00000200
|
||||||
#define AT91_PMC_MCKR_MDIV_MASK 0x00000300
|
#define AT91_PMC_MCKR_MDIV_MASK 0x00000300
|
||||||
|
#endif
|
||||||
|
|
||||||
#define AT91_PMC_MCKR_PLLADIV_1 0x00001000
|
#define AT91_PMC_MCKR_PLLADIV_1 0x00001000
|
||||||
#define AT91_PMC_MCKR_PLLADIV_2 0x00002000
|
#define AT91_PMC_MCKR_PLLADIV_2 0x00002000
|
||||||
|
|
|
@ -26,9 +26,9 @@
|
||||||
|
|
||||||
include $(TOPDIR)/config.mk
|
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
|
COBJS-$(CONFIG_ATMEL_SPI) += spi.o
|
||||||
|
|
||||||
SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
|
SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
|
||||||
|
@ -36,7 +36,7 @@ OBJS := $(addprefix $(obj),$(COBJS-y))
|
||||||
SOBJS := $(addprefix $(obj),$(SOBJS))
|
SOBJS := $(addprefix $(obj),$(SOBJS))
|
||||||
|
|
||||||
$(LIB): $(obj).depend $(OBJS) $(SOBJS)
|
$(LIB): $(obj).depend $(OBJS) $(SOBJS)
|
||||||
$(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
|
$(call cmd_link_o_target, $(OBJS) $(SOBJS))
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f $(SOBJS) $(OBJS)
|
rm -f $(SOBJS) $(OBJS)
|
||||||
|
|
|
@ -120,7 +120,7 @@ int board_mmc_getcd(u8 *cd, struct mmc *mmc)
|
||||||
|
|
||||||
int board_early_init_f(void)
|
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
|
* make sure the board can be powered on by
|
||||||
|
|
|
@ -40,9 +40,9 @@
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Warning: changing CONFIG_SYS_TEXT_BASE requires
|
* 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 */
|
/* Command line configuration */
|
||||||
#include <config_cmd_default.h>
|
#include <config_cmd_default.h>
|
||||||
|
|
Loading…
Add table
Reference in a new issue