- First pass through with with device tree enhancement merge. Most of the mechanisms should

  be in place but don't expect anything to quite work yet.


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1662 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

2 files changed, 4 insertions, 23 deletions

diff --git a/src/arch/ppc/boot/linuxbios_table.c b/src/arch/ppc/boot/linuxbios_table.c
index f199615d5f..2b37e877e5 100644
--- a/src/arch/ppc/boot/linuxbios_table.c
+++ b/src/arch/ppc/boot/linuxbios_table.c
@@ -218,7 +218,6 @@ struct lb_memory *get_lb_mem(void)
 }
 
 unsigned long write_linuxbios_table( 
-	unsigned long *processor_map, 
 	struct mem_range *ram,
 	unsigned long low_table_start, unsigned long low_table_end,
 	unsigned long rom_table_startk, unsigned long rom_table_endk)
diff --git a/src/arch/ppc/boot/tables.c b/src/arch/ppc/boot/tables.c
index c5f5a5da19..468fbcabe8 100644
--- a/src/arch/ppc/boot/tables.c
+++ b/src/arch/ppc/boot/tables.c
@@ -6,7 +6,7 @@
 #include "linuxbios_table.h"
 
 struct lb_memory *
-write_tables(struct mem_range *mem, unsigned long *processor_map)
+write_tables(struct mem_range *mem)
 {
 	unsigned long low_table_start, low_table_end;
 	unsigned long rom_table_start, rom_table_end;
@@ -19,28 +19,10 @@ write_tables(struct mem_range *mem, unsigned long *processor_map)
 	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);
+	write_linuxbios_table(mem,
+		low_table_start, low_table_end,
+		rom_table_start >> 10, rom_table_end >> 10);
 
 	return get_lb_mem();
 }