Commit c851a245 authored 9 years ago by Tom Rini

u-boot-socfpga


Conflicts:
	configs/socfpga_arria5_defconfig
	configs/socfpga_cyclone5_defconfig
	configs/socfpga_socrates_defconfig

Merged these by hand and re-ran savedefconfig on them.

Signed-off-by: Tom Rini <trini@konsulko.com>

parents 14e7a30f 29aa4397

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing with 1287 additions and 48 deletions

Please register or to comment