You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
[CRIS] Move header files from include to arch/cris/include.
Change all users of header files to correct path. Remove some unneeded headers for arch-v32. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
This commit is contained in:
+9
-17
@@ -23,12 +23,16 @@ mach-$(CONFIG_ETRAXFS) := fs
|
||||
|
||||
ifneq ($(arch-y),)
|
||||
SARCH := arch-$(arch-y)
|
||||
inc := -Iarch/cris/include/arch-$(arch-y) -Iarch/cris/include/arch-$(arch-y)/arch
|
||||
else
|
||||
SARCH :=
|
||||
inc :=
|
||||
endif
|
||||
|
||||
ifneq ($(mach-y),)
|
||||
MACH := mach-$(mach-y)
|
||||
inc += -Iarch/cris/include/$(SARCH)/$(MACH)/
|
||||
inc += -Iarch/cris/include/$(SARCH)/$(MACH)/mach
|
||||
else
|
||||
MACH :=
|
||||
endif
|
||||
@@ -39,9 +43,9 @@ OBJCOPYFLAGS := -O binary -R .note -R .comment -S
|
||||
|
||||
CPPFLAGS_vmlinux.lds = -DDRAM_VIRTUAL_BASE=0x$(CONFIG_ETRAX_DRAM_VIRTUAL_BASE)
|
||||
|
||||
KBUILD_AFLAGS += -mlinux -march=$(arch-y) -Iinclude/asm/arch/mach -Iinclude/asm/arch
|
||||
|
||||
KBUILD_CFLAGS += -mlinux -march=$(arch-y) -pipe -Iinclude/asm/arch/mach -Iinclude/asm/arch
|
||||
KBUILD_AFLAGS += -mlinux -march=$(arch-y) $(inc)
|
||||
KBUILD_CFLAGS += -mlinux -march=$(arch-y) -pipe $(inc)
|
||||
KBUILD_CPPFLAGS += $(inc)
|
||||
|
||||
ifdef CONFIG_FRAME_POINTER
|
||||
KBUILD_CFLAGS := $(subst -fomit-frame-pointer,,$(KBUILD_CFLAGS)) -g
|
||||
@@ -73,7 +77,7 @@ all: zImage
|
||||
zImage Image: vmlinux
|
||||
$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@
|
||||
|
||||
archprepare: $(SRC_ARCH)/.links $(srctree)/include/asm-$(ARCH)/.arch FORCE
|
||||
archprepare: $(SRC_ARCH)/.links FORCE
|
||||
|
||||
# Create some links to make all tools happy
|
||||
$(SRC_ARCH)/.links:
|
||||
@@ -95,17 +99,6 @@ endif
|
||||
@ln -sfn ../$(SARCH)/kernel/asm-offsets.c $(SRC_ARCH)/kernel/asm-offsets.c
|
||||
@touch $@
|
||||
|
||||
# Create link to sub arch includes
|
||||
$(srctree)/include/asm-$(ARCH)/.arch: $(wildcard include/config/arch/*.h)
|
||||
@echo ' SYMLINK include/asm-$(ARCH)/arch -> include/asm-$(ARCH)/$(SARCH)'
|
||||
@rm -f $(srctree)/include/asm-$(ARCH)/arch/mach
|
||||
@rm -f $(srctree)/include/asm-$(ARCH)/arch
|
||||
@ln -sf $(SARCH) $(srctree)/include/asm-$(ARCH)/arch
|
||||
ifdef CONFIG_ETRAX_ARCH_V32
|
||||
@ln -sf $(MACH) $(srctree)/include/asm-$(ARCH)/arch/mach
|
||||
endif
|
||||
@touch $@
|
||||
|
||||
archclean:
|
||||
$(Q)if [ -e arch/$(ARCH)/boot ]; then \
|
||||
$(MAKE) $(clean)=arch/$(ARCH)/boot; \
|
||||
@@ -116,8 +109,7 @@ CLEAN_FILES += \
|
||||
$(MACHINE)/boot/compressed/decompress.bin \
|
||||
$(MACHINE)/boot/compressed/piggy.gz \
|
||||
$(MACHINE)/boot/rescue/rescue.bin \
|
||||
$(SRC_ARCH)/.links \
|
||||
$(srctree)/include/asm-$(ARCH)/.arch
|
||||
$(SRC_ARCH)/.links
|
||||
|
||||
MRPROPER_FILES += \
|
||||
$(SRC_ARCH)/drivers \
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
Image
|
||||
zImage
|
||||
@@ -9,7 +9,7 @@
|
||||
*/
|
||||
|
||||
#define ASSEMBLER_MACROS_ONLY
|
||||
#include <asm/arch/sv_addr_ag.h>
|
||||
#include <arch/sv_addr_ag.h>
|
||||
|
||||
#define RAM_INIT_MAGIC 0x56902387
|
||||
#define COMMAND_LINE_MAGIC 0x87109563
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
|
||||
#include <linux/types.h>
|
||||
#include <asm/arch/svinto.h>
|
||||
#include <arch/svinto.h>
|
||||
|
||||
/*
|
||||
* gzip declarations
|
||||
|
||||
@@ -65,7 +65,7 @@
|
||||
#ifdef CONFIG_ETRAX_AXISFLASHMAP
|
||||
|
||||
#define ASSEMBLER_MACROS_ONLY
|
||||
#include <asm/arch/sv_addr_ag.h>
|
||||
#include <arch/sv_addr_ag.h>
|
||||
|
||||
;; The partitiontable is looked for at the first sector after the boot
|
||||
;; sector. Sector size is 65536 bytes in all flashes we use.
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
*/
|
||||
|
||||
#define ASSEMBLER_MACROS_ONLY
|
||||
#include <asm/arch/sv_addr_ag.h>
|
||||
#include <arch/sv_addr_ag.h>
|
||||
|
||||
#define CODE_START 0x40004000
|
||||
#define CODE_LENGTH 784
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
*/
|
||||
|
||||
#define ASSEMBLER_MACROS_ONLY
|
||||
#include <asm/arch/sv_addr_ag.h>
|
||||
#include <arch/sv_addr_ag.h>
|
||||
|
||||
.text
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
|
||||
#include <asm/axisflashmap.h>
|
||||
#include <asm/mmu.h>
|
||||
#include <asm/arch/sv_addr_ag.h>
|
||||
#include <arch/sv_addr_ag.h>
|
||||
|
||||
#ifdef CONFIG_CRIS_LOW_MAP
|
||||
#define FLASH_UNCACHED_ADDR KSEG_8
|
||||
|
||||
@@ -24,10 +24,10 @@
|
||||
|
||||
#include <asm/uaccess.h>
|
||||
#include <asm/system.h>
|
||||
#include <asm/arch/svinto.h>
|
||||
#include <arch/svinto.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/rtc.h>
|
||||
#include <asm/arch/io_interface_mux.h>
|
||||
#include <arch/io_interface_mux.h>
|
||||
|
||||
#include "i2c.h"
|
||||
|
||||
|
||||
@@ -23,11 +23,11 @@
|
||||
#include <linux/interrupt.h>
|
||||
|
||||
#include <asm/etraxgpio.h>
|
||||
#include <asm/arch/svinto.h>
|
||||
#include <arch/svinto.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/system.h>
|
||||
#include <asm/irq.h>
|
||||
#include <asm/arch/io_interface_mux.h>
|
||||
#include <arch/io_interface_mux.h>
|
||||
|
||||
#define GPIO_MAJOR 120 /* experimental MAJOR number */
|
||||
|
||||
|
||||
@@ -25,10 +25,10 @@
|
||||
#include <asm/etraxi2c.h>
|
||||
|
||||
#include <asm/system.h>
|
||||
#include <asm/arch/svinto.h>
|
||||
#include <arch/svinto.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/delay.h>
|
||||
#include <asm/arch/io_interface_mux.h>
|
||||
#include <arch/io_interface_mux.h>
|
||||
|
||||
#include "i2c.h"
|
||||
|
||||
|
||||
@@ -26,11 +26,11 @@
|
||||
#include <asm/irq.h>
|
||||
#include <asm/dma.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/arch/svinto.h>
|
||||
#include <arch/svinto.h>
|
||||
#include <asm/uaccess.h>
|
||||
#include <asm/system.h>
|
||||
#include <asm/sync_serial.h>
|
||||
#include <asm/arch/io_interface_mux.h>
|
||||
#include <arch/io_interface_mux.h>
|
||||
|
||||
/* The receiver is a bit tricky beacuse of the continuous stream of data.*/
|
||||
/* */
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include <linux/module.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/arch/svinto.h>
|
||||
#include <arch/svinto.h>
|
||||
|
||||
/* Export shadow registers for the CPU I/O pins */
|
||||
EXPORT_SYMBOL(genconfig_shadow);
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
#include <linux/delay.h>
|
||||
#include <linux/tty.h>
|
||||
#include <asm/system.h>
|
||||
#include <asm/arch/svinto.h>
|
||||
#include <arch/svinto.h>
|
||||
#include <asm/io.h> /* Get SIMCOUT. */
|
||||
|
||||
extern void reset_watchdog(void);
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#include <linux/errno.h>
|
||||
|
||||
#include <asm/dma.h>
|
||||
#include <asm/arch/svinto.h>
|
||||
#include <arch/svinto.h>
|
||||
|
||||
/* Macro to access ETRAX 100 registers */
|
||||
#define SETS(var, reg, field, val) var = (var & ~IO_MASK_(reg##_, field##_)) | \
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
#include <linux/linkage.h>
|
||||
#include <linux/sys.h>
|
||||
#include <asm/unistd.h>
|
||||
#include <asm/arch/sv_addr_ag.h>
|
||||
#include <arch/sv_addr_ag.h>
|
||||
#include <asm/errno.h>
|
||||
#include <asm/thread_info.h>
|
||||
#include <asm/asm-offsets.h>
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
#include <asm/rtc.h>
|
||||
|
||||
|
||||
#include <asm/arch/svinto.h>
|
||||
#include <arch/svinto.h>
|
||||
#include <asm/fasttimer.h>
|
||||
#include <linux/proc_fs.h>
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
#define ASSEMBLER_MACROS_ONLY
|
||||
/* The IO_* macros use the ## token concatenation operator, so
|
||||
-traditional must not be used when assembling this file. */
|
||||
#include <asm/arch/sv_addr_ag.h>
|
||||
#include <arch/sv_addr_ag.h>
|
||||
|
||||
#define CRAMFS_MAGIC 0x28cd3d45
|
||||
#define RAM_INIT_MAGIC 0x56902387
|
||||
|
||||
@@ -11,9 +11,9 @@
|
||||
#include <linux/module.h>
|
||||
#include <linux/init.h>
|
||||
|
||||
#include <asm/arch/svinto.h>
|
||||
#include <arch/svinto.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/arch/io_interface_mux.h>
|
||||
#include <arch/io_interface_mux.h>
|
||||
|
||||
|
||||
#define DBG(s)
|
||||
|
||||
@@ -176,7 +176,7 @@
|
||||
#include <asm/setup.h>
|
||||
#include <asm/ptrace.h>
|
||||
|
||||
#include <asm/arch/svinto.h>
|
||||
#include <arch/svinto.h>
|
||||
#include <asm/irq.h>
|
||||
|
||||
static int kgdb_started = 0;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user