mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-08-16 04:07:00 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-mips

Browse Source
This commit is contained in:
Wolfgang Denk 2011-02-12 20:37:47 +01:00
commit c65715de78
9 changed files with 39 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
Makefile
View File

@ -1091,95 +1091,6 @@ smdk6400_config : unconfig
@$(MKCONFIG) smdk6400 arm arm1176 smdk6400 samsung s3c64xx @$(MKCONFIG) smdk6400 arm arm1176 smdk6400 samsung s3c64xx
@echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
#========================================================================
# MIPS
#========================================================================
#########################################################################
## MIPS32 4Kc
#########################################################################
incaip_100MHz_config \
incaip_133MHz_config \
incaip_150MHz_config \
incaip_config: unconfig
@mkdir -p $(obj)include
@[ -z "$(findstring _100MHz,$@)" ] || \
echo "#define CPU_CLOCK_RATE 100000000" >>$(obj)include/config.h
@[ -z "$(findstring _133MHz,$@)" ] || \
echo "#define CPU_CLOCK_RATE 133000000" >>$(obj)include/config.h
@[ -z "$(findstring _150MHz,$@)" ] || \
echo "#define CPU_CLOCK_RATE 150000000" >>$(obj)include/config.h
@$(MKCONFIG) -n $@ -a incaip mips mips incaip
vct_premium_config \
vct_premium_small_config \
vct_premium_onenand_config \
vct_premium_onenand_small_config \
vct_platinum_config \
vct_platinum_small_config \
vct_platinum_onenand_config \
vct_platinum_onenand_small_config \
vct_platinumavc_config \
vct_platinumavc_small_config \
vct_platinumavc_onenand_config \
vct_platinumavc_onenand_small_config: unconfig
@mkdir -p $(obj)include
@[ -z "$(findstring _premium,$@)" ] || \
echo "#define CONFIG_VCT_PREMIUM" > $(obj)include/config.h
@[ -z "$(findstring _platinum_,$@)" ] || \
echo "#define CONFIG_VCT_PLATINUM" > $(obj)include/config.h
@[ -z "$(findstring _platinumavc,$@)" ] || \
echo "#define CONFIG_VCT_PLATINUMAVC" > $(obj)include/config.h
@[ -z "$(findstring _onenand,$@)" ] || \
echo "#define CONFIG_VCT_ONENAND" >> $(obj)include/config.h
@[ -z "$(findstring _small,$@)" ] || \
echo "#define CONFIG_VCT_SMALL_IMAGE" >> $(obj)include/config.h
@$(MKCONFIG) -n $@ -a vct mips mips vct micronas
#########################################################################
## MIPS32 AU1X00
#########################################################################
dbau1000_config : unconfig
@mkdir -p $(obj)include
@echo "#define CONFIG_DBAU1000 1" >$(obj)include/config.h
@$(MKCONFIG) -a dbau1x00 mips mips dbau1x00
dbau1100_config : unconfig
@mkdir -p $(obj)include
@echo "#define CONFIG_DBAU1100 1" >$(obj)include/config.h
@$(MKCONFIG) -a dbau1x00 mips mips dbau1x00
dbau1500_config : unconfig
@mkdir -p $(obj)include
@echo "#define CONFIG_DBAU1500 1" >$(obj)include/config.h
@$(MKCONFIG) -a dbau1x00 mips mips dbau1x00
dbau1550_config : unconfig
@mkdir -p $(obj)include
@echo "#define CONFIG_DBAU1550 1" >$(obj)include/config.h
@$(MKCONFIG) -a dbau1x00 mips mips dbau1x00
dbau1550_el_config : unconfig
@mkdir -p $(obj)include
@echo "#define CONFIG_DBAU1550 1" >$(obj)include/config.h
@$(MKCONFIG) -a dbau1x00 mips mips dbau1x00
gth2_config : unconfig
@mkdir -p $(obj)include
@echo "#define CONFIG_GTH2 1" >$(obj)include/config.h
@$(MKCONFIG) -a $@ mips mips gth2
pb1000_config : unconfig
@mkdir -p $(obj)include
@echo "#define CONFIG_PB1000 1" >$(obj)include/config.h
@$(MKCONFIG) -a pb1x00 mips mips pb1x00
qemu_mips_config : unconfig
@mkdir -p $(obj)include
@echo "#define CONFIG_QEMU_MIPS 1" >$(obj)include/config.h
@$(MKCONFIG) -a qemu-mips mips mips qemu-mips
#======================================================================== #========================================================================
# Nios # Nios
#======================================================================== #========================================================================

