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

Commit 5a077369 authored by Sam Ravnborg's avatar Sam Ravnborg
Browse files

kbuild: cris use generic asm-offsets.h support 



Cris has a dedicated asm-offsets.c file per subarchitecture.
So a symlink is created to put the desired asm-offsets.c file
in $(ARCH)/kernel
This is absolutely not good practice, but it was the trick
used in the rest of the cris code.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
parent 048eb582

arch/cris/Makefile

+2 −8
Original line number Diff line number Diff line
@@ -107,8 +107,7 @@ archclean: 
	rm -f timage vmlinux.bin decompress.bin rescue.bin cramfs.img

	rm -rf $(LD_SCRIPT).tmp



prepare: $(SRC_ARCH)/.links $(srctree)/include/asm-$(ARCH)/.arch \

	 include/asm-$(ARCH)/$(SARCH)/offset.h

prepare: $(SRC_ARCH)/.links $(srctree)/include/asm-$(ARCH)/.arch



# Create some links to make all tools happy

$(SRC_ARCH)/.links:
@@ -120,6 +119,7 @@ $(SRC_ARCH)/.links: 
	@ln -sfn $(SRC_ARCH)/$(SARCH)/lib $(SRC_ARCH)/lib

	@ln -sfn $(SRC_ARCH)/$(SARCH) $(SRC_ARCH)/arch

	@ln -sfn $(SRC_ARCH)/$(SARCH)/vmlinux.lds.S $(SRC_ARCH)/kernel/vmlinux.lds.S

	@ln -sfn $(SRC_ARCH)/$(SARCH)/asm-offsets.c $(SRC_ARCH)/kernel/asm-offsets.c

	@touch $@



# Create link to sub arch includes
@@ -128,9 +128,3 @@ $(srctree)/include/asm-$(ARCH)/.arch: $(wildcard include/config/arch/*.h) 
	@rm -f include/asm-$(ARCH)/arch

	@ln -sf $(srctree)/include/asm-$(ARCH)/$(SARCH) $(srctree)/include/asm-$(ARCH)/arch

	@touch $@
 


arch/$(ARCH)/$(SARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \

					include/config/MARKER



include/asm-$(ARCH)/$(SARCH)/offset.h: arch/$(ARCH)/$(SARCH)/kernel/asm-offsets.s

	$(call filechk,gen-asm-offsets)

arch/cris/arch-v10/kernel/entry.S

+1 −1
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ 
#include <asm/arch/sv_addr_ag.h>

#include <asm/errno.h>

#include <asm/thread_info.h>

#include <asm/arch/offset.h>

#include <asm/asm-offsets.h>

#include <asm/page.h>

#include <asm/pgtable.h>

arch/cris/arch-v32/kernel/entry.S

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <asm/unistd.h>

#include <asm/errno.h>

#include <asm/thread_info.h>

#include <asm/arch/offset.h>

#include <asm/asm-offsets.h>



#include <asm/arch/hwregs/asm/reg_map_asm.h>

#include <asm/arch/hwregs/asm/intr_vect_defs_asm.h>