[U-Boot] [PATCH] OMAP3 Remove unneeded boot_flash_* declarations
Tom Rix
Tom.Rix at windriver.com
Tue Nov 17 19:41:00 CET 2009
Only the boot_flash_* variables that are used by #defines in
the OMAP3 config files should have declarations.
This patch removes the unneeded declarations.
Not all of the boot_flash_* declarations are needed by all of
the boards. The set for each board was minimized by keeping
the declaration of variable used is part of a #define in
the config file.
Signed-off-by: Tom Rix <Tom.Rix at windriver.com>
---
include/configs/devkit8000.h | 4 ----
include/configs/omap3_beagle.h | 2 --
include/configs/omap3_evm.h | 1 -
include/configs/omap3_overo.h | 2 --
include/configs/omap3_pandora.h | 2 --
include/configs/omap3_sdp3430.h | 8 --------
include/configs/omap3_zoom1.h | 2 --
include/configs/omap3_zoom2.h | 2 --
8 files changed, 0 insertions(+), 23 deletions(-)
diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h
index 7487bb7..50db43e 100644
--- a/include/configs/devkit8000.h
+++ b/include/configs/devkit8000.h
@@ -299,11 +299,7 @@
#define CONFIG_ENV_OFFSET boot_flash_off
#ifndef __ASSEMBLY__
-extern unsigned int boot_flash_base;
-extern volatile unsigned int boot_flash_env_addr;
extern unsigned int boot_flash_off;
-extern unsigned int boot_flash_sec;
-extern unsigned int boot_flash_type;
#endif
#endif /* __CONFIG_H */
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index 70186ce..62140ee 100644
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -315,10 +315,8 @@
#ifndef __ASSEMBLY__
extern unsigned int boot_flash_base;
-extern volatile unsigned int boot_flash_env_addr;
extern unsigned int boot_flash_off;
extern unsigned int boot_flash_sec;
-extern unsigned int boot_flash_type;
#endif
#endif /* __CONFIG_H */
diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
index 162bfea..a889179 100644
--- a/include/configs/omap3_evm.h
+++ b/include/configs/omap3_evm.h
@@ -299,7 +299,6 @@ extern unsigned int boot_flash_base;
extern volatile unsigned int boot_flash_env_addr;
extern unsigned int boot_flash_off;
extern unsigned int boot_flash_sec;
-extern unsigned int boot_flash_type;
#endif
/*----------------------------------------------------------------------------
diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h
index ff25aba..671c89a 100644
--- a/include/configs/omap3_overo.h
+++ b/include/configs/omap3_overo.h
@@ -300,10 +300,8 @@
#ifndef __ASSEMBLY__
extern unsigned int boot_flash_base;
-extern volatile unsigned int boot_flash_env_addr;
extern unsigned int boot_flash_off;
extern unsigned int boot_flash_sec;
-extern unsigned int boot_flash_type;
#endif
#if defined(CONFIG_CMD_NET)
diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h
index 838b1ad..092dfc1 100644
--- a/include/configs/omap3_pandora.h
+++ b/include/configs/omap3_pandora.h
@@ -293,10 +293,8 @@
#ifndef __ASSEMBLY__
extern unsigned int boot_flash_base;
-extern volatile unsigned int boot_flash_env_addr;
extern unsigned int boot_flash_off;
extern unsigned int boot_flash_sec;
-extern unsigned int boot_flash_type;
#endif
#endif /* __CONFIG_H */
diff --git a/include/configs/omap3_sdp3430.h b/include/configs/omap3_sdp3430.h
index a2a4b8a..3aaaef5 100644
--- a/include/configs/omap3_sdp3430.h
+++ b/include/configs/omap3_sdp3430.h
@@ -360,12 +360,4 @@
/*--------------------------------------------------------------------------*/
-#ifndef __ASSEMBLY__
-extern unsigned int boot_flash_base;
-extern volatile unsigned int boot_flash_env_addr;
-extern unsigned int boot_flash_off;
-extern unsigned int boot_flash_sec;
-extern unsigned int boot_flash_type;
-#endif
-
#endif /* __CONFIG_H */
diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h
index 62a6340..72f55c4 100644
--- a/include/configs/omap3_zoom1.h
+++ b/include/configs/omap3_zoom1.h
@@ -301,10 +301,8 @@
#ifndef __ASSEMBLY__
extern unsigned int boot_flash_base;
-extern volatile unsigned int boot_flash_env_addr;
extern unsigned int boot_flash_off;
extern unsigned int boot_flash_sec;
-extern unsigned int boot_flash_type;
#endif
#endif /* __CONFIG_H */
diff --git a/include/configs/omap3_zoom2.h b/include/configs/omap3_zoom2.h
index 5296630..dba5d94 100644
--- a/include/configs/omap3_zoom2.h
+++ b/include/configs/omap3_zoom2.h
@@ -256,10 +256,8 @@
#ifndef __ASSEMBLY__
extern unsigned int boot_flash_base;
-extern volatile unsigned int boot_flash_env_addr;
extern unsigned int boot_flash_off;
extern unsigned int boot_flash_sec;
-extern unsigned int boot_flash_type;
#endif
#endif /* __CONFIG_H */
--
1.6.0.6
More information about the U-Boot
mailing list