From ad4d1216f2c55439e9703de1515812c018984dca Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Sat, 30 Mar 2019 21:04:18 +0900 Subject: [PATCH] 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 --- drivers/memory/Makefile | 7 +++++-- drivers/memory/Makefile.asm-offsets | 4 ---- 2 files changed, 5 insertions(+), 6 deletions(-) delete mode 100644 drivers/memory/Makefile.asm-offsets 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 -- GitLab