diff mbox

[U-Boot] am335x_evm: Only enable OF_CONTROL/OF_SEPARATE on VBOOT for now

Message ID 1403182088-13732-1-git-send-email-trini@ti.com
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

Tom Rini June 19, 2014, 12:48 p.m. UTC
We don't make use of the device tree otherwise yet (and will need to
think how to not break the current multi-board support) and this causes
further breakage with additional changes.

Signed-off-by: Tom Rini <trini@ti.com>
---
 include/configs/am335x_evm.h |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Tom Rini June 19, 2014, 3:23 p.m. UTC | #1
On Thu, Jun 19, 2014 at 08:48:08AM -0400, Tom Rini wrote:

> We don't make use of the device tree otherwise yet (and will need to
> think how to not break the current multi-board support) and this causes
> further breakage with additional changes.
> 
> Signed-off-by: Tom Rini <trini@ti.com>

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 5ae8c46..a48b386 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -22,10 +22,10 @@ 
 # define CONFIG_FIT
 # define CONFIG_TIMESTAMP
 # define CONFIG_LZO
-# define CONFIG_OF_CONTROL
-# define CONFIG_OF_SEPARATE
-# define CONFIG_DEFAULT_DEVICE_TREE am335x-boneblack
 # ifdef CONFIG_ENABLE_VBOOT
+#  define CONFIG_OF_CONTROL
+#  define CONFIG_OF_SEPARATE
+#  define CONFIG_DEFAULT_DEVICE_TREE am335x-boneblack
 #  define CONFIG_FIT_SIGNATURE
 #  define CONFIG_RSA
 # endif