mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-18 21:21:37 +00:00
Update for SC3 board
* Make IDE timeout configurable through ide_reset_timeout variable. * Use Newline as "password" string * Use just a single partition in NAND flash
This commit is contained in:
parent
25b0806fff
commit
51056dd986
2 changed files with 12 additions and 11 deletions
|
@ -513,9 +513,11 @@ void ide_init (void)
|
||||||
#endif
|
#endif
|
||||||
unsigned char c;
|
unsigned char c;
|
||||||
int i, bus;
|
int i, bus;
|
||||||
|
#if defined(CONFIG_AMIGAONEG3SE) || defined(CONFIG_SC3)
|
||||||
|
unsigned int ata_reset_time;
|
||||||
|
#endif
|
||||||
#ifdef CONFIG_AMIGAONEG3SE
|
#ifdef CONFIG_AMIGAONEG3SE
|
||||||
unsigned int max_bus_scan;
|
unsigned int max_bus_scan;
|
||||||
unsigned int ata_reset_time;
|
|
||||||
char *s;
|
char *s;
|
||||||
#endif
|
#endif
|
||||||
#ifdef CONFIG_IDE_8xx_PCCARD
|
#ifdef CONFIG_IDE_8xx_PCCARD
|
||||||
|
@ -617,10 +619,9 @@ void ide_init (void)
|
||||||
udelay (100000); /* 100 ms */
|
udelay (100000); /* 100 ms */
|
||||||
ide_outb (dev, ATA_DEV_HD, ATA_LBA | ATA_DEVICE(dev));
|
ide_outb (dev, ATA_DEV_HD, ATA_LBA | ATA_DEVICE(dev));
|
||||||
udelay (100000); /* 100 ms */
|
udelay (100000); /* 100 ms */
|
||||||
#ifdef CONFIG_AMIGAONEG3SE
|
#if defined(CONFIG_AMIGAONEG3SE) || defined(CONFIG_SC3)
|
||||||
ata_reset_time = ATA_RESET_TIME;
|
if ((s = getenv("ide_reset_timeout")) != NULL)
|
||||||
s = getenv("ide_reset_timeout");
|
ata_reset_time = simple_strtol(s, NULL, 10);
|
||||||
if (s) ata_reset_time = 2*simple_strtol(s, NULL, 10);
|
|
||||||
#endif
|
#endif
|
||||||
i = 0;
|
i = 0;
|
||||||
do {
|
do {
|
||||||
|
@ -628,7 +629,7 @@ void ide_init (void)
|
||||||
|
|
||||||
c = ide_inb (dev, ATA_STATUS);
|
c = ide_inb (dev, ATA_STATUS);
|
||||||
i++;
|
i++;
|
||||||
#ifdef CONFIG_AMIGAONEG3SE
|
#if defined(CONFIG_AMIGAONEG3SE) || defined(CONFIG_SC3)
|
||||||
if (i > (ata_reset_time * 100)) {
|
if (i > (ata_reset_time * 100)) {
|
||||||
#else
|
#else
|
||||||
if (i > (ATA_RESET_TIME * 100)) {
|
if (i > (ATA_RESET_TIME * 100)) {
|
||||||
|
|
|
@ -133,8 +133,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 S\n"
|
#define CONFIG_AUTOBOOT_PROMPT "\nSC3 - booting... stop with ENTER\n"
|
||||||
#define CONFIG_AUTOBOOT_DELAY_STR "S" /* 1st "password" */
|
#define CONFIG_AUTOBOOT_DELAY_STR "\n" /* 1st "password" */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -416,11 +416,11 @@ extern unsigned long offsetOfEnvironment;
|
||||||
|
|
||||||
#define CONFIG_JFFS2_NAND 1 /* jffs2 on nand support */
|
#define CONFIG_JFFS2_NAND 1 /* jffs2 on nand support */
|
||||||
|
|
||||||
/* No command line, one static partition Partition 3 contains jffs2 rootfs */
|
/* No command line, one static partition */
|
||||||
#undef CONFIG_JFFS2_CMDLINE
|
#undef CONFIG_JFFS2_CMDLINE
|
||||||
#define CONFIG_JFFS2_DEV "nand0"
|
#define CONFIG_JFFS2_DEV "nand0"
|
||||||
#define CONFIG_JFFS2_PART_SIZE 0x00400000
|
#define CONFIG_JFFS2_PART_SIZE 0x01000000
|
||||||
#define CONFIG_JFFS2_PART_OFFSET 0x00c00000
|
#define CONFIG_JFFS2_PART_OFFSET 0x00000000
|
||||||
|
|
||||||
/*-----------------------------------------------------------------------
|
/*-----------------------------------------------------------------------
|
||||||
* Cache Configuration
|
* Cache Configuration
|
||||||
|
|
Loading…
Add table
Reference in a new issue