Skip to content
Commit 79f38777 authored by Albert ARIBAUD's avatar Albert ARIBAUD
Browse files

Merge branch 'u-boot-ti/master' into 'u-boot-arm/master' 

This required manual merging drivers/mtd/nand/Makefile
and adding am335x_evm support for CONFIG_SPL_NAND_DRIVERS
parents 96764df1 9bd5c1ad
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment