summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorMasahiro Yamada <[email protected]>2014-05-15 20:37:52 +0900
committerMichal Simek <[email protected]>2014-05-15 13:57:28 +0200
commit0dfbcf02de58b2ebf8ea63f57a9971592b5b2277 (patch)
treedbdbeb7ae6f0ac1a81638ef14c47cc78344434e0 /include/linux
parent2405d09c4c8a1e4cd7744e5f10d1592bd974a939 (diff)
zynq: load u-boot-dtb.img if CONFIG_OF_SEPARATE is defined
SPL should load "u-boot-dtb.img" if both CONFIG_OF_CONTROL and CONFIG_OF_SEPARATE are defined. Otherwise, "u-boot.img" should be loaded. Since CONFIG_OF_CONTROL is always undefined for SPL_BUILD, the undef block should be moved below the conditional definition of CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME. Signed-off-by: Masahiro Yamada <[email protected]> Cc: Michal Simek <[email protected]> Signed-off-by: Michal Simek <[email protected]>
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions