sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

Merge branch 'for-next/socfpga'

This commit is contained in:
Sascha Hauer 2016-01-11 13:11:08 +01:00
parent 1b59b573e4 c44e12f0bd
commit 96b115be94
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/mach-socfpga/include/mach/generic.h
View File

@ -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 */

8
arch/arm/mach-socfpga/xload.c
View File

@ -20,12 +20,13 @@
#include <mach/system-manager.h>
#include <mach/socfpga-regs.h>
struct socfpga_barebox_part *barebox_part;
static struct socfpga_barebox_part default_part = {
.nor_offset = SZ_256K,
.nor_size = SZ_1M,
.mmc_disk = "disk0.1",
};
const struct socfpga_barebox_part *barebox_part = &default_part;
enum socfpga_clks {
timer, mmc, qspi_clk, uart, clk_max
@ -110,13 +111,10 @@ static __noreturn int socfpga_xload(void)
enum bootsource bootsource = bootsource_get();
void *buf;
if (!barebox_part)
barebox_part = &default_part;
switch (bootsource) {
case BOOTSOURCE_MMC:
socfpga_mmc_init();
buf = bootstrap_read_disk("disk0.1", "fat");
buf = bootstrap_read_disk(barebox_part->mmc_disk, "fat");
break;
case BOOTSOURCE_SPI:
socfpga_qspi_init();