From c44e12f0bde314f33f45bab31b1f7c69157d89b4 Mon Sep 17 00:00:00 2001 From: Trent Piepho Date: Thu, 10 Dec 2015 21:51:39 +0000 Subject: socfpga: Allow setting partition xloader boots from for mmc The xloader boots the 2nd stage barebox from socfpga_barebox_part when using NOR. But when using MMC it boots from a hardcoded "disk0.1". Add the mmc device name to the partition description and use it for mmc booting. Add an extern declaration of socfpga_barebox_part to the socfpga header so that a board can change it to use a different partition. Initialize socfpga_barebox_part to the default value instead of NULL to avoid the NULL check later. Signed-off-by: Trent Piepho Signed-off-by: Sascha Hauer --- arch/arm/mach-socfpga/include/mach/generic.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'arch/arm/mach-socfpga/include/mach') 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 */ -- cgit v1.2.3