GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-07-04 21:32:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix config problems on SC3 board; make ide_reset_timeout work.

Browse source
This commit is contained in:
Wolfgang Denk 2007-06-08 10:24:58 +02:00
parent 725671ccd2
commit 9045f33c02
4 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
common/cmd_ide.c
View file

@ -514,11 +514,11 @@ void ide_init (void)
unsigned char c; unsigned char c;
int i, bus; int i, bus;
#if defined(CONFIG_AMIGAONEG3SE) || defined(CONFIG_SC3) #if defined(CONFIG_AMIGAONEG3SE) || defined(CONFIG_SC3)
unsigned int ata_reset_time; unsigned int ata_reset_time = ATA_RESET_TIME;
char *s;
#endif #endif
#ifdef CONFIG_AMIGAONEG3SE #ifdef CONFIG_AMIGAONEG3SE
unsigned int max_bus_scan; unsigned int max_bus_scan;
char *s;
#endif #endif
#ifdef CONFIG_IDE_8xx_PCCARD #ifdef CONFIG_IDE_8xx_PCCARD
extern int pcmcia_on (void); extern int pcmcia_on (void);

2
cpu/ppc4xx/405gp_pci.c
View file

@ -380,7 +380,7 @@ void pci_405gp_setup_vga(struct pci_controller *hose, pci_dev_t dev,
pci_hose_write_config_dword(hose, dev, PCI_COMMAND, cmdstat); pci_hose_write_config_dword(hose, dev, PCI_COMMAND, cmdstat);
} }
#if !(defined(CONFIG_PIP405) || defined (CONFIG_MIP405)) && !(defined (CONFIG_SOLIDCARD3)) #if !(defined(CONFIG_PIP405) || defined (CONFIG_MIP405)) && !(defined (CONFIG_SC3))
/* /*
*As is these functs get called out of flash Not a horrible *As is these functs get called out of flash Not a horrible

5
include/configs/sc3.h
View file

@ -58,7 +58,7 @@
* 0xFFE00000 .... 0xFFFFFFFF -> BOOT-ROM (2 MiB) * 0xFFE00000 .... 0xFFFFFFFF -> BOOT-ROM (2 MiB)
*/ */
#define CONFIG_SOLIDCARD3 1 #define CONFIG_SC3 1
#define CONFIG_4xx 1 #define CONFIG_4xx 1
#define CONFIG_405GP 1 #define CONFIG_405GP 1
@ -134,7 +134,8 @@
#if 1 /* feel free to disable for development */ #if 1 /* feel free to disable for development */
#define CONFIG_AUTOBOOT_KEYED /* Enable password protection */ #define CONFIG_AUTOBOOT_KEYED /* Enable password protection */
#define CONFIG_AUTOBOOT_PROMPT "\nSC3 - booting... stop with ENTER\n" #define CONFIG_AUTOBOOT_PROMPT "\nSC3 - booting... stop with ENTER\n"
#define CONFIG_AUTOBOOT_DELAY_STR "\n" /* 1st "password" */ #define CONFIG_AUTOBOOT_DELAY_STR "\r" /* 1st "password" */
#define CONFIG_AUTOBOOT_DELAY_STR2 "\n" /* 1st "password" */
#endif #endif
/* /*

6
lib_ppc/board.c
View file

@ -76,7 +76,7 @@
extern int update_flash_size (int flash_size); extern int update_flash_size (int flash_size);
#endif #endif
#if defined(CONFIG_SOLIDCARD3) #if defined(CONFIG_SC3)
extern void sc3_read_eeprom(void); extern void sc3_read_eeprom(void);
#endif #endif
@ -820,7 +820,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
#endif /* CONFIG_405GP, CONFIG_405EP */ #endif /* CONFIG_405GP, CONFIG_405EP */
#endif /* CFG_EXTBDINFO */ #endif /* CFG_EXTBDINFO */
#if defined(CONFIG_SOLIDCARD3) #if defined(CONFIG_SC3)
sc3_read_eeprom(); sc3_read_eeprom();
#endif #endif
s = getenv ("ethaddr"); s = getenv ("ethaddr");
@ -929,7 +929,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
defined(CONFIG_KUP4X) || \ defined(CONFIG_KUP4X) || \
defined(CONFIG_LWMON) || \ defined(CONFIG_LWMON) || \
defined(CONFIG_PCU_E) || \ defined(CONFIG_PCU_E) || \
defined(CONFIG_SOLIDCARD3) || \ defined(CONFIG_SC3) || \
defined(CONFIG_W7O) || \ defined(CONFIG_W7O) || \
defined(CONFIG_MISC_INIT_R) defined(CONFIG_MISC_INIT_R)
/* miscellaneous platform dependent initialisations */ /* miscellaneous platform dependent initialisations */