Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0242909a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'cris_move' of git://www.jni.nu/cris 

* 'cris_move' of git://www.jni.nu/cris:
  [CRIS] Move header files from include to arch/cris/include.
  [CRISv32] Remove warning in io.h
parents 0a6d2fac 556dcee7

arch/cris/Makefile

+9 −17
Original line number Diff line number Diff line
@@ -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 \

arch/cris/arch-v10/boot/.gitignore

0 → 100644
+2 −0
Original line number Diff line number Diff line 
Image

zImage

arch/cris/arch-v10/boot/compressed/head.S

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/cris/arch-v10/boot/compressed/misc.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 




#include <linux/types.h>

#include <asm/arch/svinto.h>

#include <arch/svinto.h>



/*

 * gzip declarations

arch/cris/arch-v10/boot/rescue/head.S

+1 −1
Original line number Diff line number Diff line
@@ -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.