diff options
Diffstat (limited to 'arch/frv')
| -rw-r--r-- | arch/frv/Kconfig | 4 | ||||
| -rw-r--r-- | arch/frv/Makefile | 22 | ||||
| -rw-r--r-- | arch/frv/include/asm/dma-mapping.h | 8 | ||||
| -rw-r--r-- | arch/frv/include/asm/highmem.h | 2 | ||||
| -rw-r--r-- | arch/frv/include/asm/ioctls.h | 2 | ||||
| -rw-r--r-- | arch/frv/include/asm/mem-layout.h | 2 | ||||
| -rw-r--r-- | arch/frv/include/asm/scatterlist.h | 2 | ||||
| -rw-r--r-- | arch/frv/include/asm/termbits.h | 1 |
8 files changed, 7 insertions, 36 deletions
diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig index 4b5830bcbe2e..16399bd24993 100644 --- a/arch/frv/Kconfig +++ b/arch/frv/Kconfig @@ -40,10 +40,6 @@ config GENERIC_HARDIRQS_NO__DO_IRQ bool default y -config GENERIC_TIME - bool - default y - config TIME_LOW_RES bool default y diff --git a/arch/frv/Makefile b/arch/frv/Makefile index 310c47a663f8..7ff84575b186 100644 --- a/arch/frv/Makefile +++ b/arch/frv/Makefile @@ -23,20 +23,14 @@ # Copyright (C) 1994 by Hamish Macdonald # -CCSPECS := $(shell $(CC) -v 2>&1 | grep "^Reading specs from " | head -1 | cut -c20-) -CCDIR := $(strip $(patsubst %/specs,%,$(CCSPECS))) -CPUCLASS := fr400 - -# test for cross compiling -COMPILE_ARCH = $(shell uname -m) - ifdef CONFIG_MMU UTS_SYSNAME = -DUTS_SYSNAME=\"Linux\" else UTS_SYSNAME = -DUTS_SYSNAME=\"uClinux\" endif -ARCHMODFLAGS += -G0 -mlong-calls +KBUILD_AFLAGS_MODULE += -G0 -mlong-calls +KBUILD_CFLAGS_MODULE += -G0 -mlong-calls ifdef CONFIG_GPREL_DATA_8 KBUILD_CFLAGS += -G8 @@ -54,7 +48,6 @@ endif ifdef CONFIG_GC_SECTIONS KBUILD_CFLAGS += -ffunction-sections -fdata-sections -LINKFLAGS += --gc-sections endif ifndef CONFIG_FRAME_POINTER @@ -64,16 +57,13 @@ endif ifdef CONFIG_CPU_FR451_COMPILE KBUILD_CFLAGS += -mcpu=fr450 KBUILD_AFLAGS += -mcpu=fr450 -ASFLAGS += -mcpu=fr450 else ifdef CONFIG_CPU_FR551_COMPILE KBUILD_CFLAGS += -mcpu=fr550 KBUILD_AFLAGS += -mcpu=fr550 -ASFLAGS += -mcpu=fr550 else KBUILD_CFLAGS += -mcpu=fr400 KBUILD_AFLAGS += -mcpu=fr400 -ASFLAGS += -mcpu=fr400 endif endif @@ -83,14 +73,12 @@ endif KBUILD_CFLAGS += -mno-fdpic -mgpr-32 -msoft-float -mno-media KBUILD_CFLAGS += -ffixed-fcc3 -ffixed-cc3 -ffixed-gr15 -ffixed-icc2 KBUILD_AFLAGS += -mno-fdpic -ASFLAGS += -mno-fdpic # make sure the .S files get compiled with debug info # and disable optimisations that are unhelpful whilst debugging ifdef CONFIG_DEBUG_INFO #KBUILD_CFLAGS += -O1 KBUILD_AFLAGS += -Wa,--gdwarf2 -ASFLAGS += -Wa,--gdwarf2 endif head-y := arch/frv/kernel/head.o arch/frv/kernel/init_task.o @@ -105,11 +93,5 @@ all: Image Image: vmlinux $(Q)$(MAKE) $(build)=arch/frv/boot $@ -bootstrap: - $(Q)$(MAKEBOOT) bootstrap - archclean: $(Q)$(MAKE) $(clean)=arch/frv/boot - -archdep: scripts/mkdep symlinks - $(Q)$(MAKE) $(build)=arch/frv/boot dep diff --git a/arch/frv/include/asm/dma-mapping.h b/arch/frv/include/asm/dma-mapping.h index 6af5d83e2fb2..dfb811002c64 100644 --- a/arch/frv/include/asm/dma-mapping.h +++ b/arch/frv/include/asm/dma-mapping.h @@ -126,14 +126,6 @@ int dma_set_mask(struct device *dev, u64 mask) } static inline -int dma_get_cache_alignment(void) -{ - return 1 << L1_CACHE_SHIFT; -} - -#define dma_is_consistent(d, h) (1) - -static inline void dma_cache_sync(struct device *dev, void *vaddr, size_t size, enum dma_data_direction direction) { diff --git a/arch/frv/include/asm/highmem.h b/arch/frv/include/asm/highmem.h index 68e4677fb9e7..cb4c317eaecc 100644 --- a/arch/frv/include/asm/highmem.h +++ b/arch/frv/include/asm/highmem.h @@ -152,7 +152,7 @@ do { \ asm volatile("tlbpr %0,gr0,#4,#1" : : "r"(vaddr) : "memory"); \ } while(0) -static inline void kunmap_atomic(void *kvaddr, enum km_type type) +static inline void kunmap_atomic_notypecheck(void *kvaddr, enum km_type type) { switch (type) { case 0: __kunmap_atomic_primary(0, 2); break; diff --git a/arch/frv/include/asm/ioctls.h b/arch/frv/include/asm/ioctls.h index d0c30e31fbda..a993e3759ccf 100644 --- a/arch/frv/include/asm/ioctls.h +++ b/arch/frv/include/asm/ioctls.h @@ -53,6 +53,7 @@ #define TCSETSF2 _IOW('T',0x2D, struct termios2) #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ #define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */ +#define TIOCSIG _IOW('T',0x36, int) /* Generate signal on Pty slave */ #define FIONCLEX 0x5450 /* these numbers need to be adjusted. */ #define FIOCLEX 0x5451 @@ -79,6 +80,7 @@ #define TIOCPKT_START 8 #define TIOCPKT_NOSTOP 16 #define TIOCPKT_DOSTOP 32 +#define TIOCPKT_IOCTL 64 #define TIOCSER_TEMT 0x01 /* Transmitter physically empty */ diff --git a/arch/frv/include/asm/mem-layout.h b/arch/frv/include/asm/mem-layout.h index ccae981876fa..e9a0ec85a402 100644 --- a/arch/frv/include/asm/mem-layout.h +++ b/arch/frv/include/asm/mem-layout.h @@ -35,7 +35,7 @@ * the slab must be aligned such that load- and store-double instructions don't * fault if used */ -#define ARCH_KMALLOC_MINALIGN L1_CACHE_BYTES +#define ARCH_DMA_MINALIGN L1_CACHE_BYTES #define ARCH_SLAB_MINALIGN L1_CACHE_BYTES /*****************************************************************************/ diff --git a/arch/frv/include/asm/scatterlist.h b/arch/frv/include/asm/scatterlist.h index 1614bfd7e3a4..0e5eb3018468 100644 --- a/arch/frv/include/asm/scatterlist.h +++ b/arch/frv/include/asm/scatterlist.h @@ -3,6 +3,4 @@ #include <asm-generic/scatterlist.h> -#define ISA_DMA_THRESHOLD (0xffffffffUL) - #endif /* !_ASM_SCATTERLIST_H */ diff --git a/arch/frv/include/asm/termbits.h b/arch/frv/include/asm/termbits.h index 5568492b5086..7722e19cc349 100644 --- a/arch/frv/include/asm/termbits.h +++ b/arch/frv/include/asm/termbits.h @@ -180,6 +180,7 @@ struct ktermios { #define FLUSHO 0010000 #define PENDIN 0040000 #define IEXTEN 0100000 +#define EXTPROC 0200000 /* tcflow() and TCXONC use these */ |