Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 559df2e0210352f83926d178c40c51142292a18c

Authored by Sam Ravnborg
Committed by Michal Marek
1 parent 01fc0ac198
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

kbuild: move asm-offsets.h to include/generated 

The simplest method was to add an extra asm-offsets.h
file in arch/$ARCH/include/asm that references the generated file.

We can now migrate the architectures one-by-one to reference
the generated file direct - and when done we can delete the
temporary arch/$ARCH/include/asm/asm-offsets.h file.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Michal Marek <mmarek@suse.cz>

Showing 24 changed files with 22 additions and 4 deletions Side-by-side Diff

... ... @@ -46,7 +46,6 @@
46 46 # Generated include files
47 47 #
48 48 include/asm
49   -include/asm-*/asm-offsets.h
50 49 include/config
51 50 include/linux/autoconf.h
52 51 include/linux/compile.h
... ... @@ -43,7 +43,7 @@
43 43 # 2) Generate asm-offsets.h
44 44 #
45 45  
46   -offsets-file := include/asm/asm-offsets.h
  46 +offsets-file := include/generated/asm-offsets.h
47 47  
48 48 always += $(offsets-file)
49 49 targets += $(offsets-file)
... ... @@ -1197,7 +1197,6 @@
1197 1197 MRPROPER_FILES += .config .config.old include/asm .version .old_version \
1198 1198 include/linux/autoconf.h include/linux/version.h \
1199 1199 include/linux/utsrelease.h \
1200   - include/asm*/asm-offsets.h \
1201 1200 Module.symvers Module.markers tags TAGS cscope*
1202 1201  
1203 1202 # clean - Delete most, but leave enough to build external modules
arch/alpha/include/asm/asm-offsets.h
Diff comments   View file @ 559df2e
  1 +#include <generated/asm-offsets.h>
arch/arm/include/asm/asm-offsets.h
Diff comments   View file @ 559df2e
  1 +#include <generated/asm-offsets.h>
arch/avr32/include/asm/asm-offsets.h
Diff comments   View file @ 559df2e
  1 +#include <generated/asm-offsets.h>
arch/blackfin/include/asm/asm-offsets.h
Diff comments   View file @ 559df2e
  1 +#include <generated/asm-offsets.h>
arch/cris/include/asm/asm-offsets.h
Diff comments   View file @ 559df2e
  1 +#include <generated/asm-offsets.h>
arch/frv/include/asm/asm-offsets.h
Diff comments   View file @ 559df2e
  1 +#include <generated/asm-offsets.h>
arch/h8300/include/asm/asm-offsets.h
Diff comments   View file @ 559df2e
  1 +#include <generated/asm-offsets.h>
arch/ia64/include/asm/asm-offsets.h
Diff comments   View file @ 559df2e
  1 +#include <generated/asm-offsets.h>
arch/m68k/include/asm/asm-offsets.h
Diff comments   View file @ 559df2e
  1 +#include <generated/asm-offsets.h>
arch/microblaze/include/asm/asm-offsets.h
Diff comments   View file @ 559df2e
  1 +#include <generated/asm-offsets.h>
arch/mips/include/asm/asm-offsets.h
Diff comments   View file @ 559df2e
  1 +#include <generated/asm-offsets.h>
arch/mn10300/include/asm/asm-offsets.h
Diff comments   View file @ 559df2e
  1 +#include <generated/asm-offsets.h>
arch/parisc/include/asm/asm-offsets.h
Diff comments   View file @ 559df2e
  1 +#include <generated/asm-offsets.h>
arch/powerpc/include/asm/asm-offsets.h
Diff comments   View file @ 559df2e
  1 +#include <generated/asm-offsets.h>
arch/s390/include/asm/asm-offsets.h
Diff comments   View file @ 559df2e
  1 +#include <generated/asm-offsets.h>
arch/sh/include/asm/asm-offsets.h
Diff comments   View file @ 559df2e
  1 +#include <generated/asm-offsets.h>
arch/sparc/include/asm/asm-offsets.h
Diff comments   View file @ 559df2e
  1 +#include <generated/asm-offsets.h>
... ... @@ -149,7 +149,7 @@
149 149  
150 150 $(SHARED_HEADERS)/kern_constants.h:
151 151 $(Q)mkdir -p $(dir $@)
152   - $(Q)echo '#include "../../../../include/asm/asm-offsets.h"' >$@
  152 + $(Q)echo '#include "../../../../include/generated/asm-offsets.h"' >$@
153 153  
154 154 export SUBARCH USER_CFLAGS CFLAGS_NO_HARDENING OS HEADER_ARCH DEV_NULL_PATH
arch/um/include/asm/asm-offsets.h
Diff comments   View file @ 559df2e
  1 +#include <generated/asm-offsets.h>
arch/x86/include/asm/asm-offsets.h
Diff comments   View file @ 559df2e
  1 +#include <generated/asm-offsets.h>
arch/xtensa/include/asm/asm-offsets.h
Diff comments   View file @ 559df2e
  1 +#include <generated/asm-offsets.h>