Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 130372
b: refs/heads/master
c: c4568d6
h: refs/heads/master
v: v3
  • Loading branch information
Linus Torvalds committed Jan 28, 2009
1 parent 0cc8834 commit c3d3714
Show file tree
Hide file tree
Showing 22 changed files with 80 additions and 1,185 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4c456a67f501b8b15542c7c21c28812bf88f484b
refs/heads/master: c4568d6c7ec7557fbe8656286aea29f67388f7d4
11 changes: 9 additions & 2 deletions trunk/arch/m68k/include/asm/cacheflush_no.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,20 @@ static inline void __flush_cache_all(void)
"movec %%d0,%%CACR\n\t"
: : : "d0", "a0" );
#endif /* CONFIG_M5407 */
#if defined(CONFIG_M527x) || defined(CONFIG_M528x)
#if defined(CONFIG_M523x) || defined(CONFIG_M527x)
__asm__ __volatile__ (
"movel #0x81400100, %%d0\n\t"
"movec %%d0, %%CACR\n\t"
"nop\n\t"
: : : "d0" );
#endif /* CONFIG_M523x || CONFIG_M527x */
#if defined(CONFIG_M528x)
__asm__ __volatile__ (
"movel #0x81000200, %%d0\n\t"
"movec %%d0, %%CACR\n\t"
"nop\n\t"
: : : "d0" );
#endif /* CONFIG_M527x || CONFIG_M528x */
#endif /* CONFIG_M528x */
#if defined(CONFIG_M5206) || defined(CONFIG_M5206e) || defined(CONFIG_M5272)
__asm__ __volatile__ (
"movel #0x81000100, %%d0\n\t"
Expand Down
4 changes: 0 additions & 4 deletions trunk/arch/m68k/include/asm/dma-mapping_no.h
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
#ifndef _M68KNOMMU_DMA_MAPPING_H
#define _M68KNOMMU_DMA_MAPPING_H

#ifdef CONFIG_PCI
#include <asm-generic/dma-mapping.h>
#else
#include <asm-generic/dma-mapping-broken.h>
#endif

#endif /* _M68KNOMMU_DMA_MAPPING_H */
2 changes: 1 addition & 1 deletion trunk/arch/m68k/include/asm/system_no.h
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int siz
jmp 0xf0000400; \
"); \
})
#elif defined(CONFIG_NETtel) || defined(CONFIG_eLIA) || \
#elif defined(CONFIG_NETtel) || \
defined(CONFIG_SECUREEDGEMP3) || defined(CONFIG_CLEOPATRA)
#define HARD_RESET_NOW() ({ \
asm(" \
Expand Down
27 changes: 4 additions & 23 deletions trunk/arch/m68knommu/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ config MMU
bool
default n

config NO_DMA
bool
default y

config FPU
bool
default n
Expand Down Expand Up @@ -398,12 +402,6 @@ config M5307C3
help
Support for the Motorola M5307C3 board.

config eLIA
bool "Moreton Bay eLIA board support"
depends on M5307
help
Support for the Moreton Bay eLIA board.

config SECUREEDGEMP3
bool "SnapGear SecureEdge/MP3 platform support"
depends on M5307
Expand Down Expand Up @@ -697,25 +695,8 @@ config ISA_DMA_API
depends on !M5272
default y

menu "Bus options (PCI, PCMCIA, EISA, MCA, ISA)"

config PCI
bool "PCI support"
help
Support for PCI bus.

config COMEMPCI
bool "CO-MEM lite PCI controller support"
depends on (M5307 || M5407)

source "drivers/pci/Kconfig"

source "drivers/pcmcia/Kconfig"

source "drivers/pci/hotplug/Kconfig"

endmenu

menu "Executable file formats"

source "fs/Kconfig.binfmt"
Expand Down
1 change: 0 additions & 1 deletion trunk/arch/m68knommu/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ board-$(CONFIG_M5271EVB) := M5271EVB
board-$(CONFIG_M5275EVB) := M5275EVB
board-$(CONFIG_M5282EVB) := M5282EVB
board-$(CONFIG_ELITE) := eLITE
board-$(CONFIG_eLIA) := eLIA
board-$(CONFIG_NETtel) := NETtel
board-$(CONFIG_SECUREEDGEMP3) := MP3
board-$(CONFIG_CLEOPATRA) := CLEOPATRA
Expand Down
1 change: 0 additions & 1 deletion trunk/arch/m68knommu/kernel/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,3 @@ obj-y += dma.o entry.o init_task.o irq.o m68k_ksyms.o process.o ptrace.o \
setup.o signal.o syscalltable.o sys_m68k.o time.o traps.o

obj-$(CONFIG_MODULES) += module.o
obj-$(CONFIG_COMEMPCI) += comempci.o
Loading

0 comments on commit c3d3714

Please sign in to comment.