diff options
| author |   Masahiro Yamada <yamada.masahiro@socionext.com> | 2019-06-03 17:12:32 +0900 |
|---|---|---|
| committer |   Olof Johansson <olof@lixom.net> | 2019-06-17 04:45:17 -0700 |
| commit | 7b43b8fdc9a6283c0b9405542c4406cfa1e5689a (patch) | |
| tree | 0f7636ea8a4d75a61e3436adcac92ba82a542be6 | |
| parent | Merge tag 'tee-maint-for-5.3' of https://git.linaro.org/people/jens.wiklander/linux-tee into arm/drivers (diff) | |
| download | linux-dev-7b43b8fdc9a6283c0b9405542c4406cfa1e5689a.tar.xz linux-dev-7b43b8fdc9a6283c0b9405542c4406cfa1e5689a.zip | |
memory: move jedec_ddr_data.c from lib/ to drivers/memory/
jedec_ddr_data.c exports 3 symbols, and all of them are only
referenced from drivers/memory/{emif.c,of_memory.c}
drivers/memory/ is a better location than lib/.
I removed the Kconfig prompt "JEDEC DDR data" because it is only
select'ed by TI_EMIF, and there is no other user. There is no good
reason in making it a user-configurable CONFIG option.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | drivers/memory/Kconfig | 8 | ||||
| -rw-r--r-- | drivers/memory/Makefile | 1 | ||||
| -rw-r--r-- | drivers/memory/jedec_ddr_data.c (renamed from lib/jedec_ddr_data.c) | 0 | ||||
| -rw-r--r-- | lib/Kconfig | 8 | ||||
| -rw-r--r-- | lib/Makefile | 2 |
5 files changed, 9 insertions, 10 deletions
diff --git a/drivers/memory/Kconfig b/drivers/memory/Kconfig index 392ad4f5c570..477f0f130e5b 100644 --- a/drivers/memory/Kconfig +++ b/drivers/memory/Kconfig @@ -8,6 +8,14 @@ menuconfig MEMORY if MEMORY +config DDR + bool + help + Data from JEDEC specs for DDR SDRAM memories, + particularly the AC timing parameters and addressing + information. This data is useful for drivers handling + DDR SDRAM controllers. + config ARM_PL172_MPMC tristate "ARM PL172 MPMC driver" depends on ARM_AMBA && OF diff --git a/drivers/memory/Makefile b/drivers/memory/Makefile index 91ae4eb0e913..9d5c409a1591 100644 --- a/drivers/memory/Makefile +++ b/drivers/memory/Makefile @@ -3,6 +3,7 @@ # Makefile for memory devices # +obj-$(CONFIG_DDR) += jedec_ddr_data.o ifeq ($(CONFIG_DDR),y) obj-$(CONFIG_OF) += of_memory.o endif diff --git a/lib/jedec_ddr_data.c b/drivers/memory/jedec_ddr_data.c index 6d2cbf1d567f..6d2cbf1d567f 100644 --- a/lib/jedec_ddr_data.c +++ b/drivers/memory/jedec_ddr_data.c diff --git a/lib/Kconfig b/lib/Kconfig index 90623a0e1942..e09b3e081a53 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -531,14 +531,6 @@ config LRU_CACHE config CLZ_TAB bool -config DDR - bool "JEDEC DDR data" - help - Data from JEDEC specs for DDR SDRAM memories, - particularly the AC timing parameters and addressing - information. This data is useful for drivers handling - DDR SDRAM controllers. - config IRQ_POLL bool "IRQ polling library" help diff --git a/lib/Makefile b/lib/Makefile index fb7697031a79..cb66bc9c5b2f 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -206,8 +206,6 @@ obj-$(CONFIG_SIGNATURE) += digsig.o lib-$(CONFIG_CLZ_TAB) += clz_tab.o -obj-$(CONFIG_DDR) += jedec_ddr_data.o - obj-$(CONFIG_GENERIC_STRNCPY_FROM_USER) += strncpy_from_user.o obj-$(CONFIG_GENERIC_STRNLEN_USER) += strnlen_user.o |