mirror of
https://github.com/u-boot/u-boot.git
synced 2024-11-24 12:44:23 +08:00
Merge branch 'master' of /home/stefan/git/u-boot/u-boot
This commit is contained in:
Stefan Roese
commit
218892d12a
71
Makefile
71
Makefile
@ -12,7 +12,7 @@
|
||||
#
|
||||
# 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
|
||||
# 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
|
||||
@ -598,7 +598,7 @@ prs200_highboot_DDR_config: unconfig
|
||||
$(XECHO) "... with console on COM12" ; \
|
||||
}
|
||||
@[ -z "$(findstring prs200,$@)" ] || \
|
||||
{ echo "#define CONFIG_PRS200" >>$(obj)include/config.h ;\
|
||||
{ echo "#define CONFIG_PRS200" >>$(obj)include/config.h ;\
|
||||
}
|
||||
@$(MKCONFIG) -n $@ -a mcc200 ppc mpc5xxx mcc200
|
||||
|
||||
@ -611,7 +611,7 @@ munices_config: unconfig
|
||||
o2dnt_config: unconfig
|
||||
@$(MKCONFIG) o2dnt ppc mpc5xxx o2dnt
|
||||
|
||||
pf5200_config: unconfig
|
||||
pf5200_config: unconfig
|
||||
@$(MKCONFIG) pf5200 ppc mpc5xxx pf5200 esd
|
||||
|
||||
PM520_config \
|
||||
@ -755,9 +755,9 @@ ads5121_PCI_config \
|
||||
## MPC8xx Systems
|
||||
#########################################################################
|
||||
|
||||
Adder_config \
|
||||
Adder_config \
|
||||
Adder87x_config \
|
||||
AdderII_config \
|
||||
AdderII_config \
|
||||
: unconfig
|
||||
@mkdir -p $(obj)include
|
||||
$(if $(findstring AdderII,$@), \
|
||||
@ -767,8 +767,8 @@ AdderII_config \
|
||||
AdderUSB_config: unconfig
|
||||
@$(MKCONFIG) -a AdderUSB ppc mpc8xx adder
|
||||
|
||||
ADS860_config \
|
||||
FADS823_config \
|
||||
ADS860_config \
|
||||
FADS823_config \
|
||||
FADS850SAR_config \
|
||||
MPC86xADS_config \
|
||||
MPC885ADS_config \
|
||||
@ -879,7 +879,7 @@ IVMS8_config: unconfig
|
||||
KUP4K_config : unconfig
|
||||
@$(MKCONFIG) $(@:_config=) ppc mpc8xx kup4k kup
|
||||
|
||||
KUP4X_config : unconfig
|
||||
KUP4X_config : unconfig
|
||||
@$(MKCONFIG) $(@:_config=) ppc mpc8xx kup4x kup
|
||||
|
||||
LANTEC_config : unconfig
|
||||
@ -1028,9 +1028,9 @@ RPXlite_DW_64_config \
|
||||
RPXlite_DW_LCD_config \
|
||||
RPXlite_DW_64_LCD_config \
|
||||
RPXlite_DW_NVRAM_config \
|
||||
RPXlite_DW_NVRAM_64_config \
|
||||
RPXlite_DW_NVRAM_64_config \
|
||||
RPXlite_DW_NVRAM_LCD_config \
|
||||
RPXlite_DW_NVRAM_64_LCD_config \
|
||||
RPXlite_DW_NVRAM_64_LCD_config \
|
||||
RPXlite_DW_config: unconfig
|
||||
@mkdir -p $(obj)include
|
||||
@ >$(obj)include/config.h
|
||||
@ -2012,7 +2012,7 @@ MPC832XEMDS_ATM_config: unconfig
|
||||
if [ "$(findstring _ATM_,$@)" ] ; then \
|
||||
$(XECHO) -n "...ATM..." ; \
|
||||
echo "#define CONFIG_PQ_MDS_PIB 1" >>$(obj)include/config.h ; \
|
||||
echo "#define CONFIG_PQ_MDS_PIB_ATM 1" >>$(obj)include/config.h ; \
|
||||
echo "#define CONFIG_PQ_MDS_PIB_ATM 1" >>$(obj)include/config.h ; \
|
||||
fi ;
|
||||
@$(MKCONFIG) -a MPC832XEMDS ppc mpc83xx mpc832xemds freescale
|
||||
|
||||
@ -2062,7 +2062,7 @@ MPC8360EMDS_ATM_config: unconfig
|
||||
if [ "$(findstring _ATM_,$@)" ] ; then \
|
||||
$(XECHO) -n "...ATM..." ; \
|
||||
echo "#define CONFIG_PQ_MDS_PIB 1" >>$(obj)include/config.h ; \
|
||||
echo "#define CONFIG_PQ_MDS_PIB_ATM 1" >>$(obj)include/config.h ; \
|
||||
echo "#define CONFIG_PQ_MDS_PIB_ATM 1" >>$(obj)include/config.h ; \
|
||||
fi ;
|
||||
@$(MKCONFIG) -a MPC8360EMDS ppc mpc83xx mpc8360emds freescale
|
||||
|
||||
@ -2111,7 +2111,7 @@ MPC8540EVAL_config \
|
||||
MPC8540EVAL_33_config \
|
||||
MPC8540EVAL_66_config \
|
||||
MPC8540EVAL_33_slave_config \
|
||||
MPC8540EVAL_66_slave_config: unconfig
|
||||
MPC8540EVAL_66_slave_config: unconfig
|
||||
@mkdir -p $(obj)include
|
||||
@echo "" >$(obj)include/config.h ; \
|
||||
if [ "$(findstring _33_,$@)" ] ; then \
|
||||
@ -2191,7 +2191,7 @@ sbc8548_config: unconfig
|
||||
|
||||
sbc8560_config \
|
||||
sbc8560_33_config \
|
||||
sbc8560_66_config: unconfig
|
||||
sbc8560_66_config: unconfig
|
||||
@mkdir -p $(obj)include
|
||||
@if [ "$(findstring _66_,$@)" ] ; then \
|
||||
echo "#define CONFIG_PCI_66" >>$(obj)include/config.h ; \
|
||||
@ -2587,10 +2587,10 @@ logodl_config : unconfig
|
||||
@$(MKCONFIG) $(@:_config=) arm pxa logodl
|
||||
|
||||
pdnb3_config \
|
||||
scpu_config: unconfig
|
||||
scpu_config: unconfig
|
||||
@mkdir -p $(obj)include
|
||||
@if [ "$(findstring scpu_,$@)" ] ; then \
|
||||
echo "#define CONFIG_SCPU" >>$(obj)include/config.h ; \
|
||||
echo "#define CONFIG_SCPU" >>$(obj)include/config.h ; \
|
||||
$(XECHO) "... on SCPU board variant" ; \
|
||||
else \
|
||||
>$(obj)include/config.h ; \
|
||||
@ -2893,7 +2893,7 @@ ms7750se_config: unconfig
|
||||
@echo "#define CONFIG_MS7750SE 1" >> $(obj)include/config.h
|
||||
@$(MKCONFIG) -a $(@:_config=) sh sh4 ms7750se
|
||||
|
||||
ms7722se_config : unconfig
|
||||
ms7722se_config : unconfig
|
||||
@ >$(obj)include/config.h
|
||||
@echo "#define CONFIG_MS7722SE 1" >> $(obj)include/config.h
|
||||
@$(MKCONFIG) -a $(@:_config=) sh sh4 ms7722se
|
||||
@ -2903,25 +2903,30 @@ ms7722se_config : unconfig
|
||||
#########################################################################
|
||||
|
||||
clean:
|
||||
@rm -f $(obj)examples/82559_eeprom $(obj)examples/eepro100_eeprom \
|
||||
$(obj)examples/hello_world $(obj)examples/interrupt \
|
||||
$(obj)examples/mem_to_mem_idma2intr \
|
||||
$(obj)examples/sched $(obj)examples/smc91111_eeprom \
|
||||
$(obj)examples/test_burst $(obj)examples/timer
|
||||
@rm -f $(obj)tools/bmp_logo $(obj)tools/easylogo/easylogo \
|
||||
$(obj)tools/env/{fw_printenv,fw_setenv} \
|
||||
$(obj)tools/envcrc \
|
||||
$(obj)tools/gdb/{astest,gdbcont,gdbsend} \
|
||||
$(obj)tools/gen_eth_addr $(obj)tools/img2srec \
|
||||
$(obj)tools/mkimage $(obj)tools/mpc86x_clk \
|
||||
$(obj)tools/ncb $(obj)tools/ubsha1
|
||||
@rm -f $(obj)board/cray/L1/{bootscript.c,bootscript.image} \
|
||||
$(obj)board/netstar/{eeprom,crcek,crcit,*.srec,*.bin} \
|
||||
$(obj)board/trab/trab_fkt $(obj)board/voiceblue/eeprom \
|
||||
$(obj)board/{integratorap,integratorcp}/u-boot.lds \
|
||||
$(obj)board/{bf533-ezkit,bf533-stamp,bf537-stamp,bf561-ezkit}/u-boot.lds
|
||||
@rm -f $(obj)include/bmp_logo.h $(obj)nand_spl/{u-boot-spl,u-boot-spl.map}
|
||||
@rm -f $(obj)onenand_ipl/onenand-{ipl,ipl.bin,ipl-2k.bin,ipl.map}
|
||||
@rm -f $(obj)api_examples/demo $(VERSION_FILE)
|
||||
@find $(OBJTREE) -type f \
|
||||
\( -name 'core' -o -name '*.bak' -o -name '*~' \
|
||||
-o -name '*.o' -o -name '*.a' \) -print \
|
||||
-o -name '*.o' -o -name '*.a' \) -print \
|
||||
| xargs rm -f
|
||||
@cd $(obj)examples/ && rm -f hello_world timer eepro100_eeprom sched \
|
||||
mem_to_mem_idma2intr 82559_eeprom smc91111_eeprom interrupt \
|
||||
test_burst
|
||||
@cd $(obj)tools/ && rm -f bmp_logo easylogo/easylogo \
|
||||
env/{fw_printenv,fw_setenv} envcrc gdb/{astest,gdbcont,gdbsend} \
|
||||
gen_eth_addr img2srec mkimage mpc86x_clk ncb ubsha1
|
||||
@cd $(obj)board/ && rm -f cray/L1/{bootscript.c,bootscript.image} \
|
||||
netstar/{eeprom,crcek,crcit,*.srec,*.bin} \
|
||||
trab/trab_fkt voiceblue/eeprom \
|
||||
{integratorap,integratorcp}/u-boot.lds integratorcp/u-boot.lds \
|
||||
{bf533-ezkit,bf533-stamp,bf537-stamp,bf561-ezkit}/u-boot.lds
|
||||
@rm -f $(obj)include/bmp_logo.h $(obj)nand_spl/{u-boot-spl,u-boot-spl.map}
|
||||
@cd $(obj)onenand_ipl/ && rm -f onenand-ipl onenand-ipl.bin \
|
||||
onenand-ipl-2k.bin onenand-ipl.map
|
||||
@rm -f $(obj)api_examples/demo $(VERSION_FILE)
|
||||
|
||||
clobber: clean
|
||||
@find $(OBJTREE) -type f \( -name .depend \
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
#include <asm/immap_85xx.h>
|
||||
#include <asm/immap_fsl_pci.h>
|
||||
#include <asm/io.h>
|
||||
#include <spd.h>
|
||||
#include <spd_sdram.h>
|
||||
#include <miiphy.h>
|
||||
#include <libfdt.h>
|
||||
#include <fdt_support.h>
|
||||
@ -39,7 +39,6 @@
|
||||
extern void ddr_enable_ecc(unsigned int dram_size);
|
||||
#endif
|
||||
|
||||
extern long int spd_sdram(void);
|
||||
long int fixed_sdram(void);
|
||||
|
||||
int board_early_init_f (void)
|
||||
|
||||
@ -13,18 +13,13 @@
|
||||
#include <ioports.h>
|
||||
#include <mpc83xx.h>
|
||||
#include <i2c.h>
|
||||
#include <spd.h>
|
||||
#include <miiphy.h>
|
||||
#include <command.h>
|
||||
#include <libfdt.h>
|
||||
#if defined(CONFIG_PCI)
|
||||
#include <pci.h>
|
||||
#endif
|
||||
#if defined(CONFIG_SPD_EEPROM)
|
||||
#include <spd_sdram.h>
|
||||
#else
|
||||
#include <asm/mmu.h>
|
||||
#endif
|
||||
|
||||
const qe_iop_conf_t qe_iop_conf_tab[] = {
|
||||
/* UCC3 */
|
||||
|
||||
@ -16,17 +16,12 @@
|
||||
#include <ioports.h>
|
||||
#include <mpc83xx.h>
|
||||
#include <i2c.h>
|
||||
#include <spd.h>
|
||||
#include <miiphy.h>
|
||||
#include <command.h>
|
||||
#if defined(CONFIG_PCI)
|
||||
#include <pci.h>
|
||||
#endif
|
||||
#if defined(CONFIG_SPD_EEPROM)
|
||||
#include <spd_sdram.h>
|
||||
#else
|
||||
#include <asm/mmu.h>
|
||||
#endif
|
||||
#if defined(CONFIG_OF_LIBFDT)
|
||||
#include <libfdt.h>
|
||||
#endif
|
||||
|
||||
@ -28,11 +28,9 @@
|
||||
#include <asm/mpc8349_pci.h>
|
||||
#include <i2c.h>
|
||||
#include <spi.h>
|
||||
#include <spd.h>
|
||||
#include <miiphy.h>
|
||||
#if defined(CONFIG_SPD_EEPROM)
|
||||
#include <spd_sdram.h>
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_OF_LIBFDT)
|
||||
#include <libfdt.h>
|
||||
#endif
|
||||
|
||||
@ -24,19 +24,13 @@
|
||||
#include <ioports.h>
|
||||
#include <mpc83xx.h>
|
||||
#include <i2c.h>
|
||||
#include <spd.h>
|
||||
#include <miiphy.h>
|
||||
|
||||
#ifdef CONFIG_PCI
|
||||
#include <asm/mpc8349_pci.h>
|
||||
#include <pci.h>
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_SPD_EEPROM
|
||||
#include <spd_sdram.h>
|
||||
#else
|
||||
#include <asm/mmu.h>
|
||||
#endif
|
||||
#if defined(CONFIG_OF_LIBFDT)
|
||||
#include <libfdt.h>
|
||||
#endif
|
||||
|
||||
@ -15,16 +15,12 @@
|
||||
#include <ioports.h>
|
||||
#include <mpc83xx.h>
|
||||
#include <i2c.h>
|
||||
#include <spd.h>
|
||||
#include <miiphy.h>
|
||||
#if defined(CONFIG_PCI)
|
||||
#include <pci.h>
|
||||
#endif
|
||||
#if defined(CONFIG_SPD_EEPROM)
|
||||
#include <spd_sdram.h>
|
||||
#else
|
||||
#include <asm/mmu.h>
|
||||
#endif
|
||||
#if defined(CONFIG_OF_LIBFDT)
|
||||
#include <libfdt.h>
|
||||
#endif
|
||||
|
||||
@ -18,7 +18,6 @@
|
||||
#include <ioports.h>
|
||||
#include <mpc83xx.h>
|
||||
#include <i2c.h>
|
||||
#include <spd.h>
|
||||
#include <miiphy.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/mmu.h>
|
||||
|
||||
@ -12,10 +12,7 @@
|
||||
|
||||
#include <common.h>
|
||||
#include <i2c.h>
|
||||
#include <spd.h>
|
||||
#if defined(CONFIG_SPD_EEPROM)
|
||||
#include <spd_sdram.h>
|
||||
#endif
|
||||
#if defined(CONFIG_OF_LIBFDT)
|
||||
#include <libfdt.h>
|
||||
#endif
|
||||
|
||||
@ -14,11 +14,8 @@
|
||||
|
||||
#include <common.h>
|
||||
#include <i2c.h>
|
||||
#include <spd.h>
|
||||
#include <asm/io.h>
|
||||
#if defined(CONFIG_SPD_EEPROM)
|
||||
#include <spd_sdram.h>
|
||||
#endif
|
||||
|
||||
#if defined(CFG_DRAM_TEST)
|
||||
int
|
||||
|
||||
@ -29,7 +29,7 @@
|
||||
#include <pci.h>
|
||||
#include <asm/processor.h>
|
||||
#include <asm/immap_85xx.h>
|
||||
#include <spd.h>
|
||||
#include <spd_sdram.h>
|
||||
#include <libfdt.h>
|
||||
#include <fdt_support.h>
|
||||
|
||||
@ -37,8 +37,6 @@
|
||||
extern void ddr_enable_ecc(unsigned int dram_size);
|
||||
#endif
|
||||
|
||||
extern long int spd_sdram(void);
|
||||
|
||||
void local_bus_init(void);
|
||||
void sdram_init(void);
|
||||
long int fixed_sdram(void);
|
||||
@ -73,7 +71,6 @@ long int
|
||||
initdram(int board_type)
|
||||
{
|
||||
long dram_size = 0;
|
||||
extern long spd_sdram (void);
|
||||
|
||||
puts("Initializing\n");
|
||||
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
#include <asm/processor.h>
|
||||
#include <asm/immap_85xx.h>
|
||||
#include <ioports.h>
|
||||
#include <spd.h>
|
||||
#include <spd_sdram.h>
|
||||
#include <libfdt.h>
|
||||
#include <fdt_support.h>
|
||||
|
||||
@ -39,8 +39,6 @@
|
||||
extern void ddr_enable_ecc(unsigned int dram_size);
|
||||
#endif
|
||||
|
||||
extern long int spd_sdram(void);
|
||||
|
||||
void local_bus_init(void);
|
||||
void sdram_init(void);
|
||||
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
#include <asm/immap_85xx.h>
|
||||
#include <asm/immap_fsl_pci.h>
|
||||
#include <asm/io.h>
|
||||
#include <spd.h>
|
||||
#include <spd_sdram.h>
|
||||
#include <miiphy.h>
|
||||
#include <libfdt.h>
|
||||
#include <fdt_support.h>
|
||||
@ -38,8 +38,6 @@
|
||||
extern void ddr_enable_ecc(unsigned int dram_size);
|
||||
#endif
|
||||
|
||||
extern long int spd_sdram(void);
|
||||
|
||||
void sdram_init(void);
|
||||
|
||||
int board_early_init_f (void)
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
#include <asm/processor.h>
|
||||
#include <asm/immap_85xx.h>
|
||||
#include <asm/immap_fsl_pci.h>
|
||||
#include <spd.h>
|
||||
#include <spd_sdram.h>
|
||||
#include <miiphy.h>
|
||||
#include <libfdt.h>
|
||||
#include <fdt_support.h>
|
||||
@ -42,8 +42,6 @@ extern void ddr_enable_ecc(unsigned int dram_size);
|
||||
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
||||
extern long int spd_sdram(void);
|
||||
|
||||
void local_bus_init(void);
|
||||
void sdram_init(void);
|
||||
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
#include <asm/processor.h>
|
||||
#include <asm/immap_85xx.h>
|
||||
#include <ioports.h>
|
||||
#include <spd.h>
|
||||
#include <spd_sdram.h>
|
||||
#include <libfdt.h>
|
||||
#include <fdt_support.h>
|
||||
|
||||
@ -37,8 +37,6 @@
|
||||
extern void ddr_enable_ecc(unsigned int dram_size);
|
||||
#endif
|
||||
|
||||
extern long int spd_sdram(void);
|
||||
|
||||
void local_bus_init(void);
|
||||
void sdram_init(void);
|
||||
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
#include <asm/processor.h>
|
||||
#include <asm/immap_85xx.h>
|
||||
#include <ioports.h>
|
||||
#include <spd.h>
|
||||
#include <spd_sdram.h>
|
||||
#include <miiphy.h>
|
||||
#include <libfdt.h>
|
||||
#include <fdt_support.h>
|
||||
@ -39,7 +39,6 @@
|
||||
extern void ddr_enable_ecc(unsigned int dram_size);
|
||||
#endif
|
||||
|
||||
extern long int spd_sdram(void);
|
||||
|
||||
void local_bus_init(void);
|
||||
void sdram_init(void);
|
||||
@ -275,7 +274,6 @@ long int
|
||||
initdram(int board_type)
|
||||
{
|
||||
long dram_size = 0;
|
||||
extern long spd_sdram (void);
|
||||
|
||||
puts("Initializing\n");
|
||||
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
#include <asm/processor.h>
|
||||
#include <asm/immap_85xx.h>
|
||||
#include <asm/immap_fsl_pci.h>
|
||||
#include <spd.h>
|
||||
#include <spd_sdram.h>
|
||||
#include <i2c.h>
|
||||
#include <ioports.h>
|
||||
#include <libfdt.h>
|
||||
@ -102,8 +102,6 @@ const qe_iop_conf_t qe_iop_conf_tab[] = {
|
||||
extern void ddr_enable_ecc(unsigned int dram_size);
|
||||
#endif
|
||||
|
||||
extern long int spd_sdram(void);
|
||||
|
||||
void local_bus_init(void);
|
||||
void sdram_init(void);
|
||||
|
||||
|
||||
@ -27,10 +27,10 @@
|
||||
#include <asm/immap_86xx.h>
|
||||
#include <asm/immap_fsl_pci.h>
|
||||
#include <i2c.h>
|
||||
#include <spd.h>
|
||||
#include <asm/io.h>
|
||||
#include <libfdt.h>
|
||||
#include <fdt_support.h>
|
||||
#include <spd_sdram.h>
|
||||
|
||||
#include "../common/pixis.h"
|
||||
|
||||
@ -38,10 +38,6 @@
|
||||
extern void ddr_enable_ecc(unsigned int dram_size);
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_SPD_EEPROM)
|
||||
#include "spd_sdram.h"
|
||||
#endif
|
||||
|
||||
void sdram_init(void);
|
||||
long int fixed_sdram(void);
|
||||
void mpc8610hpcd_diu_init(void);
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
#include <asm/processor.h>
|
||||
#include <asm/immap_86xx.h>
|
||||
#include <asm/immap_fsl_pci.h>
|
||||
#include <spd.h>
|
||||
#include <spd_sdram.h>
|
||||
#include <asm/io.h>
|
||||
#include <libfdt.h>
|
||||
#include <fdt_support.h>
|
||||
@ -36,10 +36,6 @@
|
||||
extern void ddr_enable_ecc(unsigned int dram_size);
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_SPD_EEPROM)
|
||||
#include "spd_sdram.h"
|
||||
#endif
|
||||
|
||||
void sdram_init(void);
|
||||
long int fixed_sdram(void);
|
||||
|
||||
|
||||
@ -26,9 +26,7 @@
|
||||
#include <common.h>
|
||||
#include <asm/processor.h>
|
||||
#include <asm/immap_85xx.h>
|
||||
#include <spd.h>
|
||||
|
||||
extern long int spd_sdram (void);
|
||||
#include <spd_sdram.h>
|
||||
|
||||
long int fixed_sdram (void);
|
||||
|
||||
@ -66,7 +64,7 @@ int checkboard (void)
|
||||
long int initdram (int board_type)
|
||||
{
|
||||
long dram_size = 0;
|
||||
extern long spd_sdram (void);
|
||||
|
||||
#if !defined(CONFIG_RAM_AS_FLASH)
|
||||
volatile ccsr_lbc_t *lbc = (void *)(CFG_MPC85xx_LBC_ADDR);
|
||||
sys_info_t sysinfo;
|
||||
|
||||
@ -29,14 +29,12 @@
|
||||
#include <pci.h>
|
||||
#include <asm/processor.h>
|
||||
#include <asm/immap_85xx.h>
|
||||
#include <spd.h>
|
||||
#include <spd_sdram.h>
|
||||
|
||||
#if defined(CONFIG_DDR_ECC)
|
||||
extern void ddr_enable_ecc(unsigned int dram_size);
|
||||
#endif
|
||||
|
||||
extern long int spd_sdram(void);
|
||||
|
||||
void local_bus_init(void);
|
||||
void sdram_init(void);
|
||||
long int fixed_sdram(void);
|
||||
@ -77,7 +75,6 @@ long int
|
||||
initdram(int board_type)
|
||||
{
|
||||
long dram_size = 0;
|
||||
extern long spd_sdram (void);
|
||||
|
||||
puts("Initializing\n");
|
||||
|
||||
|
||||
@ -30,15 +30,13 @@
|
||||
#include <asm/processor.h>
|
||||
#include <asm/immap_85xx.h>
|
||||
#include <ioports.h>
|
||||
#include <spd.h>
|
||||
#include <spd_sdram.h>
|
||||
#include <miiphy.h>
|
||||
|
||||
#if defined(CONFIG_DDR_ECC)
|
||||
extern void ddr_enable_ecc(unsigned int dram_size);
|
||||
#endif
|
||||
|
||||
extern long int spd_sdram(void);
|
||||
|
||||
void local_bus_init(void);
|
||||
long int fixed_sdram(void);
|
||||
|
||||
@ -231,7 +229,7 @@ long int
|
||||
initdram(int board_type)
|
||||
{
|
||||
long dram_size = 0;
|
||||
extern long spd_sdram (void);
|
||||
|
||||
|
||||
puts("Initializing\n");
|
||||
|
||||
|
||||
@ -30,11 +30,8 @@
|
||||
#include <mpc83xx.h>
|
||||
#include <asm/mpc8349_pci.h>
|
||||
#include <i2c.h>
|
||||
#include <spd.h>
|
||||
#include <miiphy.h>
|
||||
#if defined(CONFIG_SPD_EEPROM)
|
||||
#include <spd_sdram.h>
|
||||
#endif
|
||||
#include <miiphy.h>
|
||||
#if defined(CONFIG_OF_LIBFDT)
|
||||
#include <libfdt.h>
|
||||
#endif
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
#include <asm/processor.h>
|
||||
#include <asm/immap_85xx.h>
|
||||
#include <asm/immap_fsl_pci.h>
|
||||
#include <spd.h>
|
||||
#include <spd_sdram.h>
|
||||
#include <miiphy.h>
|
||||
#include <libfdt.h>
|
||||
#include <fdt_support.h>
|
||||
@ -41,8 +41,6 @@ extern void ddr_enable_ecc(unsigned int dram_size);
|
||||
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
||||
extern long int spd_sdram(void);
|
||||
|
||||
void local_bus_init(void);
|
||||
void sdram_init(void);
|
||||
long int fixed_sdram (void);
|
||||
|
||||
@ -27,13 +27,11 @@
|
||||
*/
|
||||
|
||||
|
||||
extern long int spd_sdram (void);
|
||||
|
||||
#include <common.h>
|
||||
#include <asm/processor.h>
|
||||
#include <asm/immap_85xx.h>
|
||||
#include <ioports.h>
|
||||
#include <spd.h>
|
||||
#include <spd_sdram.h>
|
||||
#include <miiphy.h>
|
||||
|
||||
long int fixed_sdram (void);
|
||||
@ -262,7 +260,7 @@ int checkboard (void)
|
||||
long int initdram (int board_type)
|
||||
{
|
||||
long dram_size = 0;
|
||||
extern long spd_sdram (void);
|
||||
|
||||
#if 0
|
||||
#if !defined(CONFIG_RAM_AS_FLASH)
|
||||
volatile ccsr_lbc_t *lbc = (void *)(CFG_MPC85xx_LBC_ADDR);
|
||||
|
||||
@ -34,7 +34,7 @@
|
||||
#include <asm/processor.h>
|
||||
#include <asm/immap_86xx.h>
|
||||
#include <asm/immap_fsl_pci.h>
|
||||
#include <spd.h>
|
||||
#include <spd_sdram.h>
|
||||
#include <libfdt.h>
|
||||
#include <fdt_support.h>
|
||||
|
||||
@ -42,10 +42,6 @@
|
||||
extern void ddr_enable_ecc (unsigned int dram_size);
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_SPD_EEPROM)
|
||||
#include "spd_sdram.h"
|
||||
#endif
|
||||
|
||||
void sdram_init (void);
|
||||
long int fixed_sdram (void);
|
||||
|
||||
|
||||
@ -29,15 +29,13 @@
|
||||
*/
|
||||
|
||||
|
||||
extern long int spd_sdram (void);
|
||||
|
||||
#include <common.h>
|
||||
#include <pci.h>
|
||||
#include <asm/processor.h>
|
||||
#include <asm/immap_85xx.h>
|
||||
#include <ioports.h>
|
||||
#include <asm/io.h>
|
||||
#include <spd.h>
|
||||
#include <spd_sdram.h>
|
||||
#include <miiphy.h>
|
||||
|
||||
long int fixed_sdram (void);
|
||||
@ -281,7 +279,6 @@ long int
|
||||
initdram (int board_type)
|
||||
{
|
||||
long dram_size = 0;
|
||||
extern long spd_sdram (void);
|
||||
|
||||
#if defined(CONFIG_DDR_DLL)
|
||||
{
|
||||
|
||||
@ -29,15 +29,13 @@
|
||||
*/
|
||||
|
||||
|
||||
extern long int spd_sdram (void);
|
||||
|
||||
#include <common.h>
|
||||
#include <pci.h>
|
||||
#include <asm/processor.h>
|
||||
#include <asm/immap_85xx.h>
|
||||
#include <ioports.h>
|
||||
#include <asm/io.h>
|
||||
#include <spd.h>
|
||||
#include <spd_sdram.h>
|
||||
#include <miiphy.h>
|
||||
|
||||
long int fixed_sdram (void);
|
||||
@ -297,7 +295,6 @@ long int
|
||||
initdram (int board_type)
|
||||
{
|
||||
long dram_size = 0;
|
||||
extern long spd_sdram (void);
|
||||
|
||||
#if defined(CONFIG_DDR_DLL)
|
||||
{
|
||||
|
||||
@ -27,7 +27,6 @@
|
||||
#include <mpc83xx.h>
|
||||
#include <asm/mpc8349_pci.h>
|
||||
#include <i2c.h>
|
||||
#include <spd.h>
|
||||
#include <miiphy.h>
|
||||
#include <asm-ppc/mmu.h>
|
||||
#include <pci.h>
|
||||
@ -59,7 +58,6 @@ int tqm834x_num_flash_banks;
|
||||
/* External definitions */
|
||||
ulong flash_get_size (ulong base, int banknum);
|
||||
extern flash_info_t flash_info[];
|
||||
extern long spd_sdram (void);
|
||||
|
||||
/* Local functions */
|
||||
static int detect_num_flash_banks(void);
|
||||
|
||||
@ -27,7 +27,6 @@
|
||||
#include <asm/immap_85xx.h>
|
||||
#include <asm/processor.h>
|
||||
#include <asm/mmu.h>
|
||||
#include <spd.h>
|
||||
|
||||
struct sdram_conf_s {
|
||||
unsigned long size;
|
||||
|
||||
@ -32,7 +32,6 @@
|
||||
#include <asm/processor.h>
|
||||
#include <asm/immap_85xx.h>
|
||||
#include <ioports.h>
|
||||
#include <spd.h>
|
||||
#include <flash.h>
|
||||
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
@ -40,7 +39,6 @@ DECLARE_GLOBAL_DATA_PTR;
|
||||
extern flash_info_t flash_info[]; /* FLASH chips info */
|
||||
|
||||
void local_bus_init (void);
|
||||
long int fixed_sdram (void);
|
||||
ulong flash_get_size (ulong base, int banknum);
|
||||
|
||||
#ifdef CONFIG_PS2MULT
|
||||
|
||||
@ -31,9 +31,6 @@
|
||||
#define PPC405GP_GPIO0_ODR 0xef600718L /* GPIO Open Drain */
|
||||
#define PPC405GP_GPIO0_IR 0xef60071cL /* GPIO Input */
|
||||
|
||||
/* AMCC 405GP DCRs */
|
||||
#define CPC0_CR0 0xb1 /* Chip control register 0 */
|
||||
|
||||
/* LMG FPGA <=> CPU GPIO signals */
|
||||
#define LMG_XCV_INIT 0x10000000L
|
||||
#define LMG_XCV_PROG 0x04000000L
|
||||
|
||||
@ -143,9 +143,8 @@ int phy_setup_aneg (char *devname, unsigned char addr)
|
||||
u16 adv;
|
||||
|
||||
miiphy_read (devname, addr, PHY_ANAR, &adv);
|
||||
adv |= (PHY_ANLPAR_ACK | PHY_ANLPAR_RF | PHY_ANLPAR_T4 |
|
||||
PHY_ANLPAR_TXFD | PHY_ANLPAR_TX | PHY_ANLPAR_10FD |
|
||||
PHY_ANLPAR_10);
|
||||
adv |= (PHY_ANLPAR_ACK | PHY_ANLPAR_TXFD | PHY_ANLPAR_TX |
|
||||
PHY_ANLPAR_10FD | PHY_ANLPAR_10);
|
||||
miiphy_write (devname, addr, PHY_ANAR, adv);
|
||||
|
||||
miiphy_read (devname, addr, PHY_1000BTCR, &adv);
|
||||
|
||||
@ -77,9 +77,9 @@ SREC = hello_world.srec
|
||||
BIN = hello_world.bin
|
||||
|
||||
ifeq ($(CPU),mpc8xx)
|
||||
ELF = test_burst
|
||||
SREC = test_burst.srec
|
||||
BIN = test_burst.bin
|
||||
ELF += test_burst
|
||||
SREC += test_burst.srec
|
||||
BIN += test_burst.bin
|
||||
endif
|
||||
|
||||
ifeq ($(ARCH),i386)
|
||||
|
||||
@ -182,10 +182,6 @@
|
||||
#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
|
||||
#endif
|
||||
|
||||
#define CONFIG_PREBOOT "echo;" \
|
||||
"echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
|
||||
"echo"
|
||||
|
||||
/* check U-Boot image with SHA1 sum */
|
||||
#define CONFIG_SHA1_CHECK_UB_IMG 1
|
||||
#define CONFIG_SHA1_START CFG_MONITOR_BASE
|
||||
|
||||
Loading…
Reference in New Issue
Block a user