From 08b6aa61545d74afd4a9646adb469cf1320f4d8f Mon Sep 17 00:00:00 2001
From: wdenk <wdenk>
Date: Sun, 10 Oct 2004 18:49:14 +0000
Subject: [PATCH] Patches by George G. Davis, 24 Aug 2004: - Enable
 ramdisk/initrd tagged param support for omap1610h2_config - Remove static
 network setup defaults from mx1ads_config

---
 CHANGELOG                    | 4 +++-
 include/configs/mx1ads.h     | 4 ----
 include/configs/omap1610h2.h | 4 ++--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 89375c91bc..0adde4296c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,7 +2,9 @@
 Changes since U-Boot 1.1.1:
 ======================================================================
 
-* Patch by George G. Davis, 24 Aug 2004:
+* Patches by George G. Davis, 24 Aug 2004:
+  - Enable ramdisk/initrd tagged param support for omap1610h2_config
+  - Remove static network setup defaults from mx1ads_config
   - update ARM boards to use constants from mach-types.h
 
 * Patch by Gary Jennejohn, 04 Oct 2004:
diff --git a/include/configs/mx1ads.h b/include/configs/mx1ads.h
index df951e2d74..3f1419e5ab 100644
--- a/include/configs/mx1ads.h
+++ b/include/configs/mx1ads.h
@@ -99,10 +99,6 @@
 
 #define CONFIG_BOOTDELAY	3
 #define CONFIG_BOOTARGS		"root=/dev/msdk mem=48M"
-#define CONFIG_ETHADDR		08:00:3e:26:0a:5c
-#define CONFIG_NETMASK		255.255.255.0
-#define CONFIG_IPADDR		192.168.0.22
-#define CONFIG_SERVERIP		192.168.0.11
 #define CONFIG_BOOTFILE		"mx1ads"
 #define CONFIG_BOOTCOMMAND	"tftp; bootm"
 
diff --git a/include/configs/omap1610h2.h b/include/configs/omap1610h2.h
index d080f45628..beff6d89d7 100644
--- a/include/configs/omap1610h2.h
+++ b/include/configs/omap1610h2.h
@@ -52,6 +52,7 @@
 
 #define CONFIG_CMDLINE_TAG	1	/* enable passing of ATAGs */
 #define CONFIG_SETUP_MEMORY_TAGS	1
+#define CONFIG_INITRD_TAG		1
 
 /*
  * Size of malloc() pool
@@ -94,8 +95,7 @@
 #include <configs/omap1510.h>
 
 #define CONFIG_BOOTDELAY	3
-#define CONFIG_BOOTARGS	"mem=32M console=ttyS0,115200n8 noinitrd \
-				root=/dev/nfs ip=dhcp"
+#define CONFIG_BOOTARGS	"console=ttyS0,115200n8 noinitrd root=/dev/nfs ip=dhcp"
 #define CONFIG_BOOTCOMMAND      "bootp;tftp;bootm"
 #define CFG_AUTOLOAD            "n"             /* No autoload */
 
-- 
2.39.5