diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-08-06 12:33:24 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-08-06 12:33:24 +0200 |
| commit | fd58dc84cb00c68586d269887971656bf462437f (patch) | |
| tree | d45ad33818dcf0a97752cc1593051260add0a0d9 /arch/ppc | |
| parent | 0dea9c7cf9820b43bf04810996cf8d732a4e0ee0 (diff) | |
| parent | 5a7deee7d5cfbe95a5b6026e7ed09a2facd0c8d6 (diff) | |
| download | barebox-fd58dc84cb00c68586d269887971656bf462437f.tar.gz barebox-fd58dc84cb00c68586d269887971656bf462437f.tar.xz | |
Merge branch 'for-next/spd'
Diffstat (limited to 'arch/ppc')
| -rw-r--r-- | arch/ppc/mach-mpc85xx/Kconfig | 4 | ||||
| -rw-r--r-- | arch/ppc/mach-mpc85xx/Makefile | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/arch/ppc/mach-mpc85xx/Kconfig b/arch/ppc/mach-mpc85xx/Kconfig index e29be9c19e..aa518b98fc 100644 --- a/arch/ppc/mach-mpc85xx/Kconfig +++ b/arch/ppc/mach-mpc85xx/Kconfig @@ -81,10 +81,6 @@ config P1022 config MPC8544 bool -config DDR_SPD - bool - select CRC16 - config FSL_DDR2 bool diff --git a/arch/ppc/mach-mpc85xx/Makefile b/arch/ppc/mach-mpc85xx/Makefile index 3e646178b9..de4f5efde2 100644 --- a/arch/ppc/mach-mpc85xx/Makefile +++ b/arch/ppc/mach-mpc85xx/Makefile @@ -9,5 +9,6 @@ obj-y += fsl_i2c.o obj-$(CONFIG_MP) += mp.o obj-$(CONFIG_OFTREE) += fdt.o obj-$(CONFIG_DRIVER_NET_GIANFAR) += eth-devices.o -obj-$(CONFIG_DDR_SPD) += ../ddr-8xxx/ +obj-$(CONFIG_FSL_DDR2) += ../ddr-8xxx/ +obj-$(CONFIG_FSL_DDR3) += ../ddr-8xxx/ extra-y += barebox.lds |