Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu update from Greg Ungerer: "The major change is to remove the arch/m68k/platform directory. The coldfire (and other non-mmu m68k platform) code is moved to the arch/m68k level, making them consistent with the traditional m68k platforms. A couple of other minor miscellaneous fixes as well" * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: m68k: Fix typo 'COFNIG_MBAR' m68knommu: add missing ioport_map() and ioport_unmap() m68k/coldfire: remove second asm/mcfclk.h inclusion in m54xx.c m68knommu: fix size of address field for 5272 interrupt controller m68k: fix crufty 68000 and 68360 intro comments m68k: remove the unused arch/m68k/platform directory m68k: move non-mmu 68360 platform code m68k: move non-mmu 68000 platform code m68k: fix crufty ColdFire intro comments m68k: move coldfire platform code
This commit is contained in:
Linus Torvalds
commit
a45d572841
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* linux/arch/m68knommu/platform/68328/entry.S
|
||||
* entry.S -- non-mmu 68000 interrupt and exception entry points
|
||||
*
|
||||
* Copyright (C) 1991, 1992 Linus Torvalds
|
||||
*
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Makefile for arch/m68knommu/platform/68360.
|
||||
# Makefile for 68360 machines.
|
||||
#
|
||||
model-y := ram
|
||||
model-$(CONFIG_ROMKERNEL) := rom
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* linux/arch/m68knommu/platform/68360/config.c
|
||||
* config.c - non-mmu 68360 platform initialization code
|
||||
*
|
||||
* Copyright (c) 2000 Michael Leslie <mleslie@lineo.com>
|
||||
* Copyright (C) 1993 Hamish Macdonald
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* linux/arch/m68knommu/platform/68360/entry.S
|
||||
* entry.S - non-mmu 68360 interrupt and exceptions entry points
|
||||
*
|
||||
* Copyright (C) 1991, 1992 Linus Torvalds
|
||||
* Copyright (C) 2001 SED Systems, a Division of Calian Ltd.
|
||||
|
|
@ -1,6 +1,5 @@
|
|||
/* arch/m68knommu/platform/68360/head-ram.S
|
||||
*
|
||||
* Startup code for Motorola 68360
|
||||
/*
|
||||
* head-ram.S - startup code for Motorola 68360
|
||||
*
|
||||
* Copyright 2001 (C) SED Systems, a Division of Calian Ltd.
|
||||
* Based on: arch/m68knommu/platform/68328/pilot/crt0_rom.S
|
||||
|
|
@ -1,6 +1,5 @@
|
|||
/* arch/m68knommu/platform/68360/head-rom.S
|
||||
*
|
||||
* Startup code for Motorola 68360
|
||||
/*
|
||||
* head-rom.S - startup code for Motorola 68360
|
||||
*
|
||||
* Copyright (C) SED Systems, a Division of Calian Ltd.
|
||||
* Based on: arch/m68knommu/platform/68328/pilot/crt0_rom.S
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* linux/arch/$(ARCH)/platform/$(PLATFORM)/ints.c
|
||||
* ints.c - first level interrupt handlers
|
||||
*
|
||||
* This file is subject to the terms and conditions of the GNU General Public
|
||||
* License. See the file COPYING in the main directory of this archive
|
||||
|
|
@ -92,9 +92,9 @@ endif
|
|||
#
|
||||
head-y := arch/m68k/kernel/head.o
|
||||
head-$(CONFIG_SUN3) := arch/m68k/kernel/sun3-head.o
|
||||
head-$(CONFIG_M68360) := arch/m68k/platform/68360/head.o
|
||||
head-$(CONFIG_M68000) := arch/m68k/platform/68000/head.o
|
||||
head-$(CONFIG_COLDFIRE) := arch/m68k/platform/coldfire/head.o
|
||||
head-$(CONFIG_M68360) := arch/m68k/68360/head.o
|
||||
head-$(CONFIG_M68000) := arch/m68k/68000/head.o
|
||||
head-$(CONFIG_COLDFIRE) := arch/m68k/coldfire/head.o
|
||||
|
||||
core-y += arch/m68k/kernel/ arch/m68k/mm/
|
||||
libs-y += arch/m68k/lib/
|
||||
|
|
@ -114,9 +114,9 @@ core-$(CONFIG_NATFEAT) += arch/m68k/emu/
|
|||
core-$(CONFIG_M68040) += arch/m68k/fpsp040/
|
||||
core-$(CONFIG_M68060) += arch/m68k/ifpsp060/
|
||||
core-$(CONFIG_M68KFPU_EMU) += arch/m68k/math-emu/
|
||||
core-$(CONFIG_M68360) += arch/m68k/platform/68360/
|
||||
core-$(CONFIG_M68000) += arch/m68k/platform/68000/
|
||||
core-$(CONFIG_COLDFIRE) += arch/m68k/platform/coldfire/
|
||||
core-$(CONFIG_M68360) += arch/m68k/68360/
|
||||
core-$(CONFIG_M68000) += arch/m68k/68000/
|
||||
core-$(CONFIG_COLDFIRE) += arch/m68k/coldfire/
|
||||
|
||||
|
||||
all: zImage
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* linux/arch/m68knommu/platform/5307/entry.S
|
||||
* entry.S -- interrupt and exception processing for ColdFire
|
||||
*
|
||||
* Copyright (C) 1999-2007, Greg Ungerer (gerg@snapgear.com)
|
||||
* Copyright (C) 1998 D. Jeff Dionne <jeff@lineo.ca>,
|
||||
|
|
@ -36,7 +36,7 @@
|
|||
* they also need acknowledging via acknowledge bits.
|
||||
*/
|
||||
struct irqmap {
|
||||
unsigned char icr;
|
||||
unsigned int icr;
|
||||
unsigned char index;
|
||||
unsigned char ack;
|
||||
};
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
/***************************************************************************/
|
||||
|
||||
/*
|
||||
* linux/arch/m68knommu/platform/5206/config.c
|
||||
* m5206.c -- platform support for ColdFire 5206 based boards
|
||||
*
|
||||
* Copyright (C) 1999-2002, Greg Ungerer (gerg@snapgear.com)
|
||||
* Copyright (C) 2000-2001, Lineo Inc. (www.lineo.com)
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
/***************************************************************************/
|
||||
|
||||
/*
|
||||
* linux/arch/m68knommu/platform/520x/config.c
|
||||
* m520x.c -- platform support for ColdFire 520x based boards
|
||||
*
|
||||
* Copyright (C) 2005, Freescale (www.freescale.com)
|
||||
* Copyright (C) 2005, Intec Automation (mike@steroidmicros.com)
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
/***************************************************************************/
|
||||
|
||||
/*
|
||||
* linux/arch/m68knommu/platform/523x/config.c
|
||||
* m523x.c -- platform support for ColdFire 523x based boards
|
||||
*
|
||||
* Sub-architcture dependent initialization code for the Freescale
|
||||
* 523x CPUs.
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
/***************************************************************************/
|
||||
|
||||
/*
|
||||
* linux/arch/m68knommu/platform/5249/config.c
|
||||
* m5249.c -- platform support for ColdFire 5249 based boards
|
||||
*
|
||||
* Copyright (C) 2002, Greg Ungerer (gerg@snapgear.com)
|
||||
*/
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
/***************************************************************************/
|
||||
|
||||
/*
|
||||
* 525x.c
|
||||
* 525x.c -- platform support for ColdFire 525x based boards
|
||||
*
|
||||
* Copyright (C) 2012, Steven King <sfking@fdwdc.com>
|
||||
*/
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
/***************************************************************************/
|
||||
|
||||
/*
|
||||
* linux/arch/m68knommu/platform/5272/config.c
|
||||
* m5272.c -- platform support for ColdFire 5272 based boards
|
||||
*
|
||||
* Copyright (C) 1999-2002, Greg Ungerer (gerg@snapgear.com)
|
||||
* Copyright (C) 2001-2002, SnapGear Inc. (www.snapgear.com)
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
/***************************************************************************/
|
||||
|
||||
/*
|
||||
* linux/arch/m68knommu/platform/527x/config.c
|
||||
* m527x.c -- platform support for ColdFire 527x based boards
|
||||
*
|
||||
* Sub-architcture dependent initialization code for the Freescale
|
||||
* 5270/5271 CPUs.
|
||||
* 5270/5271 and 5274/5275 CPUs.
|
||||
*
|
||||
* Copyright (C) 1999-2004, Greg Ungerer (gerg@snapgear.com)
|
||||
* Copyright (C) 2001-2004, SnapGear Inc. (www.snapgear.com)
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
/***************************************************************************/
|
||||
|
||||
/*
|
||||
* linux/arch/m68knommu/platform/528x/config.c
|
||||
* m528x.c -- platform support for ColdFire 528x based boards
|
||||
*
|
||||
* Sub-architcture dependent initialization code for the Freescale
|
||||
* 5280, 5281 and 5282 CPUs.
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
/***************************************************************************/
|
||||
|
||||
/*
|
||||
* linux/arch/m68knommu/platform/5307/config.c
|
||||
* m5307.c -- platform support for ColdFire 5307 based boards
|
||||
*
|
||||
* Copyright (C) 1999-2002, Greg Ungerer (gerg@snapgear.com)
|
||||
* Copyright (C) 2000, Lineo (www.lineo.com)
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
/***************************************************************************/
|
||||
|
||||
/*
|
||||
* linux/arch/m68knommu/platform/5407/config.c
|
||||
* m5407.c -- platform support for ColdFire 5407 based boards
|
||||
*
|
||||
* Copyright (C) 1999-2002, Greg Ungerer (gerg@snapgear.com)
|
||||
* Copyright (C) 2000, Lineo (www.lineo.com)
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
/***************************************************************************/
|
||||
|
||||
/*
|
||||
* linux/arch/m68knommu/platform/54xx/config.c
|
||||
* m54xx.c -- platform support for ColdFire 54xx based boards
|
||||
*
|
||||
* Copyright (C) 2010, Philippe De Muyter <phdm@macqel.be>
|
||||
*/
|
||||
|
|
@ -23,7 +23,6 @@
|
|||
#include <asm/mcfuart.h>
|
||||
#include <asm/mcfclk.h>
|
||||
#include <asm/m54xxgpt.h>
|
||||
#include <asm/mcfclk.h>
|
||||
#ifdef CONFIG_MMU
|
||||
#include <asm/mmu_context.h>
|
||||
#endif
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
/***************************************************************************/
|
||||
|
||||
/*
|
||||
* linux/arch/m68knommu/platform/coldfire/vectors.c
|
||||
* vectors.c -- high level trap setup for ColdFire
|
||||
*
|
||||
* Copyright (C) 1999-2007, Greg Ungerer <gerg@snapgear.com>
|
||||
*/
|
||||
|
|
@ -179,6 +179,15 @@ static inline void *ioremap_fullcache(unsigned long physaddr, unsigned long size
|
|||
*/
|
||||
#define xlate_dev_kmem_ptr(p) p
|
||||
|
||||
static inline void __iomem *ioport_map(unsigned long port, unsigned int nr)
|
||||
{
|
||||
return (void __iomem *) port;
|
||||
}
|
||||
|
||||
static inline void ioport_unmap(void __iomem *p)
|
||||
{
|
||||
}
|
||||
|
||||
#endif /* __KERNEL__ */
|
||||
|
||||
#endif /* _M68KNOMMU_IO_H */
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@
|
|||
#define PCIRFWPR (CONFIG_MBAR + 0x84d4) /* RX FIFO write pointer */
|
||||
|
||||
#define PACR (CONFIG_MBAR + 0xc00) /* PCI arbiter control */
|
||||
#define PASR (COFNIG_MBAR + 0xc04) /* PCI arbiter status */
|
||||
#define PASR (CONFIG_MBAR + 0xc04) /* PCI arbiter status */
|
||||
|
||||
/*
|
||||
* Definitions for the Global status and control register.
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
#
|
||||
# Makefile for the arch/m68knommu/platform.
|
||||
#
|
||||
Loading…
Reference in New Issue