diff options
Diffstat (limited to 'arch/powerpc')
69 files changed, 122 insertions, 57 deletions
diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/arch/powerpc/cpu/mpc83xx/Kconfig index 5d7650294d..18808da37d 100644 --- a/arch/powerpc/cpu/mpc83xx/Kconfig +++ b/arch/powerpc/cpu/mpc83xx/Kconfig @@ -106,10 +106,6 @@ config TARGET_KMCOGE5NE bool "Support kmcoge5ne" select VENDOR_KM -config TARGET_SUVD3 - bool "Support suvd3" - select VENDOR_KM - config TARGET_KMTEGR1 bool "Support kmtegr1" select VENDOR_KM diff --git a/arch/powerpc/cpu/mpc83xx/cpu.c b/arch/powerpc/cpu/mpc83xx/cpu.c index f4e25f1f59..49c75a0e50 100644 --- a/arch/powerpc/cpu/mpc83xx/cpu.c +++ b/arch/powerpc/cpu/mpc83xx/cpu.c @@ -12,12 +12,14 @@ #include <common.h> #include <cpu_func.h> #include <irq_func.h> +#include <net.h> #include <time.h> #include <vsprintf.h> #include <watchdog.h> #include <command.h> #include <mpc83xx.h> #include <asm/processor.h> +#include <linux/delay.h> #include <linux/libfdt.h> #include <tsec.h> #include <netdev.h> @@ -122,20 +124,13 @@ int checkcpu(void) #endif #ifndef CONFIG_SYSRESET -int -do_reset (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) +int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { ulong msr; -#ifndef MPC83xx_RESET - ulong addr; -#endif - volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR; puts("Resetting the board.\n"); -#ifdef MPC83xx_RESET - /* Interrupts and MMU off */ msr = mfmsr(); msr &= ~(MSR_EE | MSR_IR | MSR_DR); @@ -155,24 +150,6 @@ do_reset (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) /* perform reset, only one bit */ immap->reset.rcr = RCR_SWHR; -#else /* ! MPC83xx_RESET */ - - immap->reset.rmr = RMR_CSRE; /* Checkstop Reset enable */ - - /* Interrupts and MMU off */ - msr = mfmsr(); - msr &= ~(MSR_ME | MSR_EE | MSR_IR | MSR_DR); - mtmsr(msr); - - /* - * Trying to execute the next instruction at a non-existing address - * should cause a machine check, resulting in reset - */ - addr = CONFIG_SYS_RESET_ADDRESS; - - ((void (*)(void)) addr) (); -#endif /* MPC83xx_RESET */ - return 1; } #endif diff --git a/arch/powerpc/cpu/mpc83xx/cpu_init.c b/arch/powerpc/cpu/mpc83xx/cpu_init.c index af8facad53..438b14b162 100644 --- a/arch/powerpc/cpu/mpc83xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc83xx/cpu_init.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <asm-offsets.h> #include <mpc83xx.h> #include <ioports.h> #include <asm/io.h> @@ -11,6 +12,7 @@ #ifdef CONFIG_USB_EHCI_FSL #include <usb/ehci-ci.h> #endif +#include <linux/delay.h> #include "lblaw/lblaw.h" #include "elbc/elbc.h" diff --git a/arch/powerpc/cpu/mpc83xx/ecc.c b/arch/powerpc/cpu/mpc83xx/ecc.c index a6eb7cb97c..1343dd3d3a 100644 --- a/arch/powerpc/cpu/mpc83xx/ecc.c +++ b/arch/powerpc/cpu/mpc83xx/ecc.c @@ -96,7 +96,7 @@ void ecc_print_status(void) ddr->capture_attributes & ECC_CAPT_ATTR_VLD); } -int do_ecc(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) +int do_ecc(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { immap_t *immap = (immap_t *) CONFIG_SYS_IMMR; #ifdef CONFIG_SYS_FSL_DDR2 diff --git a/arch/powerpc/cpu/mpc83xx/interrupts.c b/arch/powerpc/cpu/mpc83xx/interrupts.c index e83895deab..d04f31df50 100644 --- a/arch/powerpc/cpu/mpc83xx/interrupts.c +++ b/arch/powerpc/cpu/mpc83xx/interrupts.c @@ -11,6 +11,7 @@ #include <irq_func.h> #include <mpc83xx.h> #include <asm/processor.h> +#include <asm/ptrace.h> DECLARE_GLOBAL_DATA_PTR; @@ -71,8 +72,8 @@ void timer_interrupt_cpu (struct pt_regs *regs) * irqinfo - print information about PCI devices */ -void -do_irqinfo(cmd_tbl_t *cmdtp, bd_t *bd, int flag, int argc, char * const argv[]) +void do_irqinfo(struct cmd_tbl *cmdtp, bd_t *bd, int flag, int argc, + char *const argv[]) { } diff --git a/arch/powerpc/cpu/mpc83xx/law.c b/arch/powerpc/cpu/mpc83xx/law.c index c49b4f784b..5e02f4094b 100644 --- a/arch/powerpc/cpu/mpc83xx/law.c +++ b/arch/powerpc/cpu/mpc83xx/law.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <log.h> #include <asm/fsl_law.h> #include <asm/mmu.h> #include <linux/log2.h> diff --git a/arch/powerpc/cpu/mpc83xx/pci.c b/arch/powerpc/cpu/mpc83xx/pci.c index 665ac378c8..f017985ae9 100644 --- a/arch/powerpc/cpu/mpc83xx/pci.c +++ b/arch/powerpc/cpu/mpc83xx/pci.c @@ -7,7 +7,10 @@ */ #include <common.h> +#include <init.h> #include <pci.h> +#include <asm/bitops.h> +#include <linux/delay.h> #if defined(CONFIG_OF_LIBFDT) #include <linux/libfdt.h> diff --git a/arch/powerpc/cpu/mpc83xx/pcie.c b/arch/powerpc/cpu/mpc83xx/pcie.c index b500ddd3f3..785d4805a4 100644 --- a/arch/powerpc/cpu/mpc83xx/pcie.c +++ b/arch/powerpc/cpu/mpc83xx/pcie.c @@ -11,6 +11,7 @@ #include <pci.h> #include <mpc83xx.h> #include <asm/io.h> +#include <linux/delay.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/powerpc/cpu/mpc83xx/serdes.c b/arch/powerpc/cpu/mpc83xx/serdes.c index 8242f95265..bb963ee5e2 100644 --- a/arch/powerpc/cpu/mpc83xx/serdes.c +++ b/arch/powerpc/cpu/mpc83xx/serdes.c @@ -14,6 +14,7 @@ #include <common.h> #include <asm/io.h> #include <asm/fsl_mpc83xx_serdes.h> +#include <linux/delay.h> /* SerDes registers */ #define FSL_SRDSCR0_OFFS 0x0 diff --git a/arch/powerpc/cpu/mpc83xx/spd_sdram.c b/arch/powerpc/cpu/mpc83xx/spd_sdram.c index 22506a5be5..aeff007fb0 100644 --- a/arch/powerpc/cpu/mpc83xx/spd_sdram.c +++ b/arch/powerpc/cpu/mpc83xx/spd_sdram.c @@ -14,6 +14,7 @@ #include <common.h> #include <cpu_func.h> +#include <log.h> #include <time.h> #include <vsprintf.h> #include <asm/processor.h> @@ -22,6 +23,8 @@ #include <spd.h> #include <asm/mmu.h> #include <spd_sdram.h> +#include <asm/bitops.h> +#include <linux/delay.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/powerpc/cpu/mpc83xx/speed.c b/arch/powerpc/cpu/mpc83xx/speed.c index e2fc0b1e8a..5c14aa1f32 100644 --- a/arch/powerpc/cpu/mpc83xx/speed.c +++ b/arch/powerpc/cpu/mpc83xx/speed.c @@ -523,7 +523,8 @@ int get_serial_clock(void) return get_bus_freq(0); } -static int do_clocks(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +static int do_clocks(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { char buf[32]; diff --git a/arch/powerpc/cpu/mpc83xx/spl_minimal.c b/arch/powerpc/cpu/mpc83xx/spl_minimal.c index 34c8187259..2c61f2b81d 100644 --- a/arch/powerpc/cpu/mpc83xx/spl_minimal.c +++ b/arch/powerpc/cpu/mpc83xx/spl_minimal.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <asm-offsets.h> #include <clock_legacy.h> #include <mpc83xx.h> #include <time.h> diff --git a/arch/powerpc/cpu/mpc83xx/traps.c b/arch/powerpc/cpu/mpc83xx/traps.c index 1c6c38b15f..c3cc119d65 100644 --- a/arch/powerpc/cpu/mpc83xx/traps.c +++ b/arch/powerpc/cpu/mpc83xx/traps.c @@ -12,6 +12,7 @@ */ #include <common.h> +#include <asm/ptrace.h> #include <command.h> #include <kgdb.h> #include <asm/processor.h> diff --git a/arch/powerpc/cpu/mpc85xx/bsc9132_serdes.c b/arch/powerpc/cpu/mpc85xx/bsc9132_serdes.c index 8604f4a8e8..b972cf3b5e 100644 --- a/arch/powerpc/cpu/mpc85xx/bsc9132_serdes.c +++ b/arch/powerpc/cpu/mpc85xx/bsc9132_serdes.c @@ -6,6 +6,7 @@ #include <config.h> #include <common.h> +#include <log.h> #include <asm/io.h> #include <asm/immap_85xx.h> #include <asm/fsl_serdes.h> diff --git a/arch/powerpc/cpu/mpc85xx/c29x_serdes.c b/arch/powerpc/cpu/mpc85xx/c29x_serdes.c index 97eeb489cb..34b58bb7f9 100644 --- a/arch/powerpc/cpu/mpc85xx/c29x_serdes.c +++ b/arch/powerpc/cpu/mpc85xx/c29x_serdes.c @@ -5,6 +5,7 @@ #include <config.h> #include <common.h> +#include <log.h> #include <asm/io.h> #include <asm/immap_85xx.h> #include <asm/fsl_serdes.h> diff --git a/arch/powerpc/cpu/mpc85xx/cmd_errata.c b/arch/powerpc/cpu/mpc85xx/cmd_errata.c index e455d8baf5..ff73596ba9 100644 --- a/arch/powerpc/cpu/mpc85xx/cmd_errata.c +++ b/arch/powerpc/cpu/mpc85xx/cmd_errata.c @@ -5,6 +5,7 @@ #include <common.h> #include <command.h> +#include <init.h> #include <linux/compiler.h> #include <fsl_errata.h> #include <asm/processor.h> @@ -128,7 +129,8 @@ static void check_erratum_a007212(void) } #endif -static int do_errata(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +static int do_errata(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { #ifdef CONFIG_SYS_FSL_ERRATUM_NMG_CPU_A011 extern int enable_cpu_a011_workaround; diff --git a/arch/powerpc/cpu/mpc85xx/commproc.c b/arch/powerpc/cpu/mpc85xx/commproc.c index 37e706238b..95215a0b82 100644 --- a/arch/powerpc/cpu/mpc85xx/commproc.c +++ b/arch/powerpc/cpu/mpc85xx/commproc.c @@ -22,6 +22,7 @@ * currently no deallocator for this memory. */ #include <common.h> +#include <asm-offsets.h> #include <asm/cpm_85xx.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c index 9f9eed165b..9bd573dbd6 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu.c +++ b/arch/powerpc/cpu/mpc85xx/cpu.c @@ -11,7 +11,9 @@ #include <config.h> #include <common.h> #include <cpu_func.h> +#include <init.h> #include <irq_func.h> +#include <log.h> #include <time.h> #include <vsprintf.h> #include <watchdog.h> @@ -27,6 +29,7 @@ #include <asm/processor.h> #include <fsl_ddr_sdram.h> #include <asm/ppc.h> +#include <linux/delay.h> DECLARE_GLOBAL_DATA_PTR; @@ -294,7 +297,7 @@ int checkcpu (void) /* ------------------------------------------------------------------------- */ -int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { /* Everything after the first generation of PQ3 parts has RSTCR */ #if defined(CONFIG_ARCH_MPC8540) || defined(CONFIG_ARCH_MPC8541) || \ diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c index a9f39dc583..4bca2671d5 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c @@ -12,6 +12,7 @@ #include <common.h> #include <env.h> #include <init.h> +#include <net.h> #include <watchdog.h> #include <asm/processor.h> #include <ioports.h> @@ -32,6 +33,7 @@ #include <fsl_usb.h> #include <hwconfig.h> #include <linux/compiler.h> +#include <linux/delay.h> #include "mp.h" #ifdef CONFIG_CHAIN_OF_TRUST #include <fsl_validate.h> diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init_early.c b/arch/powerpc/cpu/mpc85xx/cpu_init_early.c index 40cb24dd54..c519e8bd4b 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu_init_early.c +++ b/arch/powerpc/cpu/mpc85xx/cpu_init_early.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <asm-offsets.h> #include <asm/processor.h> #include <asm/mmu.h> #include <asm/fsl_law.h> diff --git a/arch/powerpc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c index 65f909fd1e..55f191f202 100644 --- a/arch/powerpc/cpu/mpc85xx/fdt.c +++ b/arch/powerpc/cpu/mpc85xx/fdt.c @@ -9,6 +9,7 @@ #include <common.h> #include <clock_legacy.h> #include <env.h> +#include <log.h> #include <time.h> #include <linux/libfdt.h> #include <fdt_support.h> diff --git a/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c b/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c index d7a633ddf2..ee5015ec8f 100644 --- a/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c +++ b/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c @@ -4,11 +4,13 @@ */ #include <common.h> +#include <log.h> #include <asm/fsl_serdes.h> #include <asm/immap_85xx.h> #include <asm/io.h> #include <asm/processor.h> #include <asm/fsl_law.h> +#include <linux/delay.h> #include <linux/errno.h> #include <fsl_errata.h> #include "fsl_corenet2_serdes.h" diff --git a/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c b/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c index ebdcd29c13..f5126e2c8a 100644 --- a/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c +++ b/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c @@ -5,6 +5,7 @@ #include <common.h> #include <env.h> +#include <log.h> #include <time.h> #ifdef CONFIG_SYS_P4080_ERRATUM_SERDES8 #include <hwconfig.h> @@ -14,6 +15,7 @@ #include <asm/io.h> #include <asm/processor.h> #include <asm/fsl_law.h> +#include <linux/delay.h> #include <linux/errno.h> #include "fsl_corenet_serdes.h" diff --git a/arch/powerpc/cpu/mpc85xx/interrupts.c b/arch/powerpc/cpu/mpc85xx/interrupts.c index 6f539d2677..4ad762683f 100644 --- a/arch/powerpc/cpu/mpc85xx/interrupts.c +++ b/arch/powerpc/cpu/mpc85xx/interrupts.c @@ -12,6 +12,7 @@ #include <common.h> #include <irq_func.h> +#include <log.h> #include <time.h> #include <watchdog.h> #include <command.h> @@ -20,6 +21,7 @@ #ifdef CONFIG_POST #include <post.h> #endif +#include <asm/ptrace.h> void interrupt_init_cpu(unsigned *decrementer_count) { @@ -102,7 +104,7 @@ void timer_interrupt_cpu(struct pt_regs *regs) #if defined(CONFIG_CMD_IRQ) /* irqinfo - print information about PCI devices,not implemented. */ -int do_irqinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int do_irqinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { return 0; } diff --git a/arch/powerpc/cpu/mpc85xx/liodn.c b/arch/powerpc/cpu/mpc85xx/liodn.c index e7703b8a49..e552378e78 100644 --- a/arch/powerpc/cpu/mpc85xx/liodn.c +++ b/arch/powerpc/cpu/mpc85xx/liodn.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <log.h> #include <linux/libfdt.h> #include <fdt_support.h> diff --git a/arch/powerpc/cpu/mpc85xx/mp.c b/arch/powerpc/cpu/mpc85xx/mp.c index 9757bffe02..8822cf29fe 100644 --- a/arch/powerpc/cpu/mpc85xx/mp.c +++ b/arch/powerpc/cpu/mpc85xx/mp.c @@ -6,6 +6,7 @@ #include <common.h> #include <cpu_func.h> #include <env.h> +#include <log.h> #include <asm/processor.h> #include <env.h> #include <ioports.h> @@ -14,6 +15,7 @@ #include <asm/mmu.h> #include <asm/fsl_law.h> #include <fsl_ddr_sdram.h> +#include <linux/delay.h> #include "mp.h" DECLARE_GLOBAL_DATA_PTR; @@ -140,7 +142,7 @@ static u8 boot_entry_map[4] = { BOOT_ENTRY_R3_LOWER, }; -int cpu_release(u32 nr, int argc, char * const argv[]) +int cpu_release(u32 nr, int argc, char *const argv[]) { u32 i, val, *table = (u32 *)&__spin_table + nr * NUM_BOOT_ENTRY; u64 boot_addr; diff --git a/arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c index c4c4154ac3..111692f15d 100644 --- a/arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c +++ b/arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c @@ -6,6 +6,7 @@ #include <config.h> #include <common.h> +#include <log.h> #include <asm/io.h> #include <asm/immap_85xx.h> #include <asm/fsl_serdes.h> diff --git a/arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c index bdcf46ed11..f3b5450ad5 100644 --- a/arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c +++ b/arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c @@ -5,6 +5,7 @@ #include <config.h> #include <common.h> +#include <log.h> #include <asm/io.h> #include <asm/immap_85xx.h> #include <asm/fsl_serdes.h> diff --git a/arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c index 99bab9e8ef..2a5c3e3200 100644 --- a/arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c +++ b/arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c @@ -5,6 +5,7 @@ #include <config.h> #include <common.h> +#include <log.h> #include <asm/io.h> #include <asm/immap_85xx.h> #include <asm/fsl_serdes.h> diff --git a/arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c index 414c05868f..81b66c3fa6 100644 --- a/arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c +++ b/arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c @@ -5,6 +5,7 @@ #include <config.h> #include <common.h> +#include <log.h> #include <asm/io.h> #include <asm/immap_85xx.h> #include <asm/fsl_serdes.h> diff --git a/arch/powerpc/cpu/mpc85xx/mpc8569_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8569_serdes.c index 637522861e..eb54b8252b 100644 --- a/arch/powerpc/cpu/mpc85xx/mpc8569_serdes.c +++ b/arch/powerpc/cpu/mpc85xx/mpc8569_serdes.c @@ -5,6 +5,7 @@ #include <config.h> #include <common.h> +#include <log.h> #include <asm/io.h> #include <asm/immap_85xx.h> #include <asm/fsl_serdes.h> diff --git a/arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c index 0e0c63a14f..1b4e614918 100644 --- a/arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c +++ b/arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c @@ -5,6 +5,7 @@ #include <config.h> #include <common.h> +#include <log.h> #include <asm/io.h> #include <asm/immap_85xx.h> #include <asm/fsl_serdes.h> diff --git a/arch/powerpc/cpu/mpc85xx/p1010_serdes.c b/arch/powerpc/cpu/mpc85xx/p1010_serdes.c index cc907c5894..8cba4222c4 100644 --- a/arch/powerpc/cpu/mpc85xx/p1010_serdes.c +++ b/arch/powerpc/cpu/mpc85xx/p1010_serdes.c @@ -6,6 +6,7 @@ #include <config.h> #include <common.h> +#include <log.h> #include <asm/io.h> #include <asm/immap_85xx.h> #include <asm/fsl_serdes.h> diff --git a/arch/powerpc/cpu/mpc85xx/p1021_serdes.c b/arch/powerpc/cpu/mpc85xx/p1021_serdes.c index 509051047b..6b8e447e94 100644 --- a/arch/powerpc/cpu/mpc85xx/p1021_serdes.c +++ b/arch/powerpc/cpu/mpc85xx/p1021_serdes.c @@ -5,9 +5,11 @@ #include <config.h> #include <common.h> +#include <log.h> #include <asm/io.h> #include <asm/immap_85xx.h> #include <asm/fsl_serdes.h> +#include <linux/delay.h> typedef struct serdes_85xx { u32 srdscr0; /* 0x00 - SRDS Control Register 0 */ diff --git a/arch/powerpc/cpu/mpc85xx/p1022_serdes.c b/arch/powerpc/cpu/mpc85xx/p1022_serdes.c index 4c51a72630..719cb4f3d4 100644 --- a/arch/powerpc/cpu/mpc85xx/p1022_serdes.c +++ b/arch/powerpc/cpu/mpc85xx/p1022_serdes.c @@ -6,6 +6,7 @@ #include <config.h> #include <common.h> +#include <log.h> #include <asm/io.h> #include <asm/immap_85xx.h> #include <asm/fsl_serdes.h> diff --git a/arch/powerpc/cpu/mpc85xx/p1023_serdes.c b/arch/powerpc/cpu/mpc85xx/p1023_serdes.c index 482172d4e0..bf5cac6199 100644 --- a/arch/powerpc/cpu/mpc85xx/p1023_serdes.c +++ b/arch/powerpc/cpu/mpc85xx/p1023_serdes.c @@ -6,6 +6,7 @@ #include <config.h> #include <common.h> +#include <log.h> #include <asm/io.h> #include <asm/immap_85xx.h> #include <asm/fsl_serdes.h> diff --git a/arch/powerpc/cpu/mpc85xx/p2020_serdes.c b/arch/powerpc/cpu/mpc85xx/p2020_serdes.c index 1e7ed43957..f36b1b64ed 100644 --- a/arch/powerpc/cpu/mpc85xx/p2020_serdes.c +++ b/arch/powerpc/cpu/mpc85xx/p2020_serdes.c @@ -5,6 +5,7 @@ #include <config.h> #include <common.h> +#include <log.h> #include <asm/io.h> #include <asm/immap_85xx.h> #include <asm/fsl_serdes.h> diff --git a/arch/powerpc/cpu/mpc85xx/pci.c b/arch/powerpc/cpu/mpc85xx/pci.c index 1d0213a513..9a6fc13b73 100644 --- a/arch/powerpc/cpu/mpc85xx/pci.c +++ b/arch/powerpc/cpu/mpc85xx/pci.c @@ -9,6 +9,7 @@ * PCI Configuration space access support for MPC85xx PCI Bridge */ #include <common.h> +#include <asm/bitops.h> #include <asm/cpm_85xx.h> #include <pci.h> diff --git a/arch/powerpc/cpu/mpc85xx/spl_minimal.c b/arch/powerpc/cpu/mpc85xx/spl_minimal.c index 972049b8e9..21b35db08d 100644 --- a/arch/powerpc/cpu/mpc85xx/spl_minimal.c +++ b/arch/powerpc/cpu/mpc85xx/spl_minimal.c @@ -8,6 +8,7 @@ #include <asm/global_data.h> #include <fsl_ifc.h> #include <asm/io.h> +#include <linux/delay.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/powerpc/cpu/mpc85xx/tlb.c b/arch/powerpc/cpu/mpc85xx/tlb.c index 808d953c52..4465ae7565 100644 --- a/arch/powerpc/cpu/mpc85xx/tlb.c +++ b/arch/powerpc/cpu/mpc85xx/tlb.c @@ -7,6 +7,7 @@ */ #include <common.h> +#include <asm/bitops.h> #include <asm/processor.h> #include <asm/mmu.h> #ifdef CONFIG_ADDR_MAP diff --git a/arch/powerpc/cpu/mpc85xx/traps.c b/arch/powerpc/cpu/mpc85xx/traps.c index bc2fc93e11..f37a45e269 100644 --- a/arch/powerpc/cpu/mpc85xx/traps.c +++ b/arch/powerpc/cpu/mpc85xx/traps.c @@ -20,6 +20,7 @@ */ #include <common.h> +#include <asm/ptrace.h> #include <command.h> #include <init.h> #include <irq_func.h> diff --git a/arch/powerpc/cpu/mpc86xx/cpu.c b/arch/powerpc/cpu/mpc86xx/cpu.c index 97b93f0213..9f5bce3992 100644 --- a/arch/powerpc/cpu/mpc86xx/cpu.c +++ b/arch/powerpc/cpu/mpc86xx/cpu.c @@ -7,6 +7,7 @@ #include <common.h> #include <cpu_func.h> +#include <log.h> #include <time.h> #include <vsprintf.h> #include <watchdog.h> @@ -107,7 +108,7 @@ checkcpu(void) } -int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { volatile immap_t *immap = (immap_t *)CONFIG_SYS_IMMR; volatile ccsr_gur_t *gur = &immap->im_gur; diff --git a/arch/powerpc/cpu/mpc86xx/cpu_init.c b/arch/powerpc/cpu/mpc86xx/cpu_init.c index 89add62dc1..a17091d2ff 100644 --- a/arch/powerpc/cpu/mpc86xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc86xx/cpu_init.c @@ -9,8 +9,10 @@ * cpu_init.c - low level cpu init */ +#include <asm-offsets.h> #include <config.h> #include <common.h> +#include <init.h> #include <mpc86xx.h> #include <asm/mmu.h> #include <asm/fsl_law.h> diff --git a/arch/powerpc/cpu/mpc86xx/interrupts.c b/arch/powerpc/cpu/mpc86xx/interrupts.c index eb8e73e41c..5a916600ed 100644 --- a/arch/powerpc/cpu/mpc86xx/interrupts.c +++ b/arch/powerpc/cpu/mpc86xx/interrupts.c @@ -16,6 +16,7 @@ #include <common.h> #include <irq_func.h> +#include <log.h> #include <mpc86xx.h> #include <command.h> #include <time.h> @@ -23,6 +24,7 @@ #ifdef CONFIG_POST #include <post.h> #endif +#include <asm/ptrace.h> void interrupt_init_cpu(unsigned *decrementer_count) { @@ -100,7 +102,7 @@ void irq_free_handler(int vec) /* * irqinfo - print information about PCI devices,not implemented. */ -int do_irqinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int do_irqinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { return 0; } diff --git a/arch/powerpc/cpu/mpc86xx/mp.c b/arch/powerpc/cpu/mpc86xx/mp.c index 07c4c079df..08d11ad4f2 100644 --- a/arch/powerpc/cpu/mpc86xx/mp.c +++ b/arch/powerpc/cpu/mpc86xx/mp.c @@ -67,7 +67,7 @@ int is_core_disabled(int nr) { return 0; } -int cpu_release(u32 nr, int argc, char * const argv[]) +int cpu_release(u32 nr, int argc, char *const argv[]) { /* dummy function so common/cmd_mp.c will build * should be implemented in the future */ diff --git a/arch/powerpc/cpu/mpc86xx/mpc8610_serdes.c b/arch/powerpc/cpu/mpc86xx/mpc8610_serdes.c index 0e0a90eb7b..ecc88ba437 100644 --- a/arch/powerpc/cpu/mpc86xx/mpc8610_serdes.c +++ b/arch/powerpc/cpu/mpc86xx/mpc8610_serdes.c @@ -5,6 +5,7 @@ #include <config.h> #include <common.h> +#include <log.h> #include <asm/io.h> #include <asm/immap_86xx.h> #include <asm/fsl_serdes.h> diff --git a/arch/powerpc/cpu/mpc86xx/mpc8641_serdes.c b/arch/powerpc/cpu/mpc86xx/mpc8641_serdes.c index d272d4ba29..4df446618c 100644 --- a/arch/powerpc/cpu/mpc86xx/mpc8641_serdes.c +++ b/arch/powerpc/cpu/mpc86xx/mpc8641_serdes.c @@ -5,6 +5,7 @@ #include <config.h> #include <common.h> +#include <log.h> #include <asm/io.h> #include <asm/immap_86xx.h> #include <asm/fsl_serdes.h> diff --git a/arch/powerpc/cpu/mpc86xx/traps.c b/arch/powerpc/cpu/mpc86xx/traps.c index 79bab91367..c0161e3379 100644 --- a/arch/powerpc/cpu/mpc86xx/traps.c +++ b/arch/powerpc/cpu/mpc86xx/traps.c @@ -14,6 +14,7 @@ */ #include <common.h> +#include <asm/ptrace.h> #include <command.h> #include <init.h> #include <kgdb.h> diff --git a/arch/powerpc/cpu/mpc8xx/cpu.c b/arch/powerpc/cpu/mpc8xx/cpu.c index 4a1698d3bc..1b7c7fa01b 100644 --- a/arch/powerpc/cpu/mpc8xx/cpu.c +++ b/arch/powerpc/cpu/mpc8xx/cpu.c @@ -18,6 +18,7 @@ #include <common.h> #include <cpu_func.h> +#include <net.h> #include <time.h> #include <vsprintf.h> #include <watchdog.h> @@ -194,7 +195,7 @@ void upmconfig(uint upm, uint *table, uint size) /* ------------------------------------------------------------------------- */ -int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { ulong msr, addr; diff --git a/arch/powerpc/cpu/mpc8xx/cpu_init.c b/arch/powerpc/cpu/mpc8xx/cpu_init.c index 8bd6d0fbcf..c8d06b0508 100644 --- a/arch/powerpc/cpu/mpc8xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc8xx/cpu_init.c @@ -5,6 +5,7 @@ */ #include <common.h> +#include <init.h> #include <watchdog.h> #include <mpc8xx.h> diff --git a/arch/powerpc/cpu/mpc8xx/immap.c b/arch/powerpc/cpu/mpc8xx/immap.c index 442c01ac6f..e5b62e9f4a 100644 --- a/arch/powerpc/cpu/mpc8xx/immap.c +++ b/arch/powerpc/cpu/mpc8xx/immap.c @@ -18,7 +18,8 @@ DECLARE_GLOBAL_DATA_PTR; -static int do_siuinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +static int do_siuinfo(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { immap_t __iomem *immap = (immap_t __iomem *)CONFIG_SYS_IMMR; sysconf8xx_t __iomem *sc = &immap->im_siu_conf; @@ -35,8 +36,8 @@ static int do_siuinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return 0; } -static int do_memcinfo(cmd_tbl_t *cmdtp, int flag, int argc, - char * const argv[]) +static int do_memcinfo(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { immap_t __iomem *immap = (immap_t __iomem *)CONFIG_SYS_IMMR; memctl8xx_t __iomem *memctl = &immap->im_memctl; @@ -58,7 +59,8 @@ static int do_memcinfo(cmd_tbl_t *cmdtp, int flag, int argc, return 0; } -static int do_carinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +static int do_carinfo(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { immap_t __iomem *immap = (immap_t __iomem *)CONFIG_SYS_IMMR; car8xx_t __iomem *car = &immap->im_clkrst; @@ -119,7 +121,8 @@ static void binary(char *label, uint value, int nbits) #define PC_NBITS 12 #define PD_NBITS 13 -static int do_iopinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +static int do_iopinfo(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { immap_t __iomem *immap = (immap_t __iomem *)CONFIG_SYS_IMMR; iop8xx_t __iomem *iop = &immap->im_ioport; @@ -172,7 +175,8 @@ static int do_iopinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) * this needs a clean up for smaller tighter code * use *uint and set the address based on cmd + port */ -static int do_iopset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +static int do_iopset(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { uint rcode = 0; iopin_t iopin; @@ -328,7 +332,8 @@ static void prbrg(int n, uint val) putc('\n'); } -static int do_brginfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +static int do_brginfo(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { immap_t __iomem *immap = (immap_t __iomem *)CONFIG_SYS_IMMR; cpm8xx_t __iomem *cp = &immap->im_cpm; diff --git a/arch/powerpc/cpu/mpc8xx/interrupts.c b/arch/powerpc/cpu/mpc8xx/interrupts.c index 3efe8956ec..eef1951f2f 100644 --- a/arch/powerpc/cpu/mpc8xx/interrupts.c +++ b/arch/powerpc/cpu/mpc8xx/interrupts.c @@ -12,6 +12,7 @@ #include <asm/cpm_8xx.h> #include <asm/processor.h> #include <asm/io.h> +#include <asm/ptrace.h> /************************************************************************/ diff --git a/arch/powerpc/cpu/mpc8xx/traps.c b/arch/powerpc/cpu/mpc8xx/traps.c index 899bcd8618..56794b08a1 100644 --- a/arch/powerpc/cpu/mpc8xx/traps.c +++ b/arch/powerpc/cpu/mpc8xx/traps.c @@ -16,6 +16,7 @@ */ #include <common.h> +#include <asm/ptrace.h> #include <command.h> #include <asm/processor.h> diff --git a/arch/powerpc/cpu/mpc8xxx/cpu.c b/arch/powerpc/cpu/mpc8xxx/cpu.c index ed482a9c09..da0a80e6fc 100644 --- a/arch/powerpc/cpu/mpc8xxx/cpu.c +++ b/arch/powerpc/cpu/mpc8xxx/cpu.c @@ -11,6 +11,8 @@ #include <common.h> #include <command.h> #include <cpu_func.h> +#include <init.h> +#include <net.h> #include <tsec.h> #include <fm_eth.h> #include <netdev.h> diff --git a/arch/powerpc/cpu/mpc8xxx/fsl_lbc.c b/arch/powerpc/cpu/mpc8xxx/fsl_lbc.c index afcb75ba17..29489b46e6 100644 --- a/arch/powerpc/cpu/mpc8xxx/fsl_lbc.c +++ b/arch/powerpc/cpu/mpc8xxx/fsl_lbc.c @@ -5,6 +5,7 @@ #include <common.h> #include <hang.h> +#include <init.h> #include <asm/fsl_lbc.h> #ifdef CONFIG_MPC83xx diff --git a/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c b/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c index d81af70f44..2c378b7615 100644 --- a/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c +++ b/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c @@ -6,6 +6,8 @@ */ #include <common.h> +#include <log.h> +#include <linux/bitops.h> #include <linux/log2.h> #include <malloc.h> #include <asm/fsl_pamu.h> diff --git a/arch/powerpc/cpu/mpc8xxx/law.c b/arch/powerpc/cpu/mpc8xxx/law.c index ca9e6aa8eb..e388386ad4 100644 --- a/arch/powerpc/cpu/mpc8xxx/law.c +++ b/arch/powerpc/cpu/mpc8xxx/law.c @@ -7,6 +7,7 @@ */ #include <common.h> +#include <asm/bitops.h> #include <linux/compiler.h> #include <asm/fsl_law.h> #include <asm/io.h> diff --git a/arch/powerpc/cpu/mpc8xxx/pamu_table.c b/arch/powerpc/cpu/mpc8xxx/pamu_table.c index 7b4690abc9..7dd71d2e0c 100644 --- a/arch/powerpc/cpu/mpc8xxx/pamu_table.c +++ b/arch/powerpc/cpu/mpc8xxx/pamu_table.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <log.h> #include <asm/fsl_pamu.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/powerpc/cpu/mpc8xxx/srio.c b/arch/powerpc/cpu/mpc8xxx/srio.c index a1f9403559..c73cf9319c 100644 --- a/arch/powerpc/cpu/mpc8xxx/srio.c +++ b/arch/powerpc/cpu/mpc8xxx/srio.c @@ -5,10 +5,12 @@ #include <common.h> #include <config.h> +#include <log.h> #include <time.h> #include <asm/fsl_law.h> #include <asm/fsl_serdes.h> #include <asm/fsl_srio.h> +#include <linux/delay.h> #include <linux/errno.h> #ifdef CONFIG_SRIO_PCIE_BOOT_MASTER diff --git a/arch/powerpc/include/asm/fsl_i2c.h b/arch/powerpc/include/asm/fsl_i2c.h index fbf32b9a07..73105fa8e4 100644 --- a/arch/powerpc/include/asm/fsl_i2c.h +++ b/arch/powerpc/include/asm/fsl_i2c.h @@ -14,6 +14,7 @@ #define _ASM_FSL_I2C_H_ #include <asm/types.h> +#include <linux/compiler.h> typedef struct fsl_i2c_base { diff --git a/arch/powerpc/include/asm/mmu.h b/arch/powerpc/include/asm/mmu.h index 82e5f9ffc7..353dc4e874 100644 --- a/arch/powerpc/include/asm/mmu.h +++ b/arch/powerpc/include/asm/mmu.h @@ -7,6 +7,7 @@ #ifndef __ASSEMBLY__ /* Hardware Page Table Entry */ +#include <linux/bitops.h> typedef struct _PTE { #ifdef CONFIG_PPC64BRIDGE unsigned long long vsid:52; diff --git a/arch/powerpc/include/asm/u-boot.h b/arch/powerpc/include/asm/u-boot.h index 1841565d0a..19b3c0db5f 100644 --- a/arch/powerpc/include/asm/u-boot.h +++ b/arch/powerpc/include/asm/u-boot.h @@ -13,6 +13,8 @@ #ifndef __U_BOOT_H__ #define __U_BOOT_H__ +#include <config.h> + /* For image.h:image_check_target_arch() */ #define IH_ARCH_DEFAULT IH_ARCH_PPC diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c index 390e8c0673..cd92db0a92 100644 --- a/arch/powerpc/lib/bootm.c +++ b/arch/powerpc/lib/bootm.c @@ -8,9 +8,12 @@ #include <common.h> +#include <bootstage.h> #include <cpu_func.h> #include <env.h> #include <init.h> +#include <lmb.h> +#include <log.h> #include <watchdog.h> #include <command.h> #include <image.h> @@ -51,8 +54,8 @@ static void boot_jump_linux(bootm_headers_t *images) kernel = (void (*)(bd_t *, ulong, ulong, ulong, ulong, ulong, ulong))images->ep; - debug ("## Transferring control to Linux (at address %08lx) ...\n", - (ulong)kernel); + debug("## Transferring control to Linux (at address %08lx) ...\n", + (ulong)kernel); bootstage_mark(BOOTSTAGE_ID_RUN_OS); @@ -79,7 +82,7 @@ static void boot_jump_linux(bootm_headers_t *images) * r8: 0 * r9: 0 */ - debug (" Booting using OF flat tree...\n"); + debug(" Booting using OF flat tree...\n"); WATCHDOG_RESET (); (*kernel) ((bd_t *)of_flat_tree, 0, 0, EPAPR_MAGIC, env_get_bootm_mapsize(), 0, 0); @@ -103,7 +106,7 @@ static void boot_jump_linux(bootm_headers_t *images) ulong initrd_end = images->initrd_end; bd_t *kbd = images->kbd; - debug (" Booting using board info...\n"); + debug(" Booting using board info...\n"); WATCHDOG_RESET (); (*kernel) (kbd, initrd_start, initrd_end, cmd_start, cmd_end, 0, 0); @@ -147,7 +150,7 @@ void arch_lmb_reserve(struct lmb *lmb) * pointer. */ sp = get_sp(); - debug ("## Current stack ends at 0x%08lx\n", sp); + debug("## Current stack ends at 0x%08lx\n", sp); /* adjust sp by 4K to be safe */ sp -= 4096; @@ -230,8 +233,8 @@ static int boot_body_linux(bootm_headers_t *images) return 0; } -noinline -int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *images) +noinline int do_bootm_linux(int flag, int argc, char *const argv[], + bootm_headers_t *images) { int ret; diff --git a/arch/powerpc/lib/extable.c b/arch/powerpc/lib/extable.c index 683fd53b6a..7e9d4f22f3 100644 --- a/arch/powerpc/lib/extable.c +++ b/arch/powerpc/lib/extable.c @@ -6,6 +6,7 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */ #include <common.h> +#include <log.h> /* * The exception table consists of pairs of addresses: the first is the diff --git a/arch/powerpc/lib/interrupts.c b/arch/powerpc/lib/interrupts.c index 64ee0cc210..73f270002c 100644 --- a/arch/powerpc/lib/interrupts.c +++ b/arch/powerpc/lib/interrupts.c @@ -14,6 +14,7 @@ #ifdef CONFIG_LED_STATUS #include <status_led.h> #endif +#include <asm/ptrace.h> #ifndef CONFIG_MPC83XX_TIMER #ifndef CONFIG_SYS_WATCHDOG_FREQ diff --git a/arch/powerpc/lib/kgdb.c b/arch/powerpc/lib/kgdb.c index f580c023e5..8727d18884 100644 --- a/arch/powerpc/lib/kgdb.c +++ b/arch/powerpc/lib/kgdb.c @@ -1,6 +1,7 @@ #include <common.h> #include <command.h> #include <kgdb.h> +#include <asm/ptrace.h> #include <asm/signal.h> #include <asm/processor.h> @@ -252,7 +253,7 @@ kgdb_putregs(struct pt_regs *regs, char *buf, int length) the debugger. */ void -kgdb_breakpoint(int argc, char * const argv[]) +kgdb_breakpoint(int argc, char *const argv[]) { asm(" .globl breakinst\n\ breakinst: .long 0x7d821008\n\ diff --git a/arch/powerpc/lib/spl.c b/arch/powerpc/lib/spl.c index d90a6e27b9..d4a6057527 100644 --- a/arch/powerpc/lib/spl.c +++ b/arch/powerpc/lib/spl.c @@ -4,6 +4,7 @@ */ #include <common.h> #include <config.h> +#include <log.h> #include <spl.h> #include <image.h> #include <linux/compiler.h> diff --git a/arch/powerpc/lib/stack.c b/arch/powerpc/lib/stack.c index 9a956c221d..5840fe6349 100644 --- a/arch/powerpc/lib/stack.c +++ b/arch/powerpc/lib/stack.c @@ -11,6 +11,7 @@ * Marius Groeger <mgroeger@sysgo.de> */ #include <common.h> +#include <init.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/powerpc/lib/time.c b/arch/powerpc/lib/time.c index e1494fa129..8d6babfb83 100644 --- a/arch/powerpc/lib/time.c +++ b/arch/powerpc/lib/time.c @@ -5,8 +5,10 @@ */ #include <common.h> +#include <init.h> #include <time.h> #include <asm/io.h> +#include <linux/delay.h> /* ------------------------------------------------------------------------- */ |