Commit e37bc5df authored by David Gibson's avatar David Gibson Committed by Paul Mackerras
Browse files

[PATCH] powerpc: Purge bootinfo.h 



With ARCH=powerpc we assume the presence of a device tree, so we don't
require any support for the old bi_recs method of passing boot
parameters.  Likewise, we've never needed it for ppc64, but we still
had an include/asm-ppc64/bootinfo.h from which nothing was used.  This
patch removes that file, and all references to it in arch/ppc64 and
arch/powerpc.  A related, unused variable 'boot_mem_size' is also
removed from setup_32.c.  The bootinfo stuff remains in ARCH=ppc for
the time being.

Built and booted on Power5 (ARCH=ppc64 and ARCH=powerpc), built for
32-bit powermac (ARCH=powerpc and ARCH=ppc).

Signed-off-by: default avatarDavid Gibson <dwg@au1.ibm.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 25c8a78b

arch/powerpc/kernel/prom_init.c

+0 −1
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ 
#include <asm/pgtable.h>

#include <asm/pci.h>

#include <asm/iommu.h>

#include <asm/bootinfo.h>

#include <asm/btext.h>

#include <asm/sections.h>

#include <asm/machdep.h>

arch/powerpc/kernel/setup_32.c

+0 −5
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#include <asm/prom.h>

#include <asm/processor.h>

#include <asm/pgtable.h>

#include <asm/bootinfo.h>

#include <asm/setup.h>

#include <asm/amigappc.h>

#include <asm/smp.h>
@@ -60,10 +59,6 @@ struct ide_machdep_calls ppc_ide_md; 
int __irq_offset_value;

EXPORT_SYMBOL(__irq_offset_value);



/* Used with the BI_MEMSIZE bootinfo parameter to store the memory

   size value reported by the boot loader. */

unsigned long boot_mem_size;



unsigned long ISA_DMA_THRESHOLD;

unsigned int DMA_MODE_READ;

unsigned int DMA_MODE_WRITE;

arch/powerpc/kernel/setup_64.c

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
#include <asm/prom.h>

#include <asm/processor.h>

#include <asm/pgtable.h>

#include <asm/bootinfo.h>

#include <asm/smp.h>

#include <asm/elf.h>

#include <asm/machdep.h>

arch/powerpc/mm/init_32.c

+0 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ 
#include <asm/machdep.h>

#include <asm/btext.h>

#include <asm/tlb.h>

#include <asm/bootinfo.h>

#include <asm/prom.h>

#include <asm/lmb.h>

#include <asm/sections.h>

arch/powerpc/mm/mem.c

+0 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ 
#include <asm/machdep.h>

#include <asm/btext.h>

#include <asm/tlb.h>

#include <asm/bootinfo.h>

#include <asm/prom.h>

#include <asm/lmb.h>

#include <asm/sections.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE