]> rtime.felk.cvut.cz Git - can-eth-gw-linux.git/commit
memory: fix build when CONFIG_OF && !CONFIG_DDR
authorStephen Warren <swarren@nvidia.com>
Wed, 5 Sep 2012 18:29:23 +0000 (12:29 -0600)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 5 Sep 2012 18:57:19 +0000 (11:57 -0700)
commit7c304d7e24fd4996a2b219312f739c4406b8e2e3
tree6f513d00e0bda25b934baf0e3ee36b83ecaa2d04
parente6b42eb6a66c188642aeb447312938c6f6ebee86
memory: fix build when CONFIG_OF && !CONFIG_DDR

Commit e6b42eb "memory: emif: add device tree support to emif driver"
added drivers/memory/of_memory.c, which references tables defined in
lib/jedec_ddr_data.c. of_memory.c is compiled when CONFIG_OF, whereas
jedec_ddr_data.c is compiled when CONFIG_DDR. This breaks the build
when CONFIG_OF is defined but not CONFIG_DDR:

drivers/built-in.o: In function `of_get_ddr_timings':
drivers/memory/of_memory.c:138: undefined reference to `lpddr2_jedec_timings'
drivers/built-in.o: In function `of_get_min_tck':
drivers/memory/of_memory.c:62: undefined reference to `lpddr2_jedec_min_tck'
make: *** [vmlinux] Error 1

To solve this, only compile of_memory.c when CONFIG_OF && CONFIG_DDR,
otherwise, stub out the functions.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/memory/Makefile
drivers/memory/of_memory.h