| Message ID | 20190412030941.11373-1-yamada.masahiro@socionext.com |
|---|---|
| State | Accepted |
| Commit | eef58fdd010796a39be721b66c80d4a19b876e79 |
| Headers | show |
| Series | memory: ti-emif-sram: move driver-specific asm-offset.h to drivers/memory/ | expand |
On 4/11/19 8:09 PM, Masahiro Yamada wrote: > <generated/ti-emif-asm-offsets.h> is only generated and included > by drivers/memory/, so it does not need to reside in the globally > visible include/generated/. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > --- > > I will apply this to linux-kbuild since this depends on > another patch there. > Sure. Acked-by: Santosh Shilimkar <ssantosh@kernel.org>
diff --git a/drivers/memory/.gitignore b/drivers/memory/.gitignore new file mode 100644 index 000000000000..cbca8b028437 --- /dev/null +++ b/drivers/memory/.gitignore @@ -0,0 +1 @@ +ti-emif-asm-offsets.h diff --git a/drivers/memory/Makefile b/drivers/memory/Makefile index 91ae4eb0e913..2eb0a5b44bb9 100644 --- a/drivers/memory/Makefile +++ b/drivers/memory/Makefile @@ -28,9 +28,10 @@ ti-emif-sram-objs := ti-emif-pm.o ti-emif-sram-pm.o AFLAGS_ti-emif-sram-pm.o :=-Wa,-march=armv7-a -drivers/memory/ti-emif-sram-pm.o: include/generated/ti-emif-asm-offsets.h +$(obj)/ti-emif-sram-pm.o: $(obj)/ti-emif-asm-offsets.h -include/generated/ti-emif-asm-offsets.h: drivers/memory/emif-asm-offsets.s FORCE +$(obj)/ti-emif-asm-offsets.h: $(obj)/emif-asm-offsets.s FORCE $(call filechk,offsets,__TI_EMIF_ASM_OFFSETS_H__) targets += emif-asm-offsets.s +clean-files += ti-emif-asm-offsets.h diff --git a/drivers/memory/ti-emif-sram-pm.S b/drivers/memory/ti-emif-sram-pm.S index a5369181e5c2..615cd6247739 100644 --- a/drivers/memory/ti-emif-sram-pm.S +++ b/drivers/memory/ti-emif-sram-pm.S @@ -14,12 +14,12 @@ * GNU General Public License for more details. */ -#include <generated/ti-emif-asm-offsets.h> #include <linux/linkage.h> #include <asm/assembler.h> #include <asm/memory.h> #include "emif.h" +#include "ti-emif-asm-offsets.h" #define EMIF_POWER_MGMT_WAIT_SELF_REFRESH_8192_CYCLES 0x00a0 #define EMIF_POWER_MGMT_SR_TIMER_MASK 0x00f0
<generated/ti-emif-asm-offsets.h> is only generated and included by drivers/memory/, so it does not need to reside in the globally visible include/generated/. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- I will apply this to linux-kbuild since this depends on another patch there. drivers/memory/.gitignore | 1 + drivers/memory/Makefile | 5 +++-- drivers/memory/ti-emif-sram-pm.S | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 drivers/memory/.gitignore -- 2.17.1