vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2004-10-28 Hollis Blanchard <hollis@penguinppc.org>

Browse source 
* boot/powerpc/ieee1275/cmain.c (cmain): Remove asm statements
	which initialized BAT registers.
	* boot/powerpc/ieee1275/ieee1275.c (IEEE1275_CALL_ENTRY_FN,
	grub_ieee1275_common_hdr, INIT_IEEE1275_COMMON):
	Move from here...
	* include/grub/powerpc/ieee1275/ieee1275.h (IEEE1275_CALL_ENTRY_FN,
	grub_ieee1275_common_hdr, INIT_IEEE1275_COMMON):
	... to here.
	* kern/powerpc/ieee1275/openfw.c (grub_map): New function.
	(grub_mapclaim): Likewise.
	* loader/powerpc/ieee1275/linux.c (grub_load_linux): Use
	grub_mapclaim instead of grub_ieee1275_claim.  Assign linux_addr by
	hand.
This commit is contained in:
hollisb 2004-10-29 02:45:14 +00:00
parent 9304c1f804
commit a5477a5930
6 changed files with 95 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

22
boot/powerpc/ieee1275/cmain.c
View file

@ -55,7 +55,6 @@ cmain (uint32_t r3, uint32_t r4 __attribute__((unused)), uint32_t r5)
char **argv, args[256];
grub_ieee1275_phandle_t chosen;
int argc = 0, actual;
long batl, batu;
if (r5 == 0xdeadbeef)
{
@ -81,27 +80,6 @@ cmain (uint32_t r3, uint32_t r4 __attribute__((unused)), uint32_t r5)
grub_ieee1275_entry_fn = (intptr_t (*)(void *)) r5;
}
/* Initialize BAT registers to unmapped to not generate overlapping
mappings below. */
asm volatile ("mtibatu 0,%0" :: "r"(0));
asm volatile ("mtibatu 1,%0" :: "r"(0));
asm volatile ("mtibatu 2,%0" :: "r"(0));
asm volatile ("mtibatu 3,%0" :: "r"(0));
asm volatile ("mtdbatu 0,%0" :: "r"(0));
asm volatile ("mtdbatu 1,%0" :: "r"(0));
asm volatile ("mtdbatu 2,%0" :: "r"(0));
asm volatile ("mtdbatu 3,%0" :: "r"(0));
/* Set up initial BAT table to only map the lowest 256 MB area. */
batl = 0x00000000 | 0x10 | 0x02;
batu = 0x00000000 | 0x1ffc | 0x02;
/* IBAT0 used for initial 256 MB segment */
asm volatile ("mtibatl 3,%0; mtibatu 3,%1" :: "r" (batl), "r" (batu));
/* DBAT0 used similar */
asm volatile ("mtdbatl 3,%0; mtdbatu 3,%1" :: "r" (batl), "r" (batu));
asm ("isync");
/* If any argument was passed to the kernel (us), they are
put in the bootargs property of /chosen. The string can
be null (just the nul-character), so check that the size

19
boot/powerpc/ieee1275/ieee1275.c
View file

@ -26,25 +26,6 @@
intptr_t (*grub_ieee1275_entry_fn) (void *);
#ifndef IEEE1275_CALL_ENTRY_FN
#define IEEE1275_CALL_ENTRY_FN(args) (*grub_ieee1275_entry_fn) (args)
#endif
/* All backcalls to the firmware is done by calling an entry function
which was passed to us from the bootloader. When doing the backcall,
a structure is passed which specifies what the firmware should do.
NAME is the requested service. NR_INS and NR_OUTS is the number of
passed arguments and the expected number of return values, resp. */
struct grub_ieee1275_common_hdr
{
char *name;
int nr_ins;
int nr_outs;
};
#define INIT_IEEE1275_COMMON(p, xname, xins, xouts) \
(p)->name = xname; (p)->nr_ins = xins; (p)->nr_outs = xouts
/* FIXME is this function needed? */
grub_uint32_t
grub_ieee1275_decode_int_4 (unsigned char *p)