nxp: Cleanup some emulator related options.

- Drop the emulator CONFIG test from include/configs/ls1088ardb.h
- Migrate CONFIG_SYS_FSL_DDR_EMU to a select'able option in
  drivers/ddr/fsl/Kconfig

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/README b/README
index c1d516beda87e6140ca3fa015b9eee40886713d9..0cf1c4991a4c1a21a12230bedd40fa3c813f1151 100644 (file)
--- a/README
+++ b/README
@@ -388,10 +388,6 @@ The following options need to be configured:
                CONFIG_SYS_FSL_DDR_ADDR
                Freescale DDR memory-mapped register base.
 
-               CONFIG_SYS_FSL_DDR_EMU
-               Specify emulator support for DDR. Some DDR features such as
-               deskew training are not available.
-
                CONFIG_SYS_FSL_DDRC_GEN1
                Freescale DDR1 controller.
 

diff --git a/drivers/ddr/fsl/Kconfig b/drivers/ddr/fsl/Kconfig
index fe69bef3d3aea0afe0922a7898914f2857be2bef..6a29b23bab7e530c65f5a5e877b5e590eba6d3a0 100644 (file)
--- a/drivers/ddr/fsl/Kconfig
+++ b/drivers/ddr/fsl/Kconfig
@@ -10,6 +10,12 @@ config SYS_FSL_MMDC
        help
          Select Freescale Multi Mode DDR controller (MMDC).
 
+config SYS_FSL_DDR_EMU
+       bool
+       help
+         Specify emulator support for DDR. Some DDR features such as deskew
+         training are not available.
+
 if SYS_FSL_DDR || SYS_FSL_MMDC
 
 config SYS_FSL_DDR_BE

diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h
index c69003018bfcb377b86a10d20a12a090523f5b58..aeadf534bc32e6be010a95094650536e6b6180dc 100644 (file)
--- a/include/configs/ls1088ardb.h
+++ b/include/configs/ls1088ardb.h
@@ -15,11 +15,7 @@
 
 #define COUNTER_FREQUENCY_REAL         25000000        /* 25MHz */
 
-#ifdef CONFIG_EMU
-#define CONFIG_SYS_FSL_DDR_EMU
-#else
 #define CONFIG_MEM_INIT_VALUE          0xdeadbeef
-#endif
 #define SPD_EEPROM_ADDRESS     0x51
 #define CONFIG_SYS_SPD_BUS_NUM 0       /* SPD on I2C bus 0 */