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

Commit 367b8112 authored by Chris Zankel's avatar Chris Zankel
Browse files

xtensa: move headers files to arch/xtensa/include 



Move all header files for xtensa to arch/xtensa/include and platform and
variant header files to the appropriate arch/xtensa/platforms/ and
arch/xtensa/variants/ directories.

Moving the files gets also rid of all uses of symlinks in the Makefile.

This has been completed already for the majority of the architectures
and xtensa is one out of six missing.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarChris Zankel <chris@zankel.net>
parent 206ead28

arch/xtensa/Makefile

+9 −19
Original line number Original line Diff line number Diff line
@@ -33,6 +33,15 @@ KBUILD_CFLAGS += -ffreestanding 




KBUILD_CFLAGS += -pipe -mlongcalls

KBUILD_CFLAGS += -pipe -mlongcalls





vardirs := $(patsubst %,arch/xtensa/variants/%/,$(variant-y))

plfdirs := $(patsubst %,arch/xtensa/platforms/%/,$(platform-y))



ifeq ($(KBUILD_SRC),)

KBUILD_CPPFLAGS += $(patsubst %,-I%include,$(vardirs) $(plfdirs))

else

KBUILD_CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(vardirs) $(plfdirs))

endif



KBUILD_DEFCONFIG := iss_defconfig

KBUILD_DEFCONFIG := iss_defconfig





# ramdisk/initrd support

# ramdisk/initrd support
@@ -66,21 +75,6 @@ libs-y += arch/xtensa/lib/ $(LIBGCC) 




boot		:= arch/xtensa/boot

boot		:= arch/xtensa/boot





archinc		:= include/asm-xtensa



archprepare: $(archinc)/.platform



# Update processor variant and platform symlinks if something which affects

# them changed.



$(archinc)/.platform: $(wildcard include/config/arch/*.h) include/config/auto.conf

	@echo '  SYMLINK $(archinc)/variant -> $(archinc)/variant-$(VARIANT)'

	$(Q)mkdir -p $(archinc)

	$(Q)ln -fsn $(srctree)/$(archinc)/variant-$(VARIANT) $(archinc)/variant

	@echo '  SYMLINK $(archinc)/platform -> $(archinc)/platform-$(PLATFORM)'

	$(Q)ln -fsn $(srctree)/$(archinc)/platform-$(PLATFORM) $(archinc)/platform

	@touch $@







all: zImage

all: zImage
@@ -89,10 +83,6 @@ bzImage : zImage 
zImage zImage.initrd: vmlinux

zImage zImage.initrd: vmlinux

	$(Q)$(MAKE) $(build)=$(boot) $@

	$(Q)$(MAKE) $(build)=$(boot) $@





CLEAN_FILES	+= arch/xtensa/vmlinux.lds                      \

		   $(archinc)/platform $(archinc)/variant	\

		   $(archinc)/.platform



define archhelp

define archhelp

  @echo '* zImage      - Compressed kernel image (arch/xtensa/boot/images/zImage.*)'

  @echo '* zImage      - Compressed kernel image (arch/xtensa/boot/images/zImage.*)'

endef

endef

arch/xtensa/boot/boot-elf/boot.lds.S

+1 −1
Original line number Original line Diff line number Diff line 
#include <asm/variant/core.h>

#include <variant/core.h>

OUTPUT_ARCH(xtensa)

OUTPUT_ARCH(xtensa)

ENTRY(_ResetVector)

ENTRY(_ResetVector)

arch/xtensa/boot/boot-redboot/bootstrap.S

+1 −1
Original line number Original line Diff line number Diff line 
#include <asm/variant/core.h>

#include <variant/core.h>

#include <asm/regs.h>

#include <asm/regs.h>

#include <asm/asmmacro.h>

#include <asm/asmmacro.h>

#include <asm/cacheasm.h>

#include <asm/cacheasm.h>

include/asm-xtensa/asmmacro.h→arch/xtensa/include/asm/asmmacro.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -11,7 +11,7 @@ 
#ifndef _XTENSA_ASMMACRO_H

#ifndef _XTENSA_ASMMACRO_H

#define _XTENSA_ASMMACRO_H

#define _XTENSA_ASMMACRO_H





#include <asm/variant/core.h>

#include <variant/core.h>





/*

/*

 * Some little helpers for loops. Use zero-overhead-loops

 * Some little helpers for loops. Use zero-overhead-loops