diff options
author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2019-03-30 15:04:18 +0300 |
---|---|---|
committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2019-04-08 15:03:34 +0300 |
commit | ad4d1216f2c55439e9703de1515812c018984dca (patch) | |
tree | 4ffb45f499f57954802c2fae648198af404eaeb5 /drivers/memory | |
parent | a9a49c2ad9b9b8ee20668c15ca2b806dbed8ea40 (diff) | |
download | linux-ad4d1216f2c55439e9703de1515812c018984dca.tar.xz |
memory: squash drivers/memory/Makefile.asm-offsets
drivers/memory/Makefile.asm-offsets is small enough, and included
from a single place.
Squash it into drivers/memory/Makefile.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'drivers/memory')
-rw-r--r-- | drivers/memory/Makefile | 7 | ||||
-rw-r--r-- | drivers/memory/Makefile.asm-offsets | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/drivers/memory/Makefile b/drivers/memory/Makefile index 90161dec6fa5..91ae4eb0e913 100644 --- a/drivers/memory/Makefile +++ b/drivers/memory/Makefile @@ -28,6 +28,9 @@ ti-emif-sram-objs := ti-emif-pm.o ti-emif-sram-pm.o AFLAGS_ti-emif-sram-pm.o :=-Wa,-march=armv7-a -include drivers/memory/Makefile.asm-offsets - drivers/memory/ti-emif-sram-pm.o: include/generated/ti-emif-asm-offsets.h + +include/generated/ti-emif-asm-offsets.h: drivers/memory/emif-asm-offsets.s FORCE + $(call filechk,offsets,__TI_EMIF_ASM_OFFSETS_H__) + +targets += emif-asm-offsets.s diff --git a/drivers/memory/Makefile.asm-offsets b/drivers/memory/Makefile.asm-offsets deleted file mode 100644 index 0447e174c752..000000000000 --- a/drivers/memory/Makefile.asm-offsets +++ /dev/null @@ -1,4 +0,0 @@ -include/generated/ti-emif-asm-offsets.h: drivers/memory/emif-asm-offsets.s FORCE - $(call filechk,offsets,__TI_EMIF_ASM_OFFSETS_H__) - -targets += emif-asm-offsets.s |