2
board/dbau1x00/Makefile
View File

@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(BOARD).o LIB = $(obj)lib$(BOARD).o
COBJS = $(BOARD).o flash.o COBJS = $(BOARD).o
SOBJS = lowlevel_init.o SOBJS = lowlevel_init.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)

43
board/dbau1x00/flash.c
View File

@ -1,43 +0,0 @@
/*
* (C) Copyright 2003
* 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 <common.h>
flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS]; /* info for FLASH chips */
/*-----------------------------------------------------------------------
* flash_init()
*
* sets up flash_info and returns size of FLASH (bytes)
*/
unsigned long flash_init (void)
{
printf ("Skipping flash_init\n");
return (0);
}
int write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cnt)
{
printf ("write_buff not implemented\n");
return (-1);
}

2
board/incaip/lowlevel_init.S
View File

@ -283,7 +283,7 @@ lowlevel_init:
/* EBU, CGU and SDRAM Initialization. /* EBU, CGU and SDRAM Initialization.
*/ */
li a0, CPU_CLOCK_RATE li a0, CONFIG_CPU_CLOCK_RATE
move t0, ra move t0, ra
/* We rely on the fact that neither ebu_init() nor cgu_init() nor sdram_init() /* We rely on the fact that neither ebu_init() nor cgu_init() nor sdram_init()

5
board/purple/u-boot.lds
View File

@ -36,11 +36,6 @@ SECTIONS
{ {
arch/mips/cpu/start.o (.text) arch/mips/cpu/start.o (.text)
board/purple/lowlevel_init.o (.text) board/purple/lowlevel_init.o (.text)
arch/mips/cpu/cache.o (.text)
common/main.o (.text)
common/dlmalloc.o (.text)
common/cmd_boot.o (.text)
lib/zlib.o (.text)
. = DEFINED(env_offset) ? env_offset : .; . = DEFINED(env_offset) ? env_offset : .;
common/env_embedded.o (.ppcenv) common/env_embedded.o (.ppcenv)

24
boards.cfg
View File

@ -214,8 +214,32 @@ M5282EVB m68k mcf52x2 m5282evb freesca
M53017EVB m68k mcf52x2 m53017evb freescale M53017EVB m68k mcf52x2 m53017evb freescale
EP2500 m68k mcf52x2 ep2500 Mercury EP2500 m68k mcf52x2 ep2500 Mercury
microblaze-generic microblaze microblaze microblaze-generic xilinx microblaze-generic microblaze microblaze microblaze-generic xilinx
dbau1000 mips mips dbau1x00 - - dbau1x00:DBAU1000
dbau1100 mips mips dbau1x00 - - dbau1x00:DBAU1100
dbau1500 mips mips dbau1x00 - - dbau1x00:DBAU1500
dbau1550 mips mips dbau1x00 - - dbau1x00:DBAU1550
dbau1550_el mips mips dbau1x00 - - dbau1x00:DBAU1550
gth2 mips mips
incaip mips mips
incaip_100MHz mips mips incaip - - incaip:CPU_CLOCK_RATE=100000000
incaip_133MHz mips mips incaip - - incaip:CPU_CLOCK_RATE=133000000
incaip_150MHz mips mips incaip - - incaip:CPU_CLOCK_RATE=150000000
pb1000 mips mips pb1x00 - - pb1x00:PB1000
purple mips mips purple mips mips
qemu_mips mips mips qemu-mips - - qemu-mips
tb0229 mips mips tb0229 mips mips
vct_premium mips mips vct micronas - vct:VCT_PREMIUM
vct_premium_small mips mips vct micronas - vct:VCT_PREMIUM,VCT_SMALL_IMAGE
vct_premium_onenand mips mips vct micronas - vct:VCT_PREMIUM,VCT_ONENAND
vct_premium_onenand_small mips mips vct micronas - vct:VCT_PREMIUM,VCT_ONENAND,VCT_SMALL_IMAGE
vct_platinum mips mips vct micronas - vct:VCT_PLATINUM
vct_platinum_small mips mips vct micronas - vct:VCT_PLATINUM,VCT_SMALL_IMAGE
vct_platinum_onenand mips mips vct micronas - vct:VCT_PLATINUM,VCT_ONENAND
vct_platinum_onenand_small mips mips vct micronas - vct:VCT_PLATINUM,VCT_ONENAND,VCT_SMALL_IMAGE
vct_platinumavc mips mips vct micronas - vct:VCT_PLATINUMAVC
vct_platinumavc_small mips mips vct micronas - vct:VCT_PLATINUMAVC,VCT_SMALL_IMAGE
vct_platinumavc_onenand mips mips vct micronas - vct:VCT_PLATINUMAVC,VCT_ONENAND
vct_platinumavc_onenand_small mips mips vct micronas - vct:VCT_PLATINUMAVC,VCT_ONENAND,VCT_SMALL_IMAGE
PCI5441 nios2 nios2 pci5441 psyent PCI5441 nios2 nios2 pci5441 psyent
PK1C20 nios2 nios2 pk1c20 psyent PK1C20 nios2 nios2 pk1c20 psyent
EVB64260 powerpc 74xx_7xx evb64260 - - EVB64260 EVB64260 powerpc 74xx_7xx evb64260 - - EVB64260

3
common/cmd_ide.c
View File

@ -811,7 +811,8 @@ set_pcmcia_timing (int pmode)
/* We only need to swap data if we are running on a big endian cpu. */ /* We only need to swap data if we are running on a big endian cpu. */
/* But Au1x00 cpu:s already swaps data in big endian mode! */ /* But Au1x00 cpu:s already swaps data in big endian mode! */
#if defined(__LITTLE_ENDIAN) || ( defined(CONFIG_AU1X00) && !defined(CONFIG_GTH2) ) #if defined(__LITTLE_ENDIAN) || \
(defined(CONFIG_SOC_AU1X00) && !defined(CONFIG_GTH2))
#define input_swap_data(x,y,z) input_data(x,y,z) #define input_swap_data(x,y,z) input_data(x,y,z)
#else #else
static void static void

