summaryrefslogtreecommitdiff
path: root/arch/powerpc/include
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2012-12-13 20:49:02 +0000
committerTom Rini <trini@ti.com>2013-02-04 09:05:44 -0500
commit923a662f2fb09aa67c1ec0de25474c218fad2690 (patch)
tree0619dffdc10d04edd41fbc216e6d81608fd5aac1 /arch/powerpc/include
parent7273ccec61e26adef6149ddaf261217b30c4f8a9 (diff)
downloadu-boot-imx-923a662f2fb09aa67c1ec0de25474c218fad2690.zip
u-boot-imx-923a662f2fb09aa67c1ec0de25474c218fad2690.tar.gz
u-boot-imx-923a662f2fb09aa67c1ec0de25474c218fad2690.tar.bz2
ppc: Move fpga_state to arch_global_data
Move this field into arch_global_data and tidy up. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/powerpc/include')
-rw-r--r--arch/powerpc/include/asm/global_data.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/include/asm/global_data.h b/arch/powerpc/include/asm/global_data.h
index 6f88b76..52aece0 100644
--- a/arch/powerpc/include/asm/global_data.h
+++ b/arch/powerpc/include/asm/global_data.h
@@ -122,6 +122,9 @@ struct arch_global_data {
#if defined(CONFIG_SYS_GT_6426x)
unsigned int mirror_hack[16];
#endif
+#ifdef CONFIG_SYS_FPGA_COUNT
+ unsigned fpga_state[CONFIG_SYS_FPGA_COUNT];
+#endif
};
/*
@@ -170,9 +173,6 @@ typedef struct global_data {
#if defined(CONFIG_LWMON) || defined(CONFIG_LWMON5)
unsigned long kbd_status;
#endif
-#ifdef CONFIG_SYS_FPGA_COUNT
- unsigned fpga_state[CONFIG_SYS_FPGA_COUNT];
-#endif
#if defined(CONFIG_WD_MAX_RATE)
unsigned long long wdt_last; /* trace watch-dog triggering rate */
#endif