diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-05-07 02:55:41 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-05-07 02:55:41 +0000 |
| commit | dcec8a13bf565e47942a1751a9cec21bec5648fe (patch) | |
| tree | 548b69625b18cc2e88c3e68d0923be546c9ebb03 /arch/ppc/chrpboot | |
| parent | 2e0f55e79c49509b7ff70ff1a10e1e9e90a3dfd4 (diff) | |
o Merge with Linux 2.1.99.
o Fix ancient bug in the ELF loader making ldd crash.
o Fix ancient bug in the keyboard code for SGI, SNI and Jazz.
Diffstat (limited to 'arch/ppc/chrpboot')
| -rw-r--r-- | arch/ppc/chrpboot/main.c | 10 | ||||
| -rw-r--r-- | arch/ppc/chrpboot/misc.S | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/arch/ppc/chrpboot/main.c b/arch/ppc/chrpboot/main.c index 629256eaa..05a2f85d3 100644 --- a/arch/ppc/chrpboot/main.c +++ b/arch/ppc/chrpboot/main.c @@ -16,11 +16,11 @@ void gunzip(void *, int, unsigned char *, int *); #define get_16be(x) (*(unsigned short *)(x)) #define get_32be(x) (*(unsigned *)(x)) -#define RAM_START 0x90000000 -#define RAM_END 0x90800000 /* only 8M mapped with BATs */ +#define RAM_START 0x00000000 +#define RAM_END 0x00800000 /* only 8M mapped with BATs */ -#define RAM_FREE 0x90540000 /* after image of chrpboot */ -#define PROG_START 0x90010000 +#define RAM_FREE 0x00540000 /* after image of chrpboot */ +#define PROG_START 0x00010000 char *avail_ram; char *end_avail; @@ -40,7 +40,7 @@ chrpboot(int a1, int a2, void *prom) unsigned initrd_start, initrd_size; printf("chrpboot starting\n\r"); - setup_bats(); + /* setup_bats(); */ if (initrd_len) { initrd_size = initrd_len; diff --git a/arch/ppc/chrpboot/misc.S b/arch/ppc/chrpboot/misc.S index 11a612af1..b2094b9d3 100644 --- a/arch/ppc/chrpboot/misc.S +++ b/arch/ppc/chrpboot/misc.S @@ -23,10 +23,10 @@ setup_bats: b 5f 4: ori 4,4,0xff /* set up BAT registers for 604 */ li 5,2 - mtdbatu 0,4 - mtdbatl 0,5 -5: mtibatu 0,4 - mtibatl 0,5 + mtdbatu 3,4 + mtdbatl 3,5 +5: mtibatu 3,4 + mtibatl 3,5 isync blr |