Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
reform-boundary-uboot
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jack Humbert
reform-boundary-uboot
Commits
9045f33c
Commit
9045f33c
authored
18 years ago
by
Wolfgang Denk
Browse files
Options
Downloads
Patches
Plain Diff
Fix config problems on SC3 board; make ide_reset_timeout work.
parent
725671cc
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
common/cmd_ide.c
+2
-2
2 additions, 2 deletions
common/cmd_ide.c
cpu/ppc4xx/405gp_pci.c
+1
-1
1 addition, 1 deletion
cpu/ppc4xx/405gp_pci.c
include/configs/sc3.h
+3
-2
3 additions, 2 deletions
include/configs/sc3.h
lib_ppc/board.c
+3
-3
3 additions, 3 deletions
lib_ppc/board.c
with
9 additions
and
8 deletions
common/cmd_ide.c
+
2
−
2
View file @
9045f33c
...
...
@@ -514,11 +514,11 @@ void ide_init (void)
unsigned
char
c
;
int
i
,
bus
;
#if defined(CONFIG_AMIGAONEG3SE) || defined(CONFIG_SC3)
unsigned
int
ata_reset_time
;
unsigned
int
ata_reset_time
=
ATA_RESET_TIME
;
char
*
s
;
#endif
#ifdef CONFIG_AMIGAONEG3SE
unsigned
int
max_bus_scan
;
char
*
s
;
#endif
#ifdef CONFIG_IDE_8xx_PCCARD
extern
int
pcmcia_on
(
void
);
...
...
This diff is collapsed.
Click to expand it.
cpu/ppc4xx/405gp_pci.c
+
1
−
1
View file @
9045f33c
...
...
@@ -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
);
}
#if !(defined(CONFIG_PIP405) || defined (CONFIG_MIP405)) && !(defined (CONFIG_S
OLIDCARD
3))
#if !(defined(CONFIG_PIP405) || defined (CONFIG_MIP405)) && !(defined (CONFIG_S
C
3))
/*
*As is these functs get called out of flash Not a horrible
...
...
This diff is collapsed.
Click to expand it.
include/configs/sc3.h
+
3
−
2
View file @
9045f33c
...
...
@@ -58,7 +58,7 @@
* 0xFFE00000 .... 0xFFFFFFFF -> BOOT-ROM (2 MiB)
*/
#define CONFIG_S
OLIDCARD
3 1
#define CONFIG_S
C
3 1
#define CONFIG_4xx 1
#define CONFIG_405GP 1
...
...
@@ -134,7 +134,8 @@
#if 1
/* feel free to disable for development */
#define CONFIG_AUTOBOOT_KEYED
/* Enable password protection */
#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
/*
...
...
This diff is collapsed.
Click to expand it.
lib_ppc/board.c
+
3
−
3
View file @
9045f33c
...
...
@@ -76,7 +76,7 @@
extern
int
update_flash_size
(
int
flash_size
);
#endif
#if defined(CONFIG_S
OLIDCARD
3)
#if defined(CONFIG_S
C
3)
extern
void
sc3_read_eeprom
(
void
);
#endif
...
...
@@ -820,7 +820,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
#endif
/* CONFIG_405GP, CONFIG_405EP */
#endif
/* CFG_EXTBDINFO */
#if defined(CONFIG_S
OLIDCARD
3)
#if defined(CONFIG_S
C
3)
sc3_read_eeprom
();
#endif
s
=
getenv
(
"ethaddr"
);
...
...
@@ -929,7 +929,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
defined(CONFIG_KUP4X) || \
defined(CONFIG_LWMON) || \
defined(CONFIG_PCU_E) || \
defined(CONFIG_S
OLIDCARD
3) || \
defined(CONFIG_S
C
3)
|| \
defined(CONFIG_W7O) || \
defined(CONFIG_MISC_INIT_R)
/* miscellaneous platform dependent initialisations */
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment