Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] ppc: More compile fixes [POWERPC] ppc: Don't run prom_init_check for arch/ppc builds [POWERPC] ppc: Include <asm/cacheflush.h> in kernel/ppc_ksyms.c [POWERPC] ppc: Use ebony_defconfig for defconfig [POWERPC] Fix default cputable entries for e200 and e500 families
This commit is contained in:
commit
3c29970c02
|
@ -105,6 +105,9 @@ PHONY += systbl_chk
|
||||||
systbl_chk: $(src)/systbl_chk.sh $(obj)/systbl_chk.i
|
systbl_chk: $(src)/systbl_chk.sh $(obj)/systbl_chk.i
|
||||||
$(call cmd,systbl_chk)
|
$(call cmd,systbl_chk)
|
||||||
|
|
||||||
|
|
||||||
|
ifeq ($(CONFIG_PPC_MERGE),y)
|
||||||
|
|
||||||
$(obj)/built-in.o: prom_init_check
|
$(obj)/built-in.o: prom_init_check
|
||||||
|
|
||||||
quiet_cmd_prom_init_check = CALL $<
|
quiet_cmd_prom_init_check = CALL $<
|
||||||
|
@ -114,4 +117,7 @@ PHONY += prom_init_check
|
||||||
prom_init_check: $(src)/prom_init_check.sh $(obj)/prom_init.o
|
prom_init_check: $(src)/prom_init_check.sh $(obj)/prom_init.o
|
||||||
$(call cmd,prom_init_check)
|
$(call cmd,prom_init_check)
|
||||||
|
|
||||||
|
endif
|
||||||
|
|
||||||
|
|
||||||
clean-files := vmlinux.lds
|
clean-files := vmlinux.lds
|
||||||
|
|
|
@ -1484,6 +1484,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
|
||||||
.dcache_bsize = 32,
|
.dcache_bsize = 32,
|
||||||
.machine_check = machine_check_e200,
|
.machine_check = machine_check_e200,
|
||||||
.platform = "ppc5554",
|
.platform = "ppc5554",
|
||||||
|
}
|
||||||
#endif /* CONFIG_E200 */
|
#endif /* CONFIG_E200 */
|
||||||
#ifdef CONFIG_E500
|
#ifdef CONFIG_E500
|
||||||
{ /* e500 */
|
{ /* e500 */
|
||||||
|
@ -1533,6 +1534,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
|
||||||
.dcache_bsize = 32,
|
.dcache_bsize = 32,
|
||||||
.machine_check = machine_check_e500,
|
.machine_check = machine_check_e500,
|
||||||
.platform = "powerpc",
|
.platform = "powerpc",
|
||||||
|
}
|
||||||
#endif /* CONFIG_E500 */
|
#endif /* CONFIG_E500 */
|
||||||
#endif /* CONFIG_PPC32 */
|
#endif /* CONFIG_PPC32 */
|
||||||
};
|
};
|
||||||
|
|
|
@ -10,6 +10,7 @@ ifeq ($(CONFIG_PPC_MERGE),y)
|
||||||
obj-y := string.o alloc.o \
|
obj-y := string.o alloc.o \
|
||||||
checksum_$(CONFIG_WORD_SIZE).o
|
checksum_$(CONFIG_WORD_SIZE).o
|
||||||
obj-$(CONFIG_PPC32) += div64.o copy_32.o
|
obj-$(CONFIG_PPC32) += div64.o copy_32.o
|
||||||
|
obj-$(CONFIG_HAS_IOMEM) += devres.o
|
||||||
endif
|
endif
|
||||||
|
|
||||||
obj-$(CONFIG_PPC64) += copypage_64.o copyuser_64.o \
|
obj-$(CONFIG_PPC64) += copypage_64.o copyuser_64.o \
|
||||||
|
@ -23,4 +24,3 @@ obj-$(CONFIG_SMP) += locks.o
|
||||||
endif
|
endif
|
||||||
|
|
||||||
obj-$(CONFIG_PPC_LIB_RHEAP) += rheap.o
|
obj-$(CONFIG_PPC_LIB_RHEAP) += rheap.o
|
||||||
obj-$(CONFIG_HAS_IOMEM) += devres.o
|
|
||||||
|
|
|
@ -43,7 +43,7 @@ KBUILD_AFLAGS += $(cpu-as-y)
|
||||||
KBUILD_CFLAGS += $(cpu-as-y)
|
KBUILD_CFLAGS += $(cpu-as-y)
|
||||||
|
|
||||||
# Default to the common case.
|
# Default to the common case.
|
||||||
KBUILD_DEFCONFIG := common_defconfig
|
KBUILD_DEFCONFIG := ebony_defconfig
|
||||||
|
|
||||||
head-y := arch/ppc/kernel/head.o
|
head-y := arch/ppc/kernel/head.o
|
||||||
head-$(CONFIG_8xx) := arch/ppc/kernel/head_8xx.o
|
head-$(CONFIG_8xx) := arch/ppc/kernel/head_8xx.o
|
||||||
|
|
|
@ -24,6 +24,7 @@
|
||||||
#include <asm/checksum.h>
|
#include <asm/checksum.h>
|
||||||
#include <asm/pgtable.h>
|
#include <asm/pgtable.h>
|
||||||
#include <asm/tlbflush.h>
|
#include <asm/tlbflush.h>
|
||||||
|
#include <asm/cacheflush.h>
|
||||||
#include <linux/adb.h>
|
#include <linux/adb.h>
|
||||||
#include <linux/cuda.h>
|
#include <linux/cuda.h>
|
||||||
#include <linux/pmu.h>
|
#include <linux/pmu.h>
|
||||||
|
|
|
@ -36,6 +36,7 @@
|
||||||
#include <asm/nvram.h>
|
#include <asm/nvram.h>
|
||||||
#include <asm/xmon.h>
|
#include <asm/xmon.h>
|
||||||
#include <asm/ocp.h>
|
#include <asm/ocp.h>
|
||||||
|
#include <asm/irq.h>
|
||||||
|
|
||||||
#define USES_PPC_SYS (defined(CONFIG_MPC10X_BRIDGE) || defined(CONFIG_8260) || \
|
#define USES_PPC_SYS (defined(CONFIG_MPC10X_BRIDGE) || defined(CONFIG_8260) || \
|
||||||
defined(CONFIG_PPC_MPC52xx))
|
defined(CONFIG_PPC_MPC52xx))
|
||||||
|
|
|
@ -38,6 +38,7 @@
|
||||||
#include <linux/init.h>
|
#include <linux/init.h>
|
||||||
#include <linux/ioport.h>
|
#include <linux/ioport.h>
|
||||||
#include <linux/pci.h>
|
#include <linux/pci.h>
|
||||||
|
#include <linux/proc_fs.h>
|
||||||
|
|
||||||
#include <asm/sections.h>
|
#include <asm/sections.h>
|
||||||
#include <asm/mmu.h>
|
#include <asm/mmu.h>
|
||||||
|
|
|
@ -178,7 +178,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
extern inline void * xchg_ptr(void * m, void * val)
|
static inline void * xchg_ptr(void * m, void * val)
|
||||||
{
|
{
|
||||||
return (void *) xchg_u32(m, (unsigned long) val);
|
return (void *) xchg_u32(m, (unsigned long) val);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue