From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andre Schwarz Date: Tue, 27 May 2008 10:44:32 +0200 Subject: [U-Boot-Users] [PATCH 2/2] add MPC8343 based board mvBlueLYNX-M7 In-Reply-To: <20080508144928.2f480295.kim.phillips@freescale.com> References: <4820147A.4050401@matrix-vision.de> <20080506092606.05828286.kim.phillips@freescale.com> <48207061.2060102@matrix-vision.de> <20080506200629.GC15533@game.jcrosoft.org> <48217E0C.2050503@matrix-vision.de> <20080507103656.8330e409.kim.phillips@freescale.com> <20080508144928.2f480295.kim.phillips@freescale.com> Message-ID: <483BC9F0.1080900@matrix-vision.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Kim, after being back from holiday I'd like to give it another try .... I just updated my git repo to the latest version and applied various change requests (typos + coding style) from Wolfgang and Jean-Christophe. The missing #define of the FPGA chip size has been submitted as a separated patch 5 minutes ago - sorry for that. Do you want me to re-send a complete set of patches for the M7-Board against the latest version ? Cheers, Andre Kim Phillips schrieb: > On Wed, 7 May 2008 10:36:56 -0500 > Kim Phillips wrote: > > >> On Wed, 07 May 2008 12:01:48 +0200 >> Andr?? Schwarz wrote: >> >> >>> I'll re-send the 23rd try after my vacation at end of may. >>> If the merge window will be closed at that date it's obviously bad luck. >>> >> I can make the changes, Andr??, thanks! >> > > hmm..made the below changes, but I don't know how to recover from: > > fpga.c:55: error: ???Altera_EP2C20_SIZE??? undeclared here (not in a function) > > it seems this never built? also, we are missing a config file in the > latest submission. One more thing: please submit patches in an order > that will not break future builds during a git-bisect session, i.e., > since I believe a single patch is less than the ML limit of 40KB, make > it a single patch, please. > > Thanks, > > Kim > > diff --git a/board/mvblm7/Makefile b/board/mvblm7/Makefile > index 84cd14a..42e0243 100644 > --- a/board/mvblm7/Makefile > +++ b/board/mvblm7/Makefile > @@ -24,8 +24,11 @@ include $(TOPDIR)/config.mk > > LIB = $(obj)lib$(BOARD).a > > -COBJS := $(BOARD).o pci.o fpga.o > +COBJS-y := $(BOARD).o > +COBJS-$(CONFIG_PCI) += pci.o > +COBJS-$(CONFIG_FPGA) += fpga.o > > +COBJS := $(COBJS-y) > SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) > OBJS := $(addprefix $(obj),$(COBJS)) > SOBJS := $(addprefix $(obj),$(SOBJS)) > diff --git a/board/mvblm7/fpga.c b/board/mvblm7/fpga.c > index 5eaa037..a60af01 100644 > --- a/board/mvblm7/fpga.c > +++ b/board/mvblm7/fpga.c > @@ -32,8 +32,6 @@ > #include "fpga.h" > #include "mvblm7.h" > > -#ifdef CONFIG_FPGA > - > #ifdef FPGA_DEBUG > #define fpga_debug(fmt, args...) printf("%s: "fmt, __func__, ##args) > #else > @@ -83,8 +81,8 @@ int fpga_config_fn(int assert, int flush, int cookie) > { > volatile immap_t *im = (volatile immap_t *)CFG_IMMR; > volatile gpio83xx_t *gpio = (volatile gpio83xx_t *)&im->gpio[0]; > - > u32 dvo = gpio->dat; > + > fpga_debug("SET config : %s\n", assert ? "low" : "high"); > if (assert) > dvo |= FPGA_CONFIG; > @@ -134,8 +132,8 @@ int fpga_clk_fn(int assert_clk, int flush, int cookie) > { > volatile immap_t *im = (volatile immap_t *)CFG_IMMR; > volatile gpio83xx_t *gpio = (volatile gpio83xx_t *)&im->gpio[0]; > - > u32 dvo = gpio->dat; > + > fpga_debug("CLOCK %s\n", assert_clk ? "high" : "low"); > if (assert_clk) > dvo |= FPGA_CCLK; > @@ -188,4 +186,3 @@ int fpga_wr_fn(void *buf, size_t len, int flush, int cookie) > > return FPGA_SUCCESS; > } > -#endif > diff --git a/board/mvblm7/mvblm7.c b/board/mvblm7/mvblm7.c > index 8f8e299..7e9b71f 100644 > --- a/board/mvblm7/mvblm7.c > +++ b/board/mvblm7/mvblm7.c > @@ -43,15 +43,14 @@ int fixed_sdram(void) > u32 ddr_size_log2; > > msize = CFG_DDR_SIZE; > - for (ddr_size = msize << 20, ddr_size_log2 = 0; > - (ddr_size > 1); > - ddr_size = ddr_size>>1, ddr_size_log2++) { > + for (ddr_size = msize << 20, ddr_size_log2 = 0; ddr_size > 1; > + ddr_size = ddr_size >> 1, ddr_size_log2++) > if (ddr_size & 1) > return -1; > - } > + > im->sysconf.ddrlaw[0].bar = ((CFG_DDR_SDRAM_BASE>>12) & 0xfffff); > im->sysconf.ddrlaw[0].ar = LAWAR_EN | ((ddr_size_log2 - 1) & > - LAWAR_SIZE); > + LAWAR_SIZE); > > im->ddr.csbnds[0].csbnds = CFG_DDR_CS0_BNDS; > im->ddr.cs_config[0] = CFG_DDR_CS0_CONFIG; > @@ -131,5 +130,4 @@ void ft_board_setup(void *blob, bd_t *bd) > ft_pci_setup(blob, bd); > #endif > } > - > #endif > diff --git a/board/mvblm7/pci.c b/board/mvblm7/pci.c > index b6453d0..72123c8 100644 > --- a/board/mvblm7/pci.c > +++ b/board/mvblm7/pci.c > @@ -28,11 +28,14 @@ > #include > #endif > #include > +#include > #include > #include "mvblm7.h" > > DECLARE_GLOBAL_DATA_PTR; > > +extern int mvblm7_init_fpga(void); > + > /* System RAM mapped to PCI space */ > #define CONFIG_PCI_SYS_MEM_BUS CFG_SDRAM_BASE > #define CONFIG_PCI_SYS_MEM_PHYS CFG_SDRAM_BASE > > ------------------------------------------------------------------------- > This SF.net email is sponsored by the 2008 JavaOne(SM) Conference > Don't miss this year's exciting event. There's still time to save $100. > Use priority code J8TL2D2. > http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone > _______________________________________________ > U-Boot-Users mailing list > U-Boot-Users at lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/u-boot-users > MATRIX VISION GmbH, Talstra?e 16, DE-71570 Oppenweiler - Registergericht: Amtsgericht Stuttgart, HRB 271090 Gesch?ftsf?hrer: Gerhard Thullner, Werner Armingeon, Uwe Furtner