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

[karo-tx-uboot.git] / include / configs / SMN42.h

diff --git a/include/configs/SMN42.h b/include/configs/SMN42.h
index 45e6a58d990367fa8013a535bf8e9d78895d1b15..ba3ada13a5a5a868257c260f2d1812cc173aa48d 100644 (file)
--- a/include/configs/SMN42.h
+++ b/include/configs/SMN42.h
@@ -30,8 +30,6 @@
  * If we are developing, we might want to start u-boot from ram
  * so we MUST NOT initialize critical regs like mem-timing ...
  */
-#undef CONFIG_INIT_CRITICAL            /* undef for developing */
-
 #undef CONFIG_SKIP_LOWLEVEL_INIT
 #undef CONFIG_SKIP_RELOCATE_UBOOT
 
@@ -59,6 +57,7 @@
 /*
  * select serial console configuration
  */
+#define CONFIG_LPC2292_SERIAL
 #define CONFIG_SERIAL1         1       /* we use Serial line 1 */
 
 /* allow to overwrite serial and ethaddr */
@@ -139,8 +138,6 @@
 #define CONFIG_SYS_MEMTEST_START       0x81800000      /* memtest works on     */
 #define CONFIG_SYS_MEMTEST_END         0x83000000      /* 24 MB in SRAM        */
 
-#undef CONFIG_SYS_CLKS_IN_HZ           /* everything, incl board info, in Hz */
-
 #define        CONFIG_SYS_LOAD_ADDR            0x81000000      /* default load address */
                                                /* for uClinux img is here*/
 
@@ -201,6 +198,6 @@
 #define CONFIG_INITRD_TAG
 #define CONFIG_MMC                     1
 /* we use this ethernet chip */
-#define CONFIG_ENC28J60
+#define CONFIG_ENC28J60_LPC2292
 
 #endif /* __CONFIG_H */