Hi,Wolfgang,
Sorry for some unnecessary mistakes I made to bring you in 'hot water'.
* Patch by Sam Song, 06 May 2004: - Add support for RPXlite_DW board - Update FLASH driver for 4*AM29DL323DB90VI - Update SDRAM init for 2*MT48LC16M16A2-75 in 9-column mode - Add option configuration for LCD panel,NL6448BC20-08 - Add option configuration of CFG_ENV_IS_IN_NVRAM on RPXlite_DW board
Attached pls see the patch.All against u-boot-1.1.1.
Best regards,
Sam
====================================================
diff -purN u-boot-1.1.1/CREDITS u-boot-1.1.1-send/CREDITS --- u-boot-1.1.1/CREDITS Fri Apr 16 07:23:39 2004 +++ u-boot-1.1.1-send/CREDITS Thu May 6 14:32:22 2004 @@ -198,6 +198,10 @@ N: Yoo. Jonghoon E: yooth@ipone.co.kr D: Added port to the RPXlite board
+N: Sam Song +E: samsongshu@yahoo.com.cn +D: Port to the RPXlite_DW board + N: Brad Kemp E: Brad.Kemp@seranoa.com D: Port to Windriver ppmc8260 board diff -purN u-boot-1.1.1/MAKEALL u-boot-1.1.1-send/MAKEALL --- u-boot-1.1.1/MAKEALL Mon Apr 19 07:32:11 2004 +++ u-boot-1.1.1-send/MAKEALL Thu May 6 14:58:55 2004 @@ -45,10 +45,11 @@ LIST_8xx=" \ MPC86xADS MVS1 NETVIA NETVIA_V2 \ NX823 pcu_e QS823 QS850 \ QS860T R360MPI RBC823 rmu \ - RPXClassic RPXlite RRvision SM850 \ - SPD823TS svm_sc8xx SXNI855T TOP860 \ - TQM823L TQM823L_LCD TQM850L TQM855L \ - TQM860L v37 NETTA NETPHONE \ + RPXClassic RPXlite RPXlite_DW RRvision \ + SM850 SPD823TS svm_sc8xx SXNI855T \ + TOP860 TQM823L TQM823L_LCD TQM850L \ + TQM855L TQM860L v37 NETTA \ + NETPHONE \ "
######################################################################### diff -purN u-boot-1.1.1/Makefile u-boot-1.1.1-send/Makefile --- u-boot-1.1.1/Makefile Sun Apr 25 07:23:30 2004 +++ u-boot-1.1.1-send/Makefile Tue May 4 22:06:37 2004 @@ -457,6 +457,30 @@ RPXClassic_config: unconfig RPXlite_config: unconfig @./mkconfig $(@:_config=) ppc mpc8xx RPXlite
+RPXlite_DW_64_config \ +RPXlite_DW_LCD_config \ +RPXlite_DW_64_LCD_config \ +RPXlite_DW_FLASH_config \ +RPXlite_DW_FLASH_64_config \ +RPXlite_DW_FLASH_LCD_config \ +RPXlite_DW_FLASH_64_LCD_config \ +RPXlite_DW_config: unconfig + @ >include/config.h + @[ -z "$(findstring _64,$@)" ] || \ + { echo "#define RPXlite_64MHz" >>include/config.h ; \ + echo "... with 64MHz system clock ..."; \ + } + @[ -z "$(findstring _LCD,$@)" ] || \ + { echo "#define CONFIG_LCD"
include/config.h ; \
+ echo "#define CONFIG_NEC_NL6448BC20"
include/config.h ; \
+ echo "... with LCD display ..."; \ + } + @[ -z "$(findstring _FLASH,$@)" ] || \ + { echo "#define CFG_ENV_IS_IN_FLASH"
include/config.h ; \
+ echo "... with ENV in FLASH ..."; \ + } + @./mkconfig -a RPXlite_DW ppc mpc8xx RPXlite_dw + rmu_config: unconfig @./mkconfig $(@:_config=) ppc mpc8xx rmu
diff -purN u-boot-1.1.1/README u-boot-1.1.1-send/README --- u-boot-1.1.1/README Sat Apr 24 04:32:05 2004 +++ u-boot-1.1.1-send/README Thu May 6 15:01:09 2004 @@ -2036,11 +2036,11 @@ configurations; the following names are omap1510inn_config omap1610h2_config omap1610inn_config pcu_e_config PIP405_config QS823_config QS850_config QS860T_config RPXlite_config - RPXsuper_config rsdproto_config Sandpoint8240_config - sbc8260_config SM850_config SPD823TS_config - stxgp3_config SXNI855T_config TQM823L_config - TQM850L_config TQM855L_config TQM860L_config - WALNUT405_config ZPC1900_config + RPXlite_DW_config RPXsuper_config rsdproto_config + Sandpoint8240_config sbc8260_config SM850_config + SPD823TS_config stxgp3_config SXNI855T_config + TQM823L_config TQM850L_config TQM855L_config + TQM860L_config WALNUT405_config ZPC1900_config
Note: for some board special configuration names may exist; check if additional information is available from the board vendor; for diff -purN u-boot-1.1.1/board/RPXlite_dw/Makefile u-boot-1.1.1-send/board/RPXlite_dw/Makefile --- u-boot-1.1.1/board/RPXlite_dw/Makefile Thu Jan 1 08:00:00 1970 +++ u-boot-1.1.1-send/board/RPXlite_dw/Makefile Mon May 3 19:46:19 2004 @@ -0,0 +1,40 @@ +# +# (C) Copyright 2000-2004 +# Wolfgang Denk, DENX Software Engineering, wd@denx.de. +# +# See file CREDITS for list of people who contributed to this +# project. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA +# + +include $(TOPDIR)/config.mk + +LIB = lib$(BOARD).a + +OBJS = $(BOARD).o flash.o + +$(LIB): .depend $(OBJS) + $(AR) crv $@ $(OBJS) + +######################################################################### + +.depend: Makefile $(SOBJS:.o=.S) $(OBJS:.o=.c) + $(CC) -M $(CFLAGS) $(SOBJS:.o=.S) $(OBJS:.o=.c) > $@ + +sinclude .depend + +######################################################################### diff -purN u-boot-1.1.1/board/RPXlite_dw/RPXlite_dw.c u-boot-1.1.1-send/board/RPXlite_dw/RPXlite_dw.c --- u-boot-1.1.1/board/RPXlite_dw/RPXlite_dw.c Thu Jan 1 08:00:00 1970 +++ u-boot-1.1.1-send/board/RPXlite_dw/RPXlite_dw.c Tue May 4 22:01:44 2004 @@ -0,0 +1,189 @@ +/* + * (C) Copyright 2004 + * Sam Song, IEMC. SHU, samsongshu@yahoo.com.cn + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +/* + * Sam Song + * U-Boot port on RPXlite DW board : RPXlite_DW or LITE_DW + * Tested on working at 64MHz(CPU)/32MHz(BUS),48MHz/24MHz + * with 64MB, 2 SDRAM Micron chips,MT48LC16M16A2-75. + */ + +#include <common.h> +#include <mpc8xx.h> + +/* ------------------------------------------------------------------------- */ + +static long int dram_size (long int, long int *, long int); + +/* ------------------------------------------------------------------------- */ + +#define _NOT_USED_ 0xFFFFCC25 + +const uint sdram_table[] = +{ + /* + * Single Read. (Offset 00h in UPMA RAM) + */ + 0x0F03CC04, 0x00ACCC24, 0x1FF74C20, /* last */ + _NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_, + _NOT_USED_, + + /* + * Burst Read. (Offset 08h in UPMA RAM) + */ + 0x0F03CC04, 0x00ACCC24, 0x00FFCC20, 0x00FFCC20, + 0x01FFCC20, 0x1FF74C20, /* last */ + _NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_, + _NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_, + _NOT_USED_, _NOT_USED_, + + /* + * Single Write. (Offset 18h in UPMA RAM) + */ + 0x0F03CC02, 0x00AC0C24, 0x1FF74C25, /* last */ + _NOT_USED_, _NOT_USED_, 0x0FA00C34,0x0FFFCC35, + _NOT_USED_, + + /* + * Burst Write. (Offset 20h in UPMA RAM) + */ + 0x0F03CC00, 0x00AC0C20, 0x00FFFC20, 0x00FFFC22, + 0x01FFFC24, 0x1FF74C25, /* last */ + _NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_, + _NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_, + _NOT_USED_, _NOT_USED_, + + /* + * Refresh. (Offset 30h in UPMA RAM) + */ + 0x0FF0CC24, 0xFFFFCC24, _NOT_USED_, _NOT_USED_, + _NOT_USED_, _NOT_USED_, 0xEFFB8C34, 0x0FF74C34, + 0x0FFACCB4, 0x0FF5CC34, 0x0FFFCC34, 0x0FFFCCB4, + /* INIT sequence RAM WORDS + * SDRAM Initialization (offset 0x36 in UPMA RAM) + * The above definition uses the remaining space + * to establish an initialization sequence, + * which is executed by a RUN command. + * The sequence is COMMAND INHIBIT(NOP),Precharge, + * Load Mode Register,NOP,Auto Refresh. + * **[Sam]** + */ + + /* + * Exception. (Offset 3Ch in UPMA RAM) + */ + 0x0FEA8C34, 0x1FB54C34, 0xFFFFCC34, _NOT_USED_ +}; + +/* + * Check Board Identity: + */ + +int checkboard (void) +{ + puts ("Board: RPXlite_DW\n") ; + return (0) ; +} + +/* ------------------------------------------------------------------------- */ + +long int initdram (int board_type) +{ + volatile immap_t *immap = (immap_t *)CFG_IMMR; + volatile memctl8xx_t *memctl = &immap->im_memctl; + long int size9; + + upmconfig(UPMA, (uint *)sdram_table, sizeof(sdram_table)/sizeof(uint)); + + /* Refresh clock prescalar */ + memctl->memc_mptpr = CFG_MPTPR ; + + memctl->memc_mar = 0x00000088; + + /* Map controller banks 1 to the SDRAM bank */ + memctl->memc_or1 = CFG_OR1_PRELIM; + memctl->memc_br1 = CFG_BR1_PRELIM; + + memctl->memc_mamr = CFG_MAMR_9COL & (~(MAMR_PTAE)); /* no refresh yet */ + /*Disable Periodic timer A. */ + + udelay(200); + + /* perform SDRAM initializsation sequence */ + + memctl->memc_mcr = 0x80002236; /* SDRAM bank 0 - refresh twice */ + + udelay(1); + + memctl->memc_mamr |= MAMR_PTAE; /* enable refresh */ + + /*Enable Periodic timer A */ + + udelay (1000); + + /* Check Bank 0 Memory Size + * try 9 column mode + */ + + size9 = dram_size (CFG_MAMR_9COL, (ulong *)SDRAM_BASE_PRELIM, SDRAM_MAX_SIZE); + + /* + * Final mapping: + */ + + memctl->memc_or1 = ((-size9) & 0xFFFF0000) | CFG_OR_TIMING_SDRAM; + + udelay (1000); + + return (size9); +} + +void rpxlite_init (void) +{ + /* Enable NVRAM */ + *((uchar *) BCSR0) |= BCSR0_ENNVRAM; +} + +/* ------------------------------------------------------------------------- */ + +/* + * Check memory range for valid RAM. A simple memory test determines + * the actually available RAM size between addresses `base' and + * `base + maxsize'. Some (not all) hardware errors are detected: + * - short between address lines + * - short between data lines + */ + + + +static long int dram_size (long int mamr_value, long int *base, + long int maxsize) +{ + volatile immap_t *immap = (immap_t *) CFG_IMMR; + volatile memctl8xx_t *memctl = &immap->im_memctl; + + memctl->memc_mamr = mamr_value; + + return (get_ram_size (base, maxsize)); + +} diff -purN u-boot-1.1.1/board/RPXlite_dw/config.mk u-boot-1.1.1-send/board/RPXlite_dw/config.mk --- u-boot-1.1.1/board/RPXlite_dw/config.mk Thu Jan 1 08:00:00 1970 +++ u-boot-1.1.1-send/board/RPXlite_dw/config.mk Mon May 3 19:46:19 2004 @@ -0,0 +1,29 @@ +# +# (C) Copyright 2004 +# Wolfgang Denk, DENX Software Engineering, wd@denx.de. +# Sam Song, IEMC. SHU, samsongshu@yahoo.com.cn +# +# See file CREDITS for list of people who contributed to this +# project. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA +# + +# +# RPXlite dw boards : lite_dw +# + +TEXT_BASE = 0xff000000
_________________________________________________________ Do You Yahoo!? 嫌邮箱太小？雅虎电邮自助扩容！ http://cn.rd.yahoo.com/mail_cn/tag/10m/*http://cn.mail.yahoo.com/event/10m.h...