diff options
author | Paul Mackerras <paulus@samba.org> | 2006-03-28 17:03:19 +1100 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-03-28 17:03:19 +1100 |
commit | cf66c897d7fa07f57452b1a369aec37d97b11e31 (patch) | |
tree | eb74b71c2ff288f4d77423bb7e54c3c55ef08bf9 | |
parent | facee873de8da5fe709c194f98eb0f2cc642a38c (diff) | |
parent | 78af90629ce98c8383ea16928e110eb97b889be6 (diff) | |
download | linux-3.10-cf66c897d7fa07f57452b1a369aec37d97b11e31.tar.gz linux-3.10-cf66c897d7fa07f57452b1a369aec37d97b11e31.tar.bz2 linux-3.10-cf66c897d7fa07f57452b1a369aec37d97b11e31.zip |
Merge branch '85xx' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc
-rw-r--r-- | arch/powerpc/Kconfig.debug | 5 | ||||
-rw-r--r-- | arch/powerpc/Makefile | 6 | ||||
-rw-r--r-- | arch/powerpc/configs/mpc8540_ads_defconfig | 43 | ||||
-rw-r--r-- | arch/powerpc/kernel/setup_32.c | 6 | ||||
-rw-r--r-- | arch/powerpc/math-emu/Makefile (renamed from arch/ppc/math-emu/Makefile) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/double.h (renamed from arch/ppc/math-emu/double.h) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fabs.c (renamed from arch/ppc/math-emu/fabs.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fadd.c (renamed from arch/ppc/math-emu/fadd.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fadds.c (renamed from arch/ppc/math-emu/fadds.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fcmpo.c (renamed from arch/ppc/math-emu/fcmpo.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fcmpu.c (renamed from arch/ppc/math-emu/fcmpu.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fctiw.c (renamed from arch/ppc/math-emu/fctiw.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fctiwz.c (renamed from arch/ppc/math-emu/fctiwz.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fdiv.c (renamed from arch/ppc/math-emu/fdiv.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fdivs.c (renamed from arch/ppc/math-emu/fdivs.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fmadd.c (renamed from arch/ppc/math-emu/fmadd.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fmadds.c (renamed from arch/ppc/math-emu/fmadds.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fmr.c (renamed from arch/ppc/math-emu/fmr.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fmsub.c (renamed from arch/ppc/math-emu/fmsub.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fmsubs.c (renamed from arch/ppc/math-emu/fmsubs.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fmul.c (renamed from arch/ppc/math-emu/fmul.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fmuls.c (renamed from arch/ppc/math-emu/fmuls.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fnabs.c (renamed from arch/ppc/math-emu/fnabs.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fneg.c (renamed from arch/ppc/math-emu/fneg.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fnmadd.c (renamed from arch/ppc/math-emu/fnmadd.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fnmadds.c (renamed from arch/ppc/math-emu/fnmadds.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fnmsub.c (renamed from arch/ppc/math-emu/fnmsub.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fnmsubs.c (renamed from arch/ppc/math-emu/fnmsubs.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fres.c (renamed from arch/ppc/math-emu/fres.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/frsp.c (renamed from arch/ppc/math-emu/frsp.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/frsqrte.c (renamed from arch/ppc/math-emu/frsqrte.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fsel.c (renamed from arch/ppc/math-emu/fsel.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fsqrt.c (renamed from arch/ppc/math-emu/fsqrt.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fsqrts.c (renamed from arch/ppc/math-emu/fsqrts.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fsub.c (renamed from arch/ppc/math-emu/fsub.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fsubs.c (renamed from arch/ppc/math-emu/fsubs.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/lfd.c (renamed from arch/ppc/math-emu/lfd.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/lfs.c (renamed from arch/ppc/math-emu/lfs.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/math.c (renamed from arch/ppc/math-emu/math.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/mcrfs.c (renamed from arch/ppc/math-emu/mcrfs.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/mffs.c (renamed from arch/ppc/math-emu/mffs.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/mtfsb0.c (renamed from arch/ppc/math-emu/mtfsb0.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/mtfsb1.c (renamed from arch/ppc/math-emu/mtfsb1.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/mtfsf.c (renamed from arch/ppc/math-emu/mtfsf.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/mtfsfi.c (renamed from arch/ppc/math-emu/mtfsfi.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/op-1.h (renamed from arch/ppc/math-emu/op-1.h) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/op-2.h (renamed from arch/ppc/math-emu/op-2.h) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/op-4.h (renamed from arch/ppc/math-emu/op-4.h) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/op-common.h (renamed from arch/ppc/math-emu/op-common.h) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/sfp-machine.h (renamed from arch/ppc/math-emu/sfp-machine.h) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/single.h (renamed from arch/ppc/math-emu/single.h) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/soft-fp.h (renamed from arch/ppc/math-emu/soft-fp.h) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/stfd.c (renamed from arch/ppc/math-emu/stfd.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/stfiwx.c (renamed from arch/ppc/math-emu/stfiwx.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/stfs.c (renamed from arch/ppc/math-emu/stfs.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/types.c (renamed from arch/ppc/math-emu/types.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/udivmodti4.c (renamed from arch/ppc/math-emu/udivmodti4.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/platforms/85xx/Kconfig | 1 | ||||
-rw-r--r-- | arch/ppc/Makefile | 2 |
59 files changed, 28 insertions, 35 deletions
diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug index 9254806f703..8d48e9e7162 100644 --- a/arch/powerpc/Kconfig.debug +++ b/arch/powerpc/Kconfig.debug @@ -110,11 +110,6 @@ config SERIAL_TEXT_DEBUG depends on 4xx || LOPEC || MV64X60 || PPLUS || PRPMC800 || \ PPC_GEN550 || PPC_MPC52xx -config PPC_OCP - bool - depends on IBM_OCP || XILINX_OCP - default y - choice prompt "Early debugging (dangerous)" bool diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile index 9586899de68..6ec84d37a33 100644 --- a/arch/powerpc/Makefile +++ b/arch/powerpc/Makefile @@ -129,12 +129,8 @@ core-y += arch/powerpc/kernel/ \ arch/powerpc/lib/ \ arch/powerpc/sysdev/ \ arch/powerpc/platforms/ -core-$(CONFIG_MATH_EMULATION) += arch/ppc/math-emu/ +core-$(CONFIG_MATH_EMULATION) += arch/powerpc/math-emu/ core-$(CONFIG_XMON) += arch/powerpc/xmon/ -core-$(CONFIG_APUS) += arch/ppc/amiga/ -drivers-$(CONFIG_8xx) += arch/ppc/8xx_io/ -drivers-$(CONFIG_4xx) += arch/ppc/4xx_io/ -drivers-$(CONFIG_CPM2) += arch/ppc/8260_io/ drivers-$(CONFIG_OPROFILE) += arch/powerpc/oprofile/ diff --git a/arch/powerpc/configs/mpc8540_ads_defconfig b/arch/powerpc/configs/mpc8540_ads_defconfig index 2a8290ee15c..7f0780f1aa3 100644 --- a/arch/powerpc/configs/mpc8540_ads_defconfig +++ b/arch/powerpc/configs/mpc8540_ads_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: -# Sat Jan 14 15:57:54 2006 +# Linux kernel version: 2.6.16 +# Mon Mar 27 23:37:36 2006 # # CONFIG_PPC64 is not set CONFIG_PPC32=y @@ -9,6 +9,7 @@ CONFIG_PPC_MERGE=y CONFIG_MMU=y CONFIG_GENERIC_HARDIRQS=y CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_PPC=y CONFIG_EARLY_PRINTK=y @@ -18,6 +19,7 @@ CONFIG_ARCH_MAY_HAVE_PC_FDC=y CONFIG_PPC_OF=y CONFIG_PPC_UDBG_16550=y # CONFIG_GENERIC_TBSYNC is not set +CONFIG_DEFAULT_UIMAGE=y # # Processor support @@ -42,7 +44,6 @@ CONFIG_SPE=y # Code maturity level options # CONFIG_EXPERIMENTAL=y -CONFIG_CLEAN_COMPILE=y CONFIG_BROKEN_ON_SMP=y CONFIG_INIT_ENV_ARG_LIMIT=32 @@ -58,6 +59,7 @@ CONFIG_SYSVIPC=y CONFIG_SYSCTL=y # CONFIG_AUDIT is not set # CONFIG_IKCONFIG is not set +# CONFIG_RELAY is not set CONFIG_INITRAMFS_SOURCE="" # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_EMBEDDED=y @@ -72,10 +74,6 @@ CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_EPOLL=y CONFIG_SHMEM=y -CONFIG_CC_ALIGN_FUNCTIONS=0 -CONFIG_CC_ALIGN_LABELS=0 -CONFIG_CC_ALIGN_LOOPS=0 -CONFIG_CC_ALIGN_JUMPS=0 CONFIG_SLAB=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 @@ -90,6 +88,8 @@ CONFIG_BASE_SMALL=0 # Block layer # # CONFIG_LBD is not set +# CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_LSF is not set # # IO Schedulers @@ -183,6 +183,7 @@ CONFIG_NET=y # # Networking options # +# CONFIG_NETDEBUG is not set CONFIG_PACKET=y # CONFIG_PACKET_MMAP is not set CONFIG_UNIX=y @@ -220,6 +221,11 @@ CONFIG_TCP_CONG_BIC=y # SCTP Configuration (EXPERIMENTAL) # # CONFIG_IP_SCTP is not set + +# +# TIPC Configuration (EXPERIMENTAL) +# +# CONFIG_TIPC is not set # CONFIG_ATM is not set # CONFIG_BRIDGE is not set # CONFIG_VLAN_8021Q is not set @@ -229,11 +235,6 @@ CONFIG_TCP_CONG_BIC=y # CONFIG_ATALK is not set # CONFIG_X25 is not set # CONFIG_LAPB is not set - -# -# TIPC Configuration (EXPERIMENTAL) -# -# CONFIG_TIPC is not set # CONFIG_NET_DIVERT is not set # CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set @@ -487,6 +488,12 @@ CONFIG_GEN_RTC=y # CONFIG_I2C is not set # +# SPI support +# +# CONFIG_SPI is not set +# CONFIG_SPI_MASTER is not set + +# # Dallas's 1-wire bus # # CONFIG_W1 is not set @@ -496,6 +503,7 @@ CONFIG_GEN_RTC=y # CONFIG_HWMON=y # CONFIG_HWMON_VID is not set +# CONFIG_SENSORS_F71805F is not set # CONFIG_HWMON_DEBUG_CHIP is not set # @@ -503,10 +511,6 @@ CONFIG_HWMON=y # # -# Multimedia Capabilities Port drivers -# - -# # Multimedia devices # # CONFIG_VIDEO_DEV is not set @@ -531,6 +535,7 @@ CONFIG_HWMON=y # # CONFIG_USB_ARCH_HAS_HCD is not set # CONFIG_USB_ARCH_HAS_OHCI is not set +# CONFIG_USB_ARCH_HAS_EHCI is not set # # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' @@ -551,7 +556,7 @@ CONFIG_HWMON=y # # -# SN Devices +# EDAC - error detection and reporting (RAS) (EXPERIMENTAL) # # @@ -603,7 +608,6 @@ CONFIG_SYSFS=y CONFIG_TMPFS=y # CONFIG_HUGETLB_PAGE is not set CONFIG_RAMFS=y -# CONFIG_RELAYFS_FS is not set # CONFIG_CONFIGFS_FS is not set # @@ -658,6 +662,7 @@ CONFIG_PARTITION_ADVANCED=y # CONFIG_SGI_PARTITION is not set # CONFIG_ULTRIX_PARTITION is not set # CONFIG_SUN_PARTITION is not set +# CONFIG_KARMA_PARTITION is not set # CONFIG_EFI_PARTITION is not set # @@ -695,6 +700,8 @@ CONFIG_DEBUG_MUTEXES=y # CONFIG_DEBUG_INFO is not set # CONFIG_DEBUG_FS is not set # CONFIG_DEBUG_VM is not set +# CONFIG_UNWIND_INFO is not set +CONFIG_FORCED_INLINING=y # CONFIG_RCU_TORTURE_TEST is not set # CONFIG_DEBUGGER is not set # CONFIG_BDI_SWITCH is not set diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c index e39f830317a..a2c89435abe 100644 --- a/arch/powerpc/kernel/setup_32.c +++ b/arch/powerpc/kernel/setup_32.c @@ -351,12 +351,6 @@ void __init setup_arch(char **cmdline_p) do_init_bootmem(); if ( ppc_md.progress ) ppc_md.progress("setup_arch: bootmem", 0x3eab); -#ifdef CONFIG_PPC_OCP - /* Initialize OCP device list */ - ocp_early_init(); - if ( ppc_md.progress ) ppc_md.progress("ocp: exit", 0x3eab); -#endif - #ifdef CONFIG_DUMMY_CONSOLE conswitchp = &dummy_con; #endif diff --git a/arch/ppc/math-emu/Makefile b/arch/powerpc/math-emu/Makefile index 754143e8936..754143e8936 100644 --- a/arch/ppc/math-emu/Makefile +++ b/arch/powerpc/math-emu/Makefile diff --git a/arch/ppc/math-emu/double.h b/arch/powerpc/math-emu/double.h index ffba8b67f05..ffba8b67f05 100644 --- a/arch/ppc/math-emu/double.h +++ b/arch/powerpc/math-emu/double.h diff --git a/arch/ppc/math-emu/fabs.c b/arch/powerpc/math-emu/fabs.c index 41f0617f3d3..41f0617f3d3 100644 --- a/arch/ppc/math-emu/fabs.c +++ b/arch/powerpc/math-emu/fabs.c diff --git a/arch/ppc/math-emu/fadd.c b/arch/powerpc/math-emu/fadd.c index fc8836488b6..fc8836488b6 100644 --- a/arch/ppc/math-emu/fadd.c +++ b/arch/powerpc/math-emu/fadd.c diff --git a/arch/ppc/math-emu/fadds.c b/arch/powerpc/math-emu/fadds.c index 93025b6c8f3..93025b6c8f3 100644 --- a/arch/ppc/math-emu/fadds.c +++ b/arch/powerpc/math-emu/fadds.c diff --git a/arch/ppc/math-emu/fcmpo.c b/arch/powerpc/math-emu/fcmpo.c index 4efac394b4c..4efac394b4c 100644 --- a/arch/ppc/math-emu/fcmpo.c +++ b/arch/powerpc/math-emu/fcmpo.c diff --git a/arch/ppc/math-emu/fcmpu.c b/arch/powerpc/math-emu/fcmpu.c index b7e33176e61..b7e33176e61 100644 --- a/arch/ppc/math-emu/fcmpu.c +++ b/arch/powerpc/math-emu/fcmpu.c diff --git a/arch/ppc/math-emu/fctiw.c b/arch/powerpc/math-emu/fctiw.c index 3b3c98b840c..3b3c98b840c 100644 --- a/arch/ppc/math-emu/fctiw.c +++ b/arch/powerpc/math-emu/fctiw.c diff --git a/arch/ppc/math-emu/fctiwz.c b/arch/powerpc/math-emu/fctiwz.c index 7717eb6fcfb..7717eb6fcfb 100644 --- a/arch/ppc/math-emu/fctiwz.c +++ b/arch/powerpc/math-emu/fctiwz.c diff --git a/arch/ppc/math-emu/fdiv.c b/arch/powerpc/math-emu/fdiv.c index f2fba825b2d..f2fba825b2d 100644 --- a/arch/ppc/math-emu/fdiv.c +++ b/arch/powerpc/math-emu/fdiv.c diff --git a/arch/ppc/math-emu/fdivs.c b/arch/powerpc/math-emu/fdivs.c index b971196e317..b971196e317 100644 --- a/arch/ppc/math-emu/fdivs.c +++ b/arch/powerpc/math-emu/fdivs.c diff --git a/arch/ppc/math-emu/fmadd.c b/arch/powerpc/math-emu/fmadd.c index 0a1dbce793e..0a1dbce793e 100644 --- a/arch/ppc/math-emu/fmadd.c +++ b/arch/powerpc/math-emu/fmadd.c diff --git a/arch/ppc/math-emu/fmadds.c b/arch/powerpc/math-emu/fmadds.c index 0f70bba9445..0f70bba9445 100644 --- a/arch/ppc/math-emu/fmadds.c +++ b/arch/powerpc/math-emu/fmadds.c diff --git a/arch/ppc/math-emu/fmr.c b/arch/powerpc/math-emu/fmr.c index 28df700c0c7..28df700c0c7 100644 --- a/arch/ppc/math-emu/fmr.c +++ b/arch/powerpc/math-emu/fmr.c diff --git a/arch/ppc/math-emu/fmsub.c b/arch/powerpc/math-emu/fmsub.c index 203fd48a6fe..203fd48a6fe 100644 --- a/arch/ppc/math-emu/fmsub.c +++ b/arch/powerpc/math-emu/fmsub.c diff --git a/arch/ppc/math-emu/fmsubs.c b/arch/powerpc/math-emu/fmsubs.c index 8ce68624c18..8ce68624c18 100644 --- a/arch/ppc/math-emu/fmsubs.c +++ b/arch/powerpc/math-emu/fmsubs.c diff --git a/arch/ppc/math-emu/fmul.c b/arch/powerpc/math-emu/fmul.c index 66c7e79aae2..66c7e79aae2 100644 --- a/arch/ppc/math-emu/fmul.c +++ b/arch/powerpc/math-emu/fmul.c diff --git a/arch/ppc/math-emu/fmuls.c b/arch/powerpc/math-emu/fmuls.c index 26bc4278271..26bc4278271 100644 --- a/arch/ppc/math-emu/fmuls.c +++ b/arch/powerpc/math-emu/fmuls.c diff --git a/arch/ppc/math-emu/fnabs.c b/arch/powerpc/math-emu/fnabs.c index c6b913d179e..c6b913d179e 100644 --- a/arch/ppc/math-emu/fnabs.c +++ b/arch/powerpc/math-emu/fnabs.c diff --git a/arch/ppc/math-emu/fneg.c b/arch/powerpc/math-emu/fneg.c index fe9a98deff6..fe9a98deff6 100644 --- a/arch/ppc/math-emu/fneg.c +++ b/arch/powerpc/math-emu/fneg.c diff --git a/arch/ppc/math-emu/fnmadd.c b/arch/powerpc/math-emu/fnmadd.c index 7f312276d92..7f312276d92 100644 --- a/arch/ppc/math-emu/fnmadd.c +++ b/arch/powerpc/math-emu/fnmadd.c diff --git a/arch/ppc/math-emu/fnmadds.c b/arch/powerpc/math-emu/fnmadds.c index 65454c9c70b..65454c9c70b 100644 --- a/arch/ppc/math-emu/fnmadds.c +++ b/arch/powerpc/math-emu/fnmadds.c diff --git a/arch/ppc/math-emu/fnmsub.c b/arch/powerpc/math-emu/fnmsub.c index f1ca7482b5f..f1ca7482b5f 100644 --- a/arch/ppc/math-emu/fnmsub.c +++ b/arch/powerpc/math-emu/fnmsub.c diff --git a/arch/ppc/math-emu/fnmsubs.c b/arch/powerpc/math-emu/fnmsubs.c index 5c9a09a87dc..5c9a09a87dc 100644 --- a/arch/ppc/math-emu/fnmsubs.c +++ b/arch/powerpc/math-emu/fnmsubs.c diff --git a/arch/ppc/math-emu/fres.c b/arch/powerpc/math-emu/fres.c index ec11e46d20a..ec11e46d20a 100644 --- a/arch/ppc/math-emu/fres.c +++ b/arch/powerpc/math-emu/fres.c diff --git a/arch/ppc/math-emu/frsp.c b/arch/powerpc/math-emu/frsp.c index d879b2a3d0c..d879b2a3d0c 100644 --- a/arch/ppc/math-emu/frsp.c +++ b/arch/powerpc/math-emu/frsp.c diff --git a/arch/ppc/math-emu/frsqrte.c b/arch/powerpc/math-emu/frsqrte.c index a11ae182985..a11ae182985 100644 --- a/arch/ppc/math-emu/frsqrte.c +++ b/arch/powerpc/math-emu/frsqrte.c diff --git a/arch/ppc/math-emu/fsel.c b/arch/powerpc/math-emu/fsel.c index e36e6e72819..e36e6e72819 100644 --- a/arch/ppc/math-emu/fsel.c +++ b/arch/powerpc/math-emu/fsel.c diff --git a/arch/ppc/math-emu/fsqrt.c b/arch/powerpc/math-emu/fsqrt.c index 6f8319f64a8..6f8319f64a8 100644 --- a/arch/ppc/math-emu/fsqrt.c +++ b/arch/powerpc/math-emu/fsqrt.c diff --git a/arch/ppc/math-emu/fsqrts.c b/arch/powerpc/math-emu/fsqrts.c index 3b2b1cf55c1..3b2b1cf55c1 100644 --- a/arch/ppc/math-emu/fsqrts.c +++ b/arch/powerpc/math-emu/fsqrts.c diff --git a/arch/ppc/math-emu/fsub.c b/arch/powerpc/math-emu/fsub.c index 956679042bb..956679042bb 100644 --- a/arch/ppc/math-emu/fsub.c +++ b/arch/powerpc/math-emu/fsub.c diff --git a/arch/ppc/math-emu/fsubs.c b/arch/powerpc/math-emu/fsubs.c index 3428117dfe8..3428117dfe8 100644 --- a/arch/ppc/math-emu/fsubs.c +++ b/arch/powerpc/math-emu/fsubs.c diff --git a/arch/ppc/math-emu/lfd.c b/arch/powerpc/math-emu/lfd.c index 7d38101c329..7d38101c329 100644 --- a/arch/ppc/math-emu/lfd.c +++ b/arch/powerpc/math-emu/lfd.c diff --git a/arch/ppc/math-emu/lfs.c b/arch/powerpc/math-emu/lfs.c index c86dee3d765..c86dee3d765 100644 --- a/arch/ppc/math-emu/lfs.c +++ b/arch/powerpc/math-emu/lfs.c diff --git a/arch/ppc/math-emu/math.c b/arch/powerpc/math-emu/math.c index 58915347276..58915347276 100644 --- a/arch/ppc/math-emu/math.c +++ b/arch/powerpc/math-emu/math.c diff --git a/arch/ppc/math-emu/mcrfs.c b/arch/powerpc/math-emu/mcrfs.c index 106dd912914..106dd912914 100644 --- a/arch/ppc/math-emu/mcrfs.c +++ b/arch/powerpc/math-emu/mcrfs.c diff --git a/arch/ppc/math-emu/mffs.c b/arch/powerpc/math-emu/mffs.c index f477c9170e7..f477c9170e7 100644 --- a/arch/ppc/math-emu/mffs.c +++ b/arch/powerpc/math-emu/mffs.c diff --git a/arch/ppc/math-emu/mtfsb0.c b/arch/powerpc/math-emu/mtfsb0.c index 99bfd80f4af..99bfd80f4af 100644 --- a/arch/ppc/math-emu/mtfsb0.c +++ b/arch/powerpc/math-emu/mtfsb0.c diff --git a/arch/ppc/math-emu/mtfsb1.c b/arch/powerpc/math-emu/mtfsb1.c index 3d9e7ed92d2..3d9e7ed92d2 100644 --- a/arch/ppc/math-emu/mtfsb1.c +++ b/arch/powerpc/math-emu/mtfsb1.c diff --git a/arch/ppc/math-emu/mtfsf.c b/arch/powerpc/math-emu/mtfsf.c index d70cf714994..d70cf714994 100644 --- a/arch/ppc/math-emu/mtfsf.c +++ b/arch/powerpc/math-emu/mtfsf.c diff --git a/arch/ppc/math-emu/mtfsfi.c b/arch/powerpc/math-emu/mtfsfi.c index 71df854baa7..71df854baa7 100644 --- a/arch/ppc/math-emu/mtfsfi.c +++ b/arch/powerpc/math-emu/mtfsfi.c diff --git a/arch/ppc/math-emu/op-1.h b/arch/powerpc/math-emu/op-1.h index c92fa95f562..c92fa95f562 100644 --- a/arch/ppc/math-emu/op-1.h +++ b/arch/powerpc/math-emu/op-1.h diff --git a/arch/ppc/math-emu/op-2.h b/arch/powerpc/math-emu/op-2.h index b9b06b4c6ea..b9b06b4c6ea 100644 --- a/arch/ppc/math-emu/op-2.h +++ b/arch/powerpc/math-emu/op-2.h diff --git a/arch/ppc/math-emu/op-4.h b/arch/powerpc/math-emu/op-4.h index fcdd6d064c5..fcdd6d064c5 100644 --- a/arch/ppc/math-emu/op-4.h +++ b/arch/powerpc/math-emu/op-4.h diff --git a/arch/ppc/math-emu/op-common.h b/arch/powerpc/math-emu/op-common.h index afb82b6498c..afb82b6498c 100644 --- a/arch/ppc/math-emu/op-common.h +++ b/arch/powerpc/math-emu/op-common.h diff --git a/arch/ppc/math-emu/sfp-machine.h b/arch/powerpc/math-emu/sfp-machine.h index 4b17d83cfcd..4b17d83cfcd 100644 --- a/arch/ppc/math-emu/sfp-machine.h +++ b/arch/powerpc/math-emu/sfp-machine.h diff --git a/arch/ppc/math-emu/single.h b/arch/powerpc/math-emu/single.h index f19d9945181..f19d9945181 100644 --- a/arch/ppc/math-emu/single.h +++ b/arch/powerpc/math-emu/single.h diff --git a/arch/ppc/math-emu/soft-fp.h b/arch/powerpc/math-emu/soft-fp.h index cca39598f87..cca39598f87 100644 --- a/arch/ppc/math-emu/soft-fp.h +++ b/arch/powerpc/math-emu/soft-fp.h diff --git a/arch/ppc/math-emu/stfd.c b/arch/powerpc/math-emu/stfd.c index 3f8c2558a9e..3f8c2558a9e 100644 --- a/arch/ppc/math-emu/stfd.c +++ b/arch/powerpc/math-emu/stfd.c diff --git a/arch/ppc/math-emu/stfiwx.c b/arch/powerpc/math-emu/stfiwx.c index 95caaeec6a0..95caaeec6a0 100644 --- a/arch/ppc/math-emu/stfiwx.c +++ b/arch/powerpc/math-emu/stfiwx.c diff --git a/arch/ppc/math-emu/stfs.c b/arch/powerpc/math-emu/stfs.c index e87ca23c6dc..e87ca23c6dc 100644 --- a/arch/ppc/math-emu/stfs.c +++ b/arch/powerpc/math-emu/stfs.c diff --git a/arch/ppc/math-emu/types.c b/arch/powerpc/math-emu/types.c index e1ed15d829d..e1ed15d829d 100644 --- a/arch/ppc/math-emu/types.c +++ b/arch/powerpc/math-emu/types.c diff --git a/arch/ppc/math-emu/udivmodti4.c b/arch/powerpc/math-emu/udivmodti4.c index 7e112dc1e2f..7e112dc1e2f 100644 --- a/arch/ppc/math-emu/udivmodti4.c +++ b/arch/powerpc/math-emu/udivmodti4.c diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig index d3d0ff745e8..06e371282f5 100644 --- a/arch/powerpc/platforms/85xx/Kconfig +++ b/arch/powerpc/platforms/85xx/Kconfig @@ -7,6 +7,7 @@ choice config MPC8540_ADS bool "Freescale MPC8540 ADS" + select DEFAULT_UIMAGE help This option enables support for the MPC 8540 ADS board diff --git a/arch/ppc/Makefile b/arch/ppc/Makefile index e250f8333ed..0db66dcf072 100644 --- a/arch/ppc/Makefile +++ b/arch/ppc/Makefile @@ -67,7 +67,7 @@ core-y += arch/ppc/kernel/ arch/powerpc/kernel/ \ core-$(CONFIG_4xx) += arch/ppc/platforms/4xx/ core-$(CONFIG_83xx) += arch/ppc/platforms/83xx/ core-$(CONFIG_85xx) += arch/ppc/platforms/85xx/ -core-$(CONFIG_MATH_EMULATION) += arch/ppc/math-emu/ +core-$(CONFIG_MATH_EMULATION) += arch/powerpc/math-emu/ core-$(CONFIG_XMON) += arch/ppc/xmon/ core-$(CONFIG_APUS) += arch/ppc/amiga/ drivers-$(CONFIG_8xx) += arch/ppc/8xx_io/ |