diff options
| author |   Masahiro Yamada <yamada.masahiro@socionext.com> | 2019-04-12 12:09:41 +0900 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2019-07-17 10:25:10 +0900 |
| commit | eef58fdd010796a39be721b66c80d4a19b876e79 (patch) | |
| tree | 21b878722da00cae9762887119e789370e27565f /drivers/memory | |
| parent | Merge tag 'for-linus-20190715' of git://git.kernel.dk/linux-block (diff) | |
| download | linux-dev-eef58fdd010796a39be721b66c80d4a19b876e79.tar.xz linux-dev-eef58fdd010796a39be721b66c80d4a19b876e79.zip | |
memory: ti-emif-sram: move driver-specific asm-offset.h to drivers/memory/
<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>
Acked-by: Santosh Shilimkar <ssantosh@kernel.org>
Diffstat (limited to 'drivers/memory')
| -rw-r--r-- | drivers/memory/.gitignore | 1 | ||||
| -rw-r--r-- | drivers/memory/Makefile | 5 | ||||
| -rw-r--r-- | drivers/memory/ti-emif-sram-pm.S | 2 |
3 files changed, 5 insertions, 3 deletions
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 d75ae18efa7d..d1c83bd5b98e 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 |