leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git://www.denx.de/git/u-boot-imx

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

Conflicts:
	common/Kconfig
	configs/dms-ba16_defconfig
This commit is contained in:
Tom Rini
2016-10-28 11:12:03 -04:00
parent ec1eaad065 1c140f7bbf
commit 4f892924d2
86 changed files with 6262 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
common/Kconfig
View File

@@ -346,6 +346,11 @@ config SYS_STDIO_DEREGISTER
endmenu
config DEFAULT_FDT_FILE
string "Default fdt file"
help
This option is used to set the default fdt file to boot OS.
config SYS_NO_FLASH
bool "Disable support for parallel NOR flash"
default n