From c7de829c796978e519984df2f1c8cfcf921a39a4 Mon Sep 17 00:00:00 2001
From: wdenk <wdenk>
Date: Tue, 19 Nov 2002 11:04:11 +0000
Subject: * Patch by Thomas Frieden, 13 Nov 2002:   Add code for AmigaOne board
   (preliminary merge to U-Boot, still WIP)

* Patch by Jon Diekema, 12 Nov 2002:
  - Adding URL for IEEE OUI lookup
  - Making the autoboot #defines dependent on CONFIG_AUTOBOOT_KEYED
    being defined.
  - In the CONFIG_EXTRA_ENV_SETTINGS #define, the root-on-initrd and
    root-on-nfs macros are designed to switch how the default boot
    method gets defined.
---
 common/env_common.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'common/env_common.c')

diff --git a/common/env_common.c b/common/env_common.c
index f7f268e7b..bd22e1542 100644
--- a/common/env_common.c
+++ b/common/env_common.c
@@ -38,6 +38,11 @@
 # define SHOW_BOOT_PROGRESS(arg)
 #endif
 
+#ifdef CONFIG_AMIGAONEG3SE
+	extern void enable_nvram(void);
+	extern void disable_nvram(void);
+#endif
+
 #undef DEBUG_ENV
 #ifdef DEBUG_ENV
 #define DEBUGF(fmt,args...) printf(fmt ,##args)
@@ -180,6 +185,10 @@ void env_relocate (void)
 	DEBUGF ("%s[%d] offset = 0x%lx\n", __FUNCTION__,__LINE__,
 		gd->reloc_off);
 
+#ifdef CONFIG_AMIGAONEG3SE
+	enable_nvram();
+#endif
+
 #ifdef ENV_IS_EMBEDDED
 	/*
 	 * The environment buffer is embedded with the text segment,
@@ -228,4 +237,8 @@ void env_relocate (void)
 		env_relocate_spec ();
 	}
 	gd->env_addr = (ulong)&(env_ptr->data);
+
+#ifdef CONFIG_AMIGAONEG3SE
+	disable_nvram();
+#endif
 }
-- 
cgit v1.2.3