diff options
| author | bcollins <tailor@grayson> | 2006-06-01 13:19:21 -0400 |
|---|---|---|
| committer | Ben Collins <bcollins@ubuntu.com> | 2006-06-01 13:19:21 -0400 |
| commit | 0af24d4affd43444f77be95d8bfa7913d965b7f2 (patch) | |
| tree | 35f5b2717efb68f8f7ae7b70b51e7af05949dbfe | |
| parent | 42f3266f2fd7b4ec726bbff4e6de9a7aaf120349 (diff) | |
| download | silo-0af24d4affd43444f77be95d8bfa7913d965b7f2.tar.gz | |
[silo @ 126]
Ok, maybe initrd wasn't working. Resolved that now, and do 1.4.3.#
| -rw-r--r-- | Rules.make | 2 | ||||
| -rw-r--r-- | second/main.c | 5 | ||||
| -rw-r--r-- | second/memory.c | 1 | ||||
| -rw-r--r-- | silo.spec | 2 |
4 files changed, 6 insertions, 4 deletions
@@ -1,4 +1,4 @@ -VERSION=1.4.2 +VERSION=1.4.3 IMGVERSION=0.99 RM=rm -f # We want to force 32-bit builds diff --git a/second/main.c b/second/main.c index 1c7ccfd..8d34caa 100644 --- a/second/main.c +++ b/second/main.c @@ -1354,8 +1354,9 @@ try_again: if (statusok) { extern unsigned long long sun4u_initrd_phys; extern unsigned long sun4m_initrd_pa; + if (architecture == sun4u) - *(unsigned int *)(p + 16) = (unsigned int)sun4u_initrd_phys; + *(unsigned int *)(p + 16) = (unsigned int)sun4u_initrd_phys + 0x400000; else if (sun4m_initrd_pa) *(unsigned int *)(p + 16) = ((unsigned int)sun4m_initrd_pa); else @@ -1374,7 +1375,7 @@ try_again: extern unsigned long sun4m_initrd_pa; if (architecture == sun4u) - *(unsigned int *)(p + 16) = (unsigned int)sun4u_initrd_phys; + *(unsigned int *)(p + 16) = (unsigned int)sun4u_initrd_phys + 0x400000; else if (sun4m_initrd_pa) *(unsigned int *)(p + 16) = ((unsigned int)sun4m_initrd_pa); else diff --git a/second/memory.c b/second/memory.c index 05fd79e..a67aa8a 100644 --- a/second/memory.c +++ b/second/memory.c @@ -365,6 +365,7 @@ static char *sun4u_memory_find (unsigned int len, int is_kernel) } else { sun4u_initrd_len = len; sun4u_initrd_virt = virt; + sun4u_initrd_phys = phys; } __asm __volatile("\n\ @@ -1,6 +1,6 @@ Summary: The SILO boot loader for SPARCs. Name: silo -Version: 1.4.2 +Version: 1.4.3 Release: 1 Copyright: GPL ExclusiveArch: sparc |