diff options
| author | Tom Rini <trini@konsulko.com> | 2016-10-28 11:12:03 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-10-28 11:12:03 -0400 |
| commit | 4f892924d238cc415891dbea336a0fdaff2f853b (patch) | |
| tree | 145882227f01a5092c656d1fc7122adff76bc8c2 /common | |
| parent | ec1eaad06551e2422baf8743f6987d4f561f2ce6 (diff) | |
| parent | 1c140f7bbf4a008fcd78b407ea80c60a2a18fc1f (diff) | |
| download | u-boot-4f892924d238cc415891dbea336a0fdaff2f853b.tar.gz u-boot-4f892924d238cc415891dbea336a0fdaff2f853b.tar.bz2 u-boot-4f892924d238cc415891dbea336a0fdaff2f853b.zip | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
common/Kconfig
configs/dms-ba16_defconfig
Diffstat (limited to 'common')
| -rw-r--r-- | common/Kconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/common/Kconfig b/common/Kconfig index dbe5bb619b..913d21a9ec 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -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 |