Merge branch 'master' of git://git.denx.de/u-boot-video

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

diff --git a/include/configs/mpq101.h b/include/configs/mpq101.h
index e76ca73d4730727d3235231985f54c86666b0984..339c7363115f2f89e73551e640ffd605a7d5e949 100644 (file)
--- a/include/configs/mpq101.h
+++ b/include/configs/mpq101.h
@@ -64,20 +64,8 @@
 
 #define CONFIG_SYS_CLK_FREQ      33000000 /* sysclk for MPC85xx */
 
-/*
- * Base addresses -- Note these are effective addresses where the
- * actual resources get mapped (not physical addresses)
- */
-#define CONFIG_SYS_CCSRBAR_DEFAULT 0xff700000
-#define CONFIG_SYS_CCSRBAR         0xe0000000
-
-#ifdef CONFIG_PHYS_64BIT
-# define CONFIG_SYS_CCSRBAR_PHYS   0xfe0000000ull
-#else
-# define CONFIG_SYS_CCSRBAR_PHYS   CONFIG_SYS_CCSRBAR
-#endif
-
-#define CONFIG_SYS_IMMR            CONFIG_SYS_CCSRBAR
+#define CONFIG_SYS_CCSRBAR             0xe0000000
+#define CONFIG_SYS_CCSRBAR_PHYS_LOW    CONFIG_SYS_CCSRBAR
 
 /* DDR Setup */
 #define CONFIG_FSL_DDR2
@@ -273,10 +261,6 @@
  */
 #ifdef CONFIG_TSEC_ENET
 
-# ifndef CONFIG_NET_MULTI
-#  define CONFIG_NET_MULTI
-# endif
-
 # define CONFIG_MII                /* MII PHY management */
 # define CONFIG_MII_DEFAULT_TSEC 1 /* Allow unregistered phys */
 
@@ -341,9 +325,6 @@
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
 
-#ifdef CONFIG_SYS_HUSH_PARSER
-# define CONFIG_SYS_PROMPT_HUSH_PS2  "> "
-#endif
 
 #define CONFIG_LOADS_ECHO            /* echo on for serial download */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */