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

[u-boot] / include / configs / wandboard.h

diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index 2a6c6fbb703b4cccc909ebc519a086a25ed95a6f..1edd7a88270fb45e8acb7e79d9e040283d6e0c03 100644 (file)
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -1,15 +1,13 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2013 Freescale Semiconductor, Inc.
  *
  * Configuration settings for the Wandboard.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#include <config_distro_defaults.h>
 #include "mx6_common.h"
 
 #include "imx6_spl.h"
@@ -24,14 +22,11 @@
 
 /* SATA Configs */
 
-#define CONFIG_CMD_SATA
 #ifdef CONFIG_CMD_SATA
-#define CONFIG_DWC_AHSATA
 #define CONFIG_SYS_SATA_MAX_DEVICE     1
 #define CONFIG_DWC_AHSATA_PORT_ID      0
 #define CONFIG_DWC_AHSATA_BASE_ADDR    SATA_ARB_BASE_ADDR
 #define CONFIG_LBA48
-#define CONFIG_LIBATA
 #endif
 
 #define CONFIG_SYS_MEMTEST_START       0x10000000
@@ -45,6 +40,12 @@
 #define CONFIG_SYS_I2C_MXC_I2C3                /* enable I2C bus 3 */
 #define CONFIG_SYS_I2C_SPEED           100000
 
+/* PMIC */
+#define CONFIG_POWER
+#define CONFIG_POWER_I2C
+#define CONFIG_POWER_PFUZE100
+#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08
+
 /* MMC Configuration */
 #define CONFIG_SYS_FSL_USDHC_NUM       2
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
@@ -61,7 +62,6 @@
 #define CONFIG_FEC_XCV_TYPE            RGMII
 #define CONFIG_ETHPRIME                        "FEC"
 #define CONFIG_FEC_MXC_PHYADDR         1
-#define CONFIG_PHYLIB
 #define CONFIG_PHY_ATHEROS
 
 /* Framebuffer */
@@ -73,12 +73,10 @@
 #define CONFIG_BMP_16BPP
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
-#define CONFIG_IPUV3_CLK 260000000
 #define CONFIG_IMX_HDMI
 #define CONFIG_IMX_VIDEO_SKIP
 #endif
 
-#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "console=ttymxc0,115200\0" \
        "splashpos=m,m\0" \
@@ -89,6 +87,7 @@
        "fdt_addr=0x18000000\0" \
        "ip_dyn=yes\0" \
        "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
+       "finduuid=part uuid mmc 0:1 uuid\0" \
        "update_sd_firmware_filename=u-boot.imx\0" \
        "update_sd_firmware=" \
                "if test ${ip_dyn} = yes; then " \
@@ -104,6 +103,12 @@
                        "fi; "  \
                "fi\0" \
        "findfdt="\
+               "if test $board_name = D1 && test $board_rev = MX6QP ; then " \
+                       "setenv fdtfile imx6qp-wandboard-revd1.dtb; fi; " \
+               "if test $board_name = D1 && test $board_rev = MX6Q ; then " \
+                       "setenv fdtfile imx6q-wandboard-revd1.dtb; fi; " \
+               "if test $board_name = D1 && test $board_rev = MX6DL ; then " \
+                       "setenv fdtfile imx6dl-wandboard-revd1.dtb; fi; " \
                "if test $board_name = C1 && test $board_rev = MX6Q ; then " \
                        "setenv fdtfile imx6q-wandboard.dtb; fi; " \
                "if test $board_name = C1 && test $board_rev = MX6DL ; then " \
@@ -124,14 +129,11 @@
 #define BOOT_TARGET_DEVICES(func) \
        func(MMC, mmc, 0) \
        func(MMC, mmc, 1) \
+       func(SATA, sata, 0) \
        func(USB, usb, 0) \
        func(PXE, pxe, na) \
        func(DHCP, dhcp, na)
 
-#define CONFIG_BOOTCOMMAND \
-          "run findfdt; " \
-          "run distro_bootcmd"
-
 #include <config_distro_bootcmd.h>
 
 /* Physical Memory Map */
@@ -150,7 +152,6 @@
 /* Environment organization */
 #define CONFIG_ENV_SIZE                        (8 * 1024)
 
-#define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_ENV_OFFSET              (768 * 1024)
 #define CONFIG_SYS_MMC_ENV_DEV         0