Merge git://www.denx.de/git/u-boot-imx

[u-boot] / include / configs / platinum_titanium.h

diff --git a/include/configs/platinum_titanium.h b/include/configs/platinum_titanium.h
index 678965505f630ee2fb375bec66c3f11ee7c50c2d..69406a4b65eed8b49cec3ee3b51f268b3e179695 100644 (file)
--- a/include/configs/platinum_titanium.h
+++ b/include/configs/platinum_titanium.h
@@ -12,8 +12,6 @@
 #define CONFIG_PLATINUM_PROJECT                        "titanium"
 #define CONFIG_PLATINUM_CPU                    "imx6q"
 
-#define CONFIG_MX6
-
 #define PHYS_SDRAM_SIZE                                (512 << 20)
 #define CONFIG_SYS_NAND_MAX_CHIPS              1
 
@@ -22,14 +20,10 @@
 #define CONFIG_FEC_XCV_TYPE                    RGMII
 #define CONFIG_FEC_MXC_PHYADDR                 4
 
-#define CONFIG_PHY_MICREL
-#define CONFIG_PHY_MICREL_KSZ9021
 #define CONFIG_PHY_RESET_DELAY                 1000
 
 #define CONFIG_HOSTNAME                                titanium
 
-#define CONFIG_SYS_PROMPT                      "titanium > "
-
 #define CONFIG_PLATFORM_ENV_SETTINGS           "\0"
 
 #define CONFIG_EXTRA_ENV_SETTINGS              CONFIG_COMMON_ENV_SETTINGS \