From: Tony Breeds Date: Fri, 13 Feb 2009 02:51:03 +0000 (+1100) Subject: Revert "Let prom_claim_chunk do the work for tftp images to support larger images." X-Git-Tag: yaboot-1.3.15-rc~2 X-Git-Url: http://git.ozlabs.org/?p=yaboot.git;a=commitdiff_plain;h=5a103124cb1e8a2e503663e55f6fe7da4a398d24;ds=sidebyside Revert "Let prom_claim_chunk do the work for tftp images to support larger images." This reverts commit c8b04c614770870d75825c19bcd4729cc779b84a. This fixes the regression described in: https://bugzilla.redhat.com/show_bug.cgi?id=468492 Signed-off-by: Roman Rakus Signed-off-by: Tony Breeds --- diff --git a/Makefile b/Makefile index fe2f2fd..bcc2210 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ TEXTADDR = 0x200000 MALLOCADDR = 0x300000 MALLOCSIZE = 0x100000 # Load kernel and ramdisk at real-base. If there is overlap, will retry until find open space -KERNELADDR = 0x00000000 +KERNELADDR = 0x00C00000 # Set this to the prefix of your cross-compiler, if you have one. # Else leave it empty. diff --git a/second/fs_of.c b/second/fs_of.c index 0d554c5..95c131d 100644 --- a/second/fs_of.c +++ b/second/fs_of.c @@ -44,8 +44,8 @@ #include "errors.h" #include "debug.h" -#define LOAD_BUFFER_POS 0x00000000 -#define LOAD_BUFFER_SIZE 0x01000000 +#define LOAD_BUFFER_POS 0x1000000 +#define LOAD_BUFFER_SIZE 0x1000000 static int of_open(struct boot_file_t* file, const char* dev_name, struct partition_t* part, const char* file_name);