diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/arch/ppc/boot/boot.c | 2 | ||||
-rw-r--r-- | src/arch/ppc/boot/linuxbios_table.c | 4 | ||||
-rw-r--r-- | src/arch/ppc/boot/tables.c | 46 |
3 files changed, 49 insertions, 3 deletions
diff --git a/src/arch/ppc/boot/boot.c b/src/arch/ppc/boot/boot.c index 79eea965b3..860576370b 100644 --- a/src/arch/ppc/boot/boot.c +++ b/src/arch/ppc/boot/boot.c @@ -2,7 +2,7 @@ #include <boot/elf.h> #include <boot/elf_boot.h> #include <string.h> -#include <printk.h> +#include <console/console.h> #ifndef CMD_LINE diff --git a/src/arch/ppc/boot/linuxbios_table.c b/src/arch/ppc/boot/linuxbios_table.c index 253a5e5b7f..731ddaf78a 100644 --- a/src/arch/ppc/boot/linuxbios_table.c +++ b/src/arch/ppc/boot/linuxbios_table.c @@ -1,8 +1,8 @@ #include <mem.h> #include <ip_checksum.h> #include <boot/linuxbios_tables.h> -#include <boot/linuxbios_table.h> -#include <printk.h> +#include "linuxbios_table.h" +#include <console/console.h> #include <string.h> #include <version.h> diff --git a/src/arch/ppc/boot/tables.c b/src/arch/ppc/boot/tables.c new file mode 100644 index 0000000000..c5f5a5da19 --- /dev/null +++ b/src/arch/ppc/boot/tables.c @@ -0,0 +1,46 @@ +#include <console/console.h> +#include <mem.h> +#include <cpu/cpu.h> +#include <boot/tables.h> +#include <boot/linuxbios_tables.h> +#include "linuxbios_table.h" + +struct lb_memory * +write_tables(struct mem_range *mem, unsigned long *processor_map) +{ + unsigned long low_table_start, low_table_end; + unsigned long rom_table_start, rom_table_end; + + rom_table_start = 0xf0000; + rom_table_end = 0xf0000; + /* Start low addr at 16 bytes instead of 0 because of a buglet + * in the generic linux unzip code, as it tests for the a20 line. + */ + low_table_start = 0; + low_table_end = 16; + +#if 0 + post_code(0x9a); + check_pirq_routing_table(); + /* This table must be betweeen 0xf0000 & 0x100000 */ + rom_table_end = copy_pirq_routing_table(rom_table_end); + rom_table_end = (rom_table_end + 1023) & ~1023; + + /* copy the smp block to address 0 */ + post_code(0x96); + /* The smp table must be in 0-1K, 639K-640K, or 960K-1M */ + remove_logical_cpus(); + low_table_end = write_smp_table(low_table_end, processor_map); + + /* Don't write anything in the traditional x86 BIOS data segment */ + if (low_table_end < 0x500) { + low_table_end = 0x500; + } +#endif + /* The linuxbios table must be in 0-4K or 960K-1M */ + write_linuxbios_table(processor_map, mem, + low_table_start, low_table_end, + rom_table_start >> 10, rom_table_end >> 10); + + return get_lb_mem(); +} |