summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-socfpga/include/mach/generic.h
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2016-01-11 13:11:08 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2016-01-11 13:11:08 +0100
commit96b115be942ed8dcc94a5230fce0eafb4ac93f2d (patch)
tree791df75fe3b7932ca4690abc2f8eb5d94f25af62 /arch/arm/mach-socfpga/include/mach/generic.h
parent1b59b573e434b19b45b12b07a28d749d72aeb145 (diff)
parentc44e12f0bde314f33f45bab31b1f7c69157d89b4 (diff)
downloadbarebox-96b115be942ed8dcc94a5230fce0eafb4ac93f2d.tar.gz
barebox-96b115be942ed8dcc94a5230fce0eafb4ac93f2d.tar.xz
Merge branch 'for-next/socfpga'
Diffstat (limited to 'arch/arm/mach-socfpga/include/mach/generic.h')
-rw-r--r--arch/arm/mach-socfpga/include/mach/generic.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-socfpga/include/mach/generic.h b/arch/arm/mach-socfpga/include/mach/generic.h
index 1f4247f803..2a7e0ea499 100644
--- a/arch/arm/mach-socfpga/include/mach/generic.h
+++ b/arch/arm/mach-socfpga/include/mach/generic.h
@@ -18,6 +18,10 @@ static inline void __udelay(unsigned us)
struct socfpga_barebox_part {
unsigned int nor_offset;
unsigned int nor_size;
+ const char *mmc_disk;
};
+/* Partition/device for xloader to load main bootloader from */
+extern const struct socfpga_barebox_part *barebox_part;
+
#endif /* __MACH_SOCFPGA_GENERIC_H */