diff options
author | Tom Rini <trini@ti.com> | 2013-07-25 08:22:08 -0400 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2013-07-25 08:51:51 -0400 |
commit | aaf5e825606a70ddc8fca8e366d8c16a6fd3cc7c (patch) | |
tree | 64eaea4d396dce4e0a30bb955b8240d4b199cdca /board/AndesTech | |
parent | 0b17998e509e5614633aee0a3c5d6248f8bc580b (diff) | |
parent | c54fd3efa497876a33cc3c6e7df514ae53abc729 (diff) | |
download | u-boot-aaf5e825606a70ddc8fca8e366d8c16a6fd3cc7c.tar.gz u-boot-aaf5e825606a70ddc8fca8e366d8c16a6fd3cc7c.tar.xz u-boot-aaf5e825606a70ddc8fca8e366d8c16a6fd3cc7c.zip |
Merge branch 'master' of git://git.denx.de/u-boot-nds32
Diffstat (limited to 'board/AndesTech')
-rw-r--r-- | board/AndesTech/adp-ag101/Makefile | 6 | ||||
-rw-r--r-- | board/AndesTech/adp-ag101/adp-ag101.c | 10 | ||||
-rw-r--r-- | board/AndesTech/adp-ag101p/Makefile | 6 | ||||
-rw-r--r-- | board/AndesTech/adp-ag101p/adp-ag101p.c | 10 | ||||
-rw-r--r-- | board/AndesTech/adp-ag102/Makefile | 4 | ||||
-rw-r--r-- | board/AndesTech/adp-ag102/adp-ag102.c | 3 |
6 files changed, 27 insertions, 12 deletions
diff --git a/board/AndesTech/adp-ag101/Makefile b/board/AndesTech/adp-ag101/Makefile index a4916cb5c1..826414f5b1 100644 --- a/board/AndesTech/adp-ag101/Makefile +++ b/board/AndesTech/adp-ag101/Makefile @@ -10,10 +10,10 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).o -COBJS := adp-ag101.o +COBJS-y := adp-ag101.o -SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) -OBJS := $(addprefix $(obj),$(COBJS) $(SOBJS)) +SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS-y) $(SOBJS-y)) $(LIB): $(OBJS) $(call cmd_link_o_target, $(OBJS)) diff --git a/board/AndesTech/adp-ag101/adp-ag101.c b/board/AndesTech/adp-ag101/adp-ag101.c index b030c17842..9884a5b52d 100644 --- a/board/AndesTech/adp-ag101/adp-ag101.c +++ b/board/AndesTech/adp-ag101/adp-ag101.c @@ -35,7 +35,7 @@ int board_init(void) int dram_init(void) { unsigned long sdram_base = PHYS_SDRAM_0; - unsigned long expected_size = PHYS_SDRAM_0_SIZE; + unsigned long expected_size = PHYS_SDRAM_0_SIZE + PHYS_SDRAM_1_SIZE; unsigned long actual_size; actual_size = get_ram_size((void *)sdram_base, expected_size); @@ -50,6 +50,14 @@ int dram_init(void) return 0; } +void dram_init_banksize(void) +{ + gd->bd->bi_dram[0].start = PHYS_SDRAM_0; + gd->bd->bi_dram[0].size = PHYS_SDRAM_0_SIZE; + gd->bd->bi_dram[1].start = PHYS_SDRAM_1; + gd->bd->bi_dram[1].size = PHYS_SDRAM_1_SIZE; +} + int board_eth_init(bd_t *bd) { return ftmac100_initialize(bd); diff --git a/board/AndesTech/adp-ag101p/Makefile b/board/AndesTech/adp-ag101p/Makefile index 2192e2c273..875fb9228c 100644 --- a/board/AndesTech/adp-ag101p/Makefile +++ b/board/AndesTech/adp-ag101p/Makefile @@ -10,10 +10,10 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).o -COBJS := adp-ag101p.o +COBJS-y := adp-ag101p.o -SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) -OBJS := $(addprefix $(obj),$(COBJS) $(SOBJS)) +SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS-y) $(SOBJS-y)) $(LIB): $(OBJS) $(call cmd_link_o_target, $(OBJS)) diff --git a/board/AndesTech/adp-ag101p/adp-ag101p.c b/board/AndesTech/adp-ag101p/adp-ag101p.c index ed0969f90e..dd8a66532a 100644 --- a/board/AndesTech/adp-ag101p/adp-ag101p.c +++ b/board/AndesTech/adp-ag101p/adp-ag101p.c @@ -35,7 +35,7 @@ int board_init(void) int dram_init(void) { unsigned long sdram_base = PHYS_SDRAM_0; - unsigned long expected_size = PHYS_SDRAM_0_SIZE; + unsigned long expected_size = PHYS_SDRAM_0_SIZE + PHYS_SDRAM_1_SIZE; unsigned long actual_size; actual_size = get_ram_size((void *)sdram_base, expected_size); @@ -50,6 +50,14 @@ int dram_init(void) return 0; } +void dram_init_banksize(void) +{ + gd->bd->bi_dram[0].start = PHYS_SDRAM_0; + gd->bd->bi_dram[0].size = PHYS_SDRAM_0_SIZE; + gd->bd->bi_dram[1].start = PHYS_SDRAM_1; + gd->bd->bi_dram[1].size = PHYS_SDRAM_1_SIZE; +} + int board_eth_init(bd_t *bd) { return ftmac100_initialize(bd); diff --git a/board/AndesTech/adp-ag102/Makefile b/board/AndesTech/adp-ag102/Makefile index ef5334171a..ec67dd04b0 100644 --- a/board/AndesTech/adp-ag102/Makefile +++ b/board/AndesTech/adp-ag102/Makefile @@ -11,8 +11,8 @@ LIB = $(obj)lib$(BOARD).o COBJS := adp-ag102.o -SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) -OBJS := $(addprefix $(obj),$(COBJS) $(SOBJS)) +SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS-y) $(SOBJS-y)) $(LIB): $(OBJS) $(call cmd_link_o_target, $(OBJS)) diff --git a/board/AndesTech/adp-ag102/adp-ag102.c b/board/AndesTech/adp-ag102/adp-ag102.c index 6f0d0ee126..3f879ab3ce 100644 --- a/board/AndesTech/adp-ag102/adp-ag102.c +++ b/board/AndesTech/adp-ag102/adp-ag102.c @@ -10,6 +10,7 @@ #include <netdev.h> #include <asm/io.h> +#include <faraday/ftpci100.h> #include <faraday/ftsdc010.h> #ifdef CONFIG_FTSMC020 #include <faraday/ftsmc020.h> @@ -77,8 +78,6 @@ ulong board_flash_get_legacy(ulong base, int banknum, flash_info_t *info) void pci_init_board(void) { /* should be pci_ftpci100_init() */ - extern void pci_ftpci_init(); - pci_ftpci_init(); } #endif |