SPDX: Convert all of our single license tags to Linux Kernel style

[oweals/u-boot.git] / board / technexion / twister / twister.c

diff --git a/board/technexion/twister/twister.c b/board/technexion/twister/twister.c
index ad4b02a753c5678f19670a97d43db636b42c829d..1166886e1d331021112025ae120eb4009f220433 100644 (file)
--- a/board/technexion/twister/twister.c
+++ b/board/technexion/twister/twister.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2011
  * Stefano Babic, DENX Software Engineering, sbabic@denx.de.
  *
  * Copyright (C) 2009 TechNexion Ltd.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -19,7 +18,7 @@
 #include <spl.h>
 #include <mmc.h>
 #include <asm/gpio.h>
-#ifdef CONFIG_USB_EHCI
+#ifdef CONFIG_USB_EHCI_HCD
 #include <usb.h>
 #include <asm/ehci-omap.h>
 #endif
@@ -46,7 +45,7 @@ static const u32 gpmc_XR16L2751[] = {
        XR16L2751_GPMC_CONFIG6,
 };
 
-#ifdef CONFIG_USB_EHCI
+#ifdef CONFIG_USB_EHCI_HCD
 static struct omap_usbhs_board_data usbhs_bdata = {
        .port_mode[0] = OMAP_EHCI_PORT_MODE_PHY,
        .port_mode[1] = OMAP_EHCI_PORT_MODE_PHY,
@@ -94,7 +93,7 @@ int misc_init_r(void)
 
        omap_die_id_display();
 
-       eth_addr = getenv("ethaddr");
+       eth_addr = env_get("ethaddr");
        if (eth_addr)
                return 0;