imx: replace CONFIG_SECURE_BOOT with CONFIG_IMX_HAB

[platform/kernel/u-boot.git] / board / warp7 / warp7.c

diff --git a/board/warp7/warp7.c b/board/warp7/warp7.c
index 49f290f..c423e04 100644 (file)
--- a/board/warp7/warp7.c
+++ b/board/warp7/warp7.c
@@ -13,8 +13,8 @@
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/io.h>
 #include <common.h>
+#include <env.h>
 #include <asm/arch/crm_regs.h>
-#include <usb.h>
 #include <netdev.h>
 #include <power/pmic.h>
 #include <power/pfuze3000_pmic.h>
@@ -77,7 +77,7 @@ int power_init_board(void)
        printf("PMIC: PFUZE3000 DEV_ID=0x%x REV_ID=0x%x\n", dev_id, rev_id);
 
        /* disable Low Power Mode during standby mode */
-       pmic_clrsetbits(dev, PFUZE3000_LDOGCTL, 0, 1);
+       pmic_reg_write(dev, PFUZE3000_LDOGCTL, 1);
 
        return 0;
 }
@@ -128,11 +128,6 @@ int checkboard(void)
        return 0;
 }
 
-int board_usb_phy_mode(int port)
-{
-       return USB_INIT_DEVICE;
-}
-
 int board_late_init(void)
 {
        struct wdog_regs *wdog = (struct wdog_regs *)WDOG1_BASE_ADDR;
@@ -151,7 +146,7 @@ int board_late_init(void)
         */
        clrsetbits_le16(&wdog->wcr, 0, 0x10);
 
-#ifdef CONFIG_SECURE_BOOT
+#ifdef CONFIG_IMX_HAB
        /* Determine HAB state */
        env_set_ulong(HAB_ENABLED_ENVNAME, imx_hab_is_enabled());
 #else