diff options
Diffstat (limited to 'arch/ppc')
| -rw-r--r-- | arch/ppc/boot/Makefile | 1 | ||||
| -rw-r--r-- | arch/ppc/chrpboot/Makefile | 1 | ||||
| -rw-r--r-- | arch/ppc/coffboot/Makefile | 4 | ||||
| -rw-r--r-- | arch/ppc/configs/common_defconfig | 81 | ||||
| -rw-r--r-- | arch/ppc/defconfig | 81 | ||||
| -rw-r--r-- | arch/ppc/kernel/chrp_time.c | 2 | ||||
| -rw-r--r-- | arch/ppc/kernel/irq.c | 2 | ||||
| -rw-r--r-- | arch/ppc/kernel/open_pic.c | 4 | ||||
| -rw-r--r-- | arch/ppc/kernel/prom.c | 3 | ||||
| -rw-r--r-- | arch/ppc/mbxboot/Makefile | 2 | ||||
| -rw-r--r-- | arch/ppc/treeboot/Makefile | 5 | ||||
| -rw-r--r-- | arch/ppc/xmon/xmon.c | 42 |
12 files changed, 67 insertions, 161 deletions
diff --git a/arch/ppc/boot/Makefile b/arch/ppc/boot/Makefile index 6b8378839..604205565 100644 --- a/arch/ppc/boot/Makefile +++ b/arch/ppc/boot/Makefile @@ -53,7 +53,6 @@ GZIP_FLAGS = -v9f OBJECTS := head.o misc.o ../coffboot/zlib.o CFLAGS = $(CPPFLAGS) -O2 -DSTDC_HEADERS -fno-builtin -OBJCOPY = $(CROSS_COMPILE)objcopy OBJCOPY_ARGS = -O elf32-powerpc OBJECTS += vreset.o kbd.o of1275.o diff --git a/arch/ppc/chrpboot/Makefile b/arch/ppc/chrpboot/Makefile index 5a7f063fc..216b289ed 100644 --- a/arch/ppc/chrpboot/Makefile +++ b/arch/ppc/chrpboot/Makefile @@ -18,7 +18,6 @@ CFLAGS = $(CPPFLAGS) -O -fno-builtin -DSTDC_HEADERS LD_ARGS = -Ttext 0x00400000 -OBJCOPY = $(CROSS_COMPILE)objcopy OBJS = crt0.o start.o main.o misc.o ../coffboot/string.o ../coffboot/zlib.o image.o sysmap.o LIBS = $(TOPDIR)/lib/lib.a diff --git a/arch/ppc/coffboot/Makefile b/arch/ppc/coffboot/Makefile index 29a4fdc35..5c46f9540 100644 --- a/arch/ppc/coffboot/Makefile +++ b/arch/ppc/coffboot/Makefile @@ -5,14 +5,10 @@ HOSTCFLAGS = -O -I$(TOPDIR)/include -CC = $(CROSS_COMPILE)gcc -LD = $(CROSS_COMPILE)ld CFLAGS = $(CPPFLAGS) -O -fno-builtin -OBJCOPY = $(CROSS_COMPILE)objcopy OBJCOPY_ARGS = -O aixcoff-rs6000 -R .stab -R .stabstr -R .comment COFF_LD_ARGS = -e _start -T ld.script -Ttext 500000 -Tdata 510000 -Bstatic CHRP_LD_ARGS = -Ttext 0x00400000 -GZ = gzip -9 COFFOBJS = coffcrt0.o start.o coffmain.o misc.o string.o zlib.o image.o CHRPOBJS = crt0.o start.o chrpmain.o misc.o string.o zlib.o image.o diff --git a/arch/ppc/configs/common_defconfig b/arch/ppc/configs/common_defconfig index c849bac82..bcab91ec6 100644 --- a/arch/ppc/configs/common_defconfig +++ b/arch/ppc/configs/common_defconfig @@ -1,5 +1,5 @@ # -# Automatically generated make config: don't edit +# Automatically generated by make menuconfig: don't edit # # CONFIG_UID16 is not set @@ -33,7 +33,6 @@ CONFIG_KMOD=y # # General setup # -# CONFIG_PCI is not set CONFIG_PCI=y CONFIG_PCI=y CONFIG_NET=y @@ -46,6 +45,10 @@ CONFIG_KERNEL_ELF=y # CONFIG_BINFMT_MISC is not set # CONFIG_PCI_NAMES is not set # CONFIG_HOTPLUG is not set + +# +# Parallel port support +# # CONFIG_PARPORT is not set CONFIG_VGA_CONSOLE=y CONFIG_FB=y @@ -53,6 +56,7 @@ CONFIG_FB_COMPAT_XPMAC=y CONFIG_PMAC_PBOOK=y CONFIG_MAC_FLOPPY=y CONFIG_MAC_SERIAL=y +# CONFIG_SERIAL_CONSOLE is not set CONFIG_ADB=y CONFIG_ADB_CUDA=y CONFIG_ADB_MACIO=y @@ -69,27 +73,21 @@ CONFIG_BOOTX_TEXT=y # Plug and Play configuration # # CONFIG_PNP is not set +# CONFIG_ISAPNP is not set # # Block devices # # CONFIG_BLK_DEV_FD is not set CONFIG_BLK_DEV_IDE=y - -# -# Please see Documentation/ide.txt for help/info on IDE drives -# # CONFIG_BLK_DEV_HD_IDE is not set CONFIG_BLK_DEV_IDEDISK=y # CONFIG_IDEDISK_MULTI_MODE is not set +# CONFIG_BLK_DEV_IDECS is not set CONFIG_BLK_DEV_IDECD=y # CONFIG_BLK_DEV_IDETAPE is not set CONFIG_BLK_DEV_IDEFLOPPY=y CONFIG_BLK_DEV_IDESCSI=y - -# -# IDE chipset support/bugfixes -# # CONFIG_BLK_DEV_CMD640 is not set # CONFIG_BLK_DEV_RZ1000 is not set CONFIG_BLK_DEV_IDEPCI=y @@ -108,10 +106,6 @@ CONFIG_BLK_DEV_IDEDMA=y CONFIG_IDEDMA_AUTO=y # CONFIG_IDE_CHIPSETS is not set # CONFIG_BLK_CPQ_DA is not set - -# -# Additional Block Devices -# CONFIG_BLK_DEV_LOOP=y # CONFIG_BLK_DEV_NBD is not set # CONFIG_BLK_DEV_MD is not set @@ -144,18 +138,10 @@ CONFIG_IP_MULTICAST=y # CONFIG_IP_MROUTE is not set CONFIG_IP_ALIAS=y CONFIG_SYN_COOKIES=y - -# -# (it is safe to leave these untouched) -# CONFIG_SKB_LARGE=y # CONFIG_IPV6 is not set # CONFIG_KHTTPD is not set # CONFIG_ATM is not set - -# -# -# # CONFIG_IPX is not set CONFIG_ATALK=m # CONFIG_DECNET is not set @@ -177,10 +163,6 @@ CONFIG_ATALK=m # SCSI support # CONFIG_SCSI=y - -# -# SCSI support type (disk, tape, CD-ROM) -# CONFIG_BLK_DEV_SD=y CONFIG_SD_EXTRA_DEVS=40 CONFIG_CHR_DEV_ST=y @@ -189,10 +171,6 @@ CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_SR_EXTRA_DEVS=2 CONFIG_CHR_DEV_SG=y - -# -# Some SCSI devices (e.g. CD jukebox) support multiple LUNs -# # CONFIG_SCSI_DEBUG_QUEUES is not set # CONFIG_SCSI_MULTI_LUN is not set CONFIG_SCSI_CONSTANTS=y @@ -272,6 +250,13 @@ CONFIG_NETDEVICES=y # ARCnet devices # # CONFIG_ARCNET is not set + +# +# Appletalk devices +# +# CONFIG_LTPC is not set +# CONFIG_COPS is not set +# CONFIG_IPDDP is not set # CONFIG_DUMMY is not set # CONFIG_BONDING is not set # CONFIG_EQUALIZER is not set @@ -299,6 +284,7 @@ CONFIG_PCNET32=y # CONFIG_ADAPTEC_STARFIRE is not set # CONFIG_AC3200 is not set # CONFIG_APRICOT is not set +# CONFIG_CS89x0 is not set CONFIG_DE4X5=y # CONFIG_TULIP is not set # CONFIG_DGRS is not set @@ -324,13 +310,6 @@ CONFIG_DE4X5=y # CONFIG_SK98LIN is not set # CONFIG_FDDI is not set # CONFIG_HIPPI is not set - -# -# Appletalk devices -# -# CONFIG_LTPC is not set -# CONFIG_COPS is not set -# CONFIG_IPDDP is not set CONFIG_PPP=y # CONFIG_PPP_ASYNC is not set # CONFIG_PPP_SYNC_TTY is not set @@ -344,7 +323,7 @@ CONFIG_PPP=y # CONFIG_NET_RADIO is not set # -# Token Ring driver support +# Token Ring devices # # CONFIG_TR is not set # CONFIG_NET_FC is not set @@ -397,7 +376,7 @@ CONFIG_FB_MATROX_MYSTIQUE=y CONFIG_FB_MATROX_G100=y # CONFIG_FB_MATROX_MULTIHEAD is not set CONFIG_FB_ATY=y -# CONFIG_FB_ATY128 is not set +CONFIG_FB_ATY128=y CONFIG_FB_3DFX=y # CONFIG_FB_VIRTUAL is not set # CONFIG_FBCON_ADVANCED is not set @@ -456,7 +435,6 @@ CONFIG_PSMOUSE=y # CONFIG_WATCHDOG is not set CONFIG_NVRAM=y # CONFIG_RTC is not set -# CONFIG_EFI_RTC is not set # # Video For Linux @@ -471,28 +449,17 @@ CONFIG_NVRAM=y # # CONFIG_FTAPE is not set # CONFIG_DRM is not set +# CONFIG_DRM_TDFX is not set # CONFIG_AGP is not set # # USB support # CONFIG_USB=y - -# -# USB Controllers -# # CONFIG_USB_UHCI is not set # CONFIG_USB_UHCI_ALT is not set CONFIG_USB_OHCI=y - -# -# Miscellaneous USB options -# # CONFIG_USB_DEVICEFS is not set - -# -# USB Devices -# # CONFIG_USB_PRINTER is not set # CONFIG_USB_SCANNER is not set # CONFIG_USB_AUDIO is not set @@ -503,14 +470,11 @@ CONFIG_USB_OHCI=y # CONFIG_USB_OV511 is not set # CONFIG_USB_DC2XX is not set # CONFIG_USB_STORAGE is not set +# CONFIG_USB_USS720 is not set # CONFIG_USB_DABUSB is not set # CONFIG_USB_PLUSB is not set # CONFIG_USB_PEGASUS is not set # CONFIG_USB_RIO500 is not set - -# -# USB HID -# # CONFIG_USB_HID is not set CONFIG_USB_KBD=y CONFIG_USB_MOUSE=y @@ -546,6 +510,7 @@ CONFIG_ISO9660_FS=y # CONFIG_HPFS_FS is not set CONFIG_PROC_FS=y # CONFIG_DEVFS_FS is not set +# CONFIG_DEVFS_DEBUG is not set CONFIG_DEVPTS_FS=y # CONFIG_QNX4FS_FS is not set # CONFIG_ROMFS_FS is not set @@ -559,6 +524,7 @@ CONFIG_EXT2_FS=y # # CONFIG_CODA_FS is not set CONFIG_NFS_FS=y +# CONFIG_ROOT_NFS is not set CONFIG_NFSD=y # CONFIG_NFSD_V3 is not set CONFIG_SUNRPC=y @@ -630,7 +596,6 @@ CONFIG_DMASOUND=y # CONFIG_SOUND_MSNDCLAS is not set # CONFIG_SOUND_MSNDPIN is not set CONFIG_SOUND_OSS=y -# CONFIG_SOUND_DMAP is not set # CONFIG_SOUND_AD1816 is not set # CONFIG_SOUND_SGALAXY is not set CONFIG_SOUND_CS4232=m @@ -643,7 +608,9 @@ CONFIG_SOUND_CS4232=m # CONFIG_SOUND_NM256 is not set # CONFIG_SOUND_MAD16 is not set # CONFIG_SOUND_PAS is not set +# CONFIG_PAS_JOYSTICK is not set # CONFIG_SOUND_PSS is not set +# CONFIG_PSS_HAVE_BOOT is not set # CONFIG_SOUND_SOFTOSS is not set # CONFIG_SOUND_SB is not set # CONFIG_SOUND_WAVEFRONT is not set diff --git a/arch/ppc/defconfig b/arch/ppc/defconfig index c849bac82..bcab91ec6 100644 --- a/arch/ppc/defconfig +++ b/arch/ppc/defconfig @@ -1,5 +1,5 @@ # -# Automatically generated make config: don't edit +# Automatically generated by make menuconfig: don't edit # # CONFIG_UID16 is not set @@ -33,7 +33,6 @@ CONFIG_KMOD=y # # General setup # -# CONFIG_PCI is not set CONFIG_PCI=y CONFIG_PCI=y CONFIG_NET=y @@ -46,6 +45,10 @@ CONFIG_KERNEL_ELF=y # CONFIG_BINFMT_MISC is not set # CONFIG_PCI_NAMES is not set # CONFIG_HOTPLUG is not set + +# +# Parallel port support +# # CONFIG_PARPORT is not set CONFIG_VGA_CONSOLE=y CONFIG_FB=y @@ -53,6 +56,7 @@ CONFIG_FB_COMPAT_XPMAC=y CONFIG_PMAC_PBOOK=y CONFIG_MAC_FLOPPY=y CONFIG_MAC_SERIAL=y +# CONFIG_SERIAL_CONSOLE is not set CONFIG_ADB=y CONFIG_ADB_CUDA=y CONFIG_ADB_MACIO=y @@ -69,27 +73,21 @@ CONFIG_BOOTX_TEXT=y # Plug and Play configuration # # CONFIG_PNP is not set +# CONFIG_ISAPNP is not set # # Block devices # # CONFIG_BLK_DEV_FD is not set CONFIG_BLK_DEV_IDE=y - -# -# Please see Documentation/ide.txt for help/info on IDE drives -# # CONFIG_BLK_DEV_HD_IDE is not set CONFIG_BLK_DEV_IDEDISK=y # CONFIG_IDEDISK_MULTI_MODE is not set +# CONFIG_BLK_DEV_IDECS is not set CONFIG_BLK_DEV_IDECD=y # CONFIG_BLK_DEV_IDETAPE is not set CONFIG_BLK_DEV_IDEFLOPPY=y CONFIG_BLK_DEV_IDESCSI=y - -# -# IDE chipset support/bugfixes -# # CONFIG_BLK_DEV_CMD640 is not set # CONFIG_BLK_DEV_RZ1000 is not set CONFIG_BLK_DEV_IDEPCI=y @@ -108,10 +106,6 @@ CONFIG_BLK_DEV_IDEDMA=y CONFIG_IDEDMA_AUTO=y # CONFIG_IDE_CHIPSETS is not set # CONFIG_BLK_CPQ_DA is not set - -# -# Additional Block Devices -# CONFIG_BLK_DEV_LOOP=y # CONFIG_BLK_DEV_NBD is not set # CONFIG_BLK_DEV_MD is not set @@ -144,18 +138,10 @@ CONFIG_IP_MULTICAST=y # CONFIG_IP_MROUTE is not set CONFIG_IP_ALIAS=y CONFIG_SYN_COOKIES=y - -# -# (it is safe to leave these untouched) -# CONFIG_SKB_LARGE=y # CONFIG_IPV6 is not set # CONFIG_KHTTPD is not set # CONFIG_ATM is not set - -# -# -# # CONFIG_IPX is not set CONFIG_ATALK=m # CONFIG_DECNET is not set @@ -177,10 +163,6 @@ CONFIG_ATALK=m # SCSI support # CONFIG_SCSI=y - -# -# SCSI support type (disk, tape, CD-ROM) -# CONFIG_BLK_DEV_SD=y CONFIG_SD_EXTRA_DEVS=40 CONFIG_CHR_DEV_ST=y @@ -189,10 +171,6 @@ CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_SR_EXTRA_DEVS=2 CONFIG_CHR_DEV_SG=y - -# -# Some SCSI devices (e.g. CD jukebox) support multiple LUNs -# # CONFIG_SCSI_DEBUG_QUEUES is not set # CONFIG_SCSI_MULTI_LUN is not set CONFIG_SCSI_CONSTANTS=y @@ -272,6 +250,13 @@ CONFIG_NETDEVICES=y # ARCnet devices # # CONFIG_ARCNET is not set + +# +# Appletalk devices +# +# CONFIG_LTPC is not set +# CONFIG_COPS is not set +# CONFIG_IPDDP is not set # CONFIG_DUMMY is not set # CONFIG_BONDING is not set # CONFIG_EQUALIZER is not set @@ -299,6 +284,7 @@ CONFIG_PCNET32=y # CONFIG_ADAPTEC_STARFIRE is not set # CONFIG_AC3200 is not set # CONFIG_APRICOT is not set +# CONFIG_CS89x0 is not set CONFIG_DE4X5=y # CONFIG_TULIP is not set # CONFIG_DGRS is not set @@ -324,13 +310,6 @@ CONFIG_DE4X5=y # CONFIG_SK98LIN is not set # CONFIG_FDDI is not set # CONFIG_HIPPI is not set - -# -# Appletalk devices -# -# CONFIG_LTPC is not set -# CONFIG_COPS is not set -# CONFIG_IPDDP is not set CONFIG_PPP=y # CONFIG_PPP_ASYNC is not set # CONFIG_PPP_SYNC_TTY is not set @@ -344,7 +323,7 @@ CONFIG_PPP=y # CONFIG_NET_RADIO is not set # -# Token Ring driver support +# Token Ring devices # # CONFIG_TR is not set # CONFIG_NET_FC is not set @@ -397,7 +376,7 @@ CONFIG_FB_MATROX_MYSTIQUE=y CONFIG_FB_MATROX_G100=y # CONFIG_FB_MATROX_MULTIHEAD is not set CONFIG_FB_ATY=y -# CONFIG_FB_ATY128 is not set +CONFIG_FB_ATY128=y CONFIG_FB_3DFX=y # CONFIG_FB_VIRTUAL is not set # CONFIG_FBCON_ADVANCED is not set @@ -456,7 +435,6 @@ CONFIG_PSMOUSE=y # CONFIG_WATCHDOG is not set CONFIG_NVRAM=y # CONFIG_RTC is not set -# CONFIG_EFI_RTC is not set # # Video For Linux @@ -471,28 +449,17 @@ CONFIG_NVRAM=y # # CONFIG_FTAPE is not set # CONFIG_DRM is not set +# CONFIG_DRM_TDFX is not set # CONFIG_AGP is not set # # USB support # CONFIG_USB=y - -# -# USB Controllers -# # CONFIG_USB_UHCI is not set # CONFIG_USB_UHCI_ALT is not set CONFIG_USB_OHCI=y - -# -# Miscellaneous USB options -# # CONFIG_USB_DEVICEFS is not set - -# -# USB Devices -# # CONFIG_USB_PRINTER is not set # CONFIG_USB_SCANNER is not set # CONFIG_USB_AUDIO is not set @@ -503,14 +470,11 @@ CONFIG_USB_OHCI=y # CONFIG_USB_OV511 is not set # CONFIG_USB_DC2XX is not set # CONFIG_USB_STORAGE is not set +# CONFIG_USB_USS720 is not set # CONFIG_USB_DABUSB is not set # CONFIG_USB_PLUSB is not set # CONFIG_USB_PEGASUS is not set # CONFIG_USB_RIO500 is not set - -# -# USB HID -# # CONFIG_USB_HID is not set CONFIG_USB_KBD=y CONFIG_USB_MOUSE=y @@ -546,6 +510,7 @@ CONFIG_ISO9660_FS=y # CONFIG_HPFS_FS is not set CONFIG_PROC_FS=y # CONFIG_DEVFS_FS is not set +# CONFIG_DEVFS_DEBUG is not set CONFIG_DEVPTS_FS=y # CONFIG_QNX4FS_FS is not set # CONFIG_ROMFS_FS is not set @@ -559,6 +524,7 @@ CONFIG_EXT2_FS=y # # CONFIG_CODA_FS is not set CONFIG_NFS_FS=y +# CONFIG_ROOT_NFS is not set CONFIG_NFSD=y # CONFIG_NFSD_V3 is not set CONFIG_SUNRPC=y @@ -630,7 +596,6 @@ CONFIG_DMASOUND=y # CONFIG_SOUND_MSNDCLAS is not set # CONFIG_SOUND_MSNDPIN is not set CONFIG_SOUND_OSS=y -# CONFIG_SOUND_DMAP is not set # CONFIG_SOUND_AD1816 is not set # CONFIG_SOUND_SGALAXY is not set CONFIG_SOUND_CS4232=m @@ -643,7 +608,9 @@ CONFIG_SOUND_CS4232=m # CONFIG_SOUND_NM256 is not set # CONFIG_SOUND_MAD16 is not set # CONFIG_SOUND_PAS is not set +# CONFIG_PAS_JOYSTICK is not set # CONFIG_SOUND_PSS is not set +# CONFIG_PSS_HAVE_BOOT is not set # CONFIG_SOUND_SOFTOSS is not set # CONFIG_SOUND_SB is not set # CONFIG_SOUND_WAVEFRONT is not set diff --git a/arch/ppc/kernel/chrp_time.c b/arch/ppc/kernel/chrp_time.c index d55fa24c0..c692b54d0 100644 --- a/arch/ppc/kernel/chrp_time.c +++ b/arch/ppc/kernel/chrp_time.c @@ -173,7 +173,7 @@ void __init chrp_calibrate_decr(void) } freq *= 30; divisor = 30; - printk("time_init: decrementer frequency = %lu/%d (%d MHz)\n", freq, + printk("time_init: decrementer frequency = %lu/%d (%ld MHz)\n", freq, divisor, (freq/divisor)>>20); decrementer_count = freq / HZ / divisor; count_period_num = divisor; diff --git a/arch/ppc/kernel/irq.c b/arch/ppc/kernel/irq.c index f8e11ecc0..e4b279032 100644 --- a/arch/ppc/kernel/irq.c +++ b/arch/ppc/kernel/irq.c @@ -677,7 +677,7 @@ static int irq_affinity_write_proc (struct file *file, const char *buffer, err = parse_hex_value(buffer, count, &new_value); -#if CONFIG_SMP +#if 0/*CONFIG_SMP*/ /* * Do not allow disabling IRQs completely - it's a too easy * way to make the system unusable accidentally :-) At least diff --git a/arch/ppc/kernel/open_pic.c b/arch/ppc/kernel/open_pic.c index 301a82ba8..9438c57ee 100644 --- a/arch/ppc/kernel/open_pic.c +++ b/arch/ppc/kernel/open_pic.c @@ -97,7 +97,7 @@ struct hw_interrupt_type open_pic = { #define check_arg_cpu(cpu) do {} while (0) #endif -static void no_action(int ir1, void *dev, struct pt_regs *regs) +void no_action(int ir1, void *dev, struct pt_regs *regs) { } @@ -301,7 +301,7 @@ void find_ISUs(void) NumSources = 0x10; #else /* for non-distributed OpenPIC implementations it's in the IDU -- Cort */ - ISU = OpenPIC->Source; + ISU = (OpenPIC_Source *)OpenPIC->Source; #endif } diff --git a/arch/ppc/kernel/prom.c b/arch/ppc/kernel/prom.c index 310e301e6..a987b8fd6 100644 --- a/arch/ppc/kernel/prom.c +++ b/arch/ppc/kernel/prom.c @@ -114,9 +114,6 @@ static struct device_node *allnodes = 0; static void clearscreen(void); static void flushscreen(void); -void prom_drawchar(char c); -void prom_drawstring(const char *c); -void prom_drawhex(unsigned long v); static void scrollscreen(void); static void draw_byte(unsigned char c, long locX, long locY); diff --git a/arch/ppc/mbxboot/Makefile b/arch/ppc/mbxboot/Makefile index 0a70462a7..59b95c5df 100644 --- a/arch/ppc/mbxboot/Makefile +++ b/arch/ppc/mbxboot/Makefile @@ -27,11 +27,9 @@ ISZ = 0 TFTPIMAGE=/tftpboot/zImage.mbx ZLINKFLAGS = -T ../vmlinux.lds -Ttext 0x00100000 -GZIP_FLAGS = -v9 OBJECTS := head.o misc.o ../coffboot/zlib.o m8xx_tty.o CFLAGS = $(CPPFLAGS) -O2 -DSTDC_HEADERS -fno-builtin -DCONFIG_8xx -OBJCOPY = $(CROSS_COMPILE)objcopy OBJCOPY_ARGS = -O elf32-powerpc ifeq ($(CONFIG_MBX),y) diff --git a/arch/ppc/treeboot/Makefile b/arch/ppc/treeboot/Makefile index f84810e1e..7d42a6741 100644 --- a/arch/ppc/treeboot/Makefile +++ b/arch/ppc/treeboot/Makefile @@ -10,11 +10,6 @@ HOSTCFLAGS = -O -I$(TOPDIR)/include -CC = $(CROSS_COMPILE)gcc -LD = $(CROSS_COMPILE)ld -OBJCOPY = $(CROSS_COMPILE)objcopy -OBJDUMP = $(CROSS_COMPILE)objdump - GZIP = gzip -vf9 RM = rm -f MKEVIMG = mkevimg -l diff --git a/arch/ppc/xmon/xmon.c b/arch/ppc/xmon/xmon.c index 620df9aea..b81e21890 100644 --- a/arch/ppc/xmon/xmon.c +++ b/arch/ppc/xmon/xmon.c @@ -7,6 +7,7 @@ #include <linux/sched.h> #include <asm/ptrace.h> #include <asm/string.h> +#include <asm/prom.h> #include "nonstdio.h" #include "privinst.h" @@ -81,7 +82,7 @@ static void insert_bpts(void); static struct bpt *at_breakpoint(unsigned pc); static void bpt_cmds(void); static void cacheflush(void); -static char *pretty_lookup_name(unsigned long addr); +static char *pretty_print_addr(unsigned long addr); static char *lookup_name(unsigned long addr); extern int print_insn_big_powerpc(FILE *, unsigned long, unsigned); @@ -141,7 +142,7 @@ xmon(struct pt_regs *excp) prom_drawstring(" msr="); prom_drawhex(excp->msr); prom_drawstring(" trap="); prom_drawhex(excp->trap); prom_drawstring(" sp="); prom_drawhex(excp->gpr[1]); - sp = &excp->gpr[0]; + sp = (unsigned *)&excp->gpr[0]; for (i = 0; i < 32; ++i) { if ((i & 7) == 0) prom_drawstring("\n"); @@ -544,10 +545,10 @@ getsp() void excprint(struct pt_regs *fp) { - printf("vector: %x at pc = %x %s", - fp->trap, fp->nip, pretty_lookup_name(fp->nip)); - printf(", msr = %x, sp = %x [%x]\n", - fp->msr, fp->gpr[1], fp); + printf("vector: %x at pc = %x", + fp->trap, fp->nip); + printf(", lr = %x, msr = %x, sp = %x [%x]\n", + fp->link, fp->msr, fp->gpr[1], fp); if (fp->trap == 0x300 || fp->trap == 0x600) printf("dar = %x, dsisr = %x\n", fp->dar, fp->dsisr); if (current) @@ -1385,25 +1386,14 @@ char *str; lineptr = str; } -/* - * We use this array a lot here. We assume we don't have multiple - * instances of xmon running and that we don't use the return value of - * any functions other than printing them. - * -- Cort - */ -char last[64]; -static char *pretty_lookup_name(unsigned long addr) +static char *pretty_print_addr(unsigned long addr) { + printf("%08x", addr); if ( lookup_name(addr) ) - { - sprintf(last, " (%s)", lookup_name(addr)); - return last; - } - else - return NULL; + printf(" %s", lookup_name(addr) ); + return NULL; } - static char *lookup_name(unsigned long addr) { extern char *sysmap; @@ -1413,11 +1403,8 @@ static char *lookup_name(unsigned long addr) if ( !sysmap || !sysmap_size ) return NULL; - - /* adjust if addr is relative to kernelbase */ - if ( addr < PAGE_OFFSET ) - addr += PAGE_OFFSET; - +return NULL; +#if 0 cmp = simple_strtoul(c, &c, 8); strcpy( last, strsep( &c, "\n")); while ( c < (sysmap+sysmap_size) ) @@ -1427,6 +1414,7 @@ static char *lookup_name(unsigned long addr) break; strcpy( last, strsep( &c, "\n")); } - return last; + return NULLlast; +#endif } |