9
include/configs/incaip.h
View File

@ -31,9 +31,12 @@
#define CONFIG_MIPS32 1 /* MIPS 4Kc CPU core */ #define CONFIG_MIPS32 1 /* MIPS 4Kc CPU core */
#define CONFIG_INCA_IP 1 /* on a INCA-IP Board */ #define CONFIG_INCA_IP 1 /* on a INCA-IP Board */
#ifndef CPU_CLOCK_RATE /*
/* allowed values: 100000000, 133000000, and 150000000 */ * Clock for the MIPS core (MHz)
#define CPU_CLOCK_RATE 150000000 /* default: 150 MHz clock for the MIPS core */ * allowed values: 100000000, 133000000, and 150000000 (default)
*/
#ifndef CONFIG_CPU_CLOCK_RATE
#define CONFIG_CPU_CLOCK_RATE 150000000
#endif #endif
#define INFINEON_EBU_BOOTCFG 0x40C4 /* CMULT = 8 */ #define INFINEON_EBU_BOOTCFG 0x40C4 /* CMULT = 8 */

7
include/configs/vct.h
View File

@ -109,17 +109,20 @@
/* /*
* Only Premium/Platinum have ethernet support right now * Only Premium/Platinum have ethernet support right now
*/ */
#if defined(CONFIG_VCT_PREMIUM) || defined(CONFIG_VCT_PLATINUM) #if (defined(CONFIG_VCT_PREMIUM) || defined(CONFIG_VCT_PLATINUM)) && \
!defined(CONFIG_VCT_SMALL_IMAGE)
#define CONFIG_CMD_PING #define CONFIG_CMD_PING
#define CONFIG_CMD_SNTP #define CONFIG_CMD_SNTP
#else #else
#undef CONFIG_CMD_NET #undef CONFIG_CMD_NET
#undef CONFIG_CMD_NFS
#endif #endif
/* /*
* Only Premium/Platinum have USB-EHCI support right now * Only Premium/Platinum have USB-EHCI support right now
*/ */
#if defined(CONFIG_VCT_PREMIUM) || defined(CONFIG_VCT_PLATINUM) #if (defined(CONFIG_VCT_PREMIUM) || defined(CONFIG_VCT_PLATINUM)) && \
!defined(CONFIG_VCT_SMALL_IMAGE)
#define CONFIG_CMD_USB #define CONFIG_CMD_USB
#define CONFIG_CMD_FAT #define CONFIG_CMD_FAT
#endif #endif