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

[platform/kernel/u-boot.git] / include / configs / inka4x0.h

diff --git a/include/configs/inka4x0.h b/include/configs/inka4x0.h
index 11ab6a4..9258734 100644 (file)
--- a/include/configs/inka4x0.h
+++ b/include/configs/inka4x0.h
@@ -16,9 +16,8 @@
  * (easy to change)
  */
 
-#define CONFIG_MPC5xxx         1       /* This is an MPC5xxx CPU               */
-#define CONFIG_MPC5200         1       /* (more precisely an MPC5200 CPU)      */
-#define CONFIG_INKA4X0         1       /* INKA4x0 board                        */
+#define CONFIG_MPC5200         1       /* This is an MPC5200 CPU       */
+#define CONFIG_INKA4X0         1       /* INKA4x0 board                */
 
 /*
  * Valid values for CONFIG_SYS_TEXT_BASE are:
@@ -111,9 +110,6 @@
 
 #undef CONFIG_BOOTARGS
 
-#define        CONFIG_ETHADDR          00:a0:a4:03:00:00
-#define        CONFIG_OVERWRITE_ETHADDR_ONCE
-
 #define        CONFIG_IPADDR           192.168.100.2
 #define        CONFIG_SERVERIP         192.168.100.1
 #define        CONFIG_NETMASK          255.255.255.0
@@ -347,8 +343,6 @@ static inline void tws_data_config_output(unsigned output)
 
 #define CONFIG_SYS_LOAD_ADDR           0x100000        /* default load address */
 
-#define CONFIG_SYS_HZ                  1000    /* decrementer freq: 1 ms ticks */
-
 /*
  * Enable loopw command.
  */