sf: Add S25FL128S_256K IDs

[karo-tx-uboot.git] / common / env_nowhere.c

diff --git a/common/env_nowhere.c b/common/env_nowhere.c
index 8dd4867f1faf352312276543b8a172cfb8e505e6..bdc1ed5e6769ec7873d29117ea4d7b6f9c5eac1c 100644 (file)
--- a/common/env_nowhere.c
+++ b/common/env_nowhere.c
@@ -1,65 +1,35 @@
 /*
- * (C) Copyright 2000-2002
+ * (C) Copyright 2000-2010
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
  * (C) Copyright 2001 Sysgo Real-Time Solutions, GmbH <www.elinos.com>
  * Andreas Heppel <aheppel@sysgo.de>
 
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
-
-#if defined(CONFIG_ENV_IS_NOWHERE) /* Environment is nowhere */
-
 #include <command.h>
 #include <environment.h>
 #include <linux/stddef.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
-env_t *env_ptr = NULL;
-
-extern uchar default_environment[];
-extern int default_environment_size;
+env_t *env_ptr;
 
-
-void env_relocate_spec (void)
-{
-}
-
-uchar env_get_char_spec (int index)
+void env_relocate_spec(void)
 {
-       return ( *((uchar *)(gd->env_addr + index)) );
 }
 
-/************************************************************************
+/*
  * Initialize Environment use
  *
  * We are still running from ROM, so data use is limited
  */
-int  env_init(void)
+int env_init(void)
 {
-       gd->env_addr  = (ulong)&default_environment[0];
-       gd->env_valid = 0;
+       gd->env_addr    = (ulong)&default_environment[0];
+       gd->env_valid   = 0;
 
-       return (0);
+       return 0;
 }
-
-#endif /* CONFIG_ENV_IS_NOWHERE) */