Revert "Merge patch series "arm: dts: am62-beagleplay: Fix Beagleplay Ethernet""

When bringing in the series 'arm: dts: am62-beagleplay: Fix Beagleplay
Ethernet"' I failed to notice that b4 noticed it was based on next and
so took that as the base commit and merged that part of next to master.

This reverts commit c8ffd1356d, reversing
changes made to 2ee6f3a5f7.

Reported-by: Jonas Karlman <jonas@kwiboo.se>
Signed-off-by: Tom Rini <trini@konsulko.com>

env/Kconfig

@@ -312,7 +312,7 @@ config ENV_IS_IN_NVRAM
 
 config ENV_IS_IN_ONENAND
 	bool "Environment is in OneNAND"
-	depends on !CHAIN_OF_TRUST && CMD_ONENAND
+	depends on !CHAIN_OF_TRUST
 	help
 	  Define this if you want to put your local device's environment in
 	  OneNAND.

env/attr.c

@@ -4,13 +4,13 @@
  * Joe Hershberger, National Instruments, joe.hershberger@ni.com
  */
 
-#include <stdio.h>
 #ifdef USE_HOSTCC /* Eliminate "ANSI does not permit..." warnings */
 #include <stdint.h>
+#include <stdio.h>
 #include <linux/linux_string.h>
 #else
+#include <common.h>
 #include <slre.h>
-#include <vsprintf.h>
 #endif
 
 #include <env_attr.h>

env/callback.c

@@ -4,6 +4,7 @@
  * Joe Hershberger, National Instruments, joe.hershberger@ni.com
  */
 
+#include <common.h>
 #include <env.h>
 #include <env_internal.h>
 #include <asm/global_data.h>

env/common.c

@@ -7,6 +7,7 @@
  * Andreas Heppel <aheppel@sysgo.de>
  */
 
+#include <common.h>
 #include <bootstage.h>
 #include <command.h>
 #include <env.h>

env/eeprom.c

@@ -7,6 +7,7 @@
  * Andreas Heppel <aheppel@sysgo.de>
  */
 
+#include <common.h>
 #include <command.h>
 #include <eeprom.h>
 #include <env.h>

env/env.c

@@ -4,13 +4,13 @@
  * Written by Simon Glass <sjg@chromium.org>
  */
 
+#include <common.h>
 #include <env.h>
 #include <env_internal.h>
 #include <log.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
-#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 

env/ext4.c

@@ -18,6 +18,7 @@
  * Manjunatha C Achar <a.manjunatha@samsung.com>
  */
 
+#include <common.h>
 #include <part.h>
 
 #include <command.h>

env/fat.c

@@ -6,6 +6,7 @@
  *  Maximilian Schwerin <mvs@tigris.de>
  */
 
+#include <common.h>
 #include <command.h>
 #include <env.h>
 #include <env_internal.h>

env/flags.c

@@ -8,9 +8,9 @@
 #include <linux/string.h>
 #include <linux/ctype.h>
 
-#include <stdio.h>
 #ifdef USE_HOSTCC /* Eliminate "ANSI does not permit..." warnings */
 #include <stdint.h>
+#include <stdio.h>
 #include "fw_env_private.h"
 #include "fw_env.h"
 #include <env_attr.h>
@@ -18,7 +18,7 @@
 #define env_get fw_getenv
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 #else
-#include <linux/kernel.h>
+#include <common.h>
 #include <env_internal.h>
 #endif
 

env/flash.c

@@ -9,6 +9,7 @@
 
 /* #define DEBUG */
 
+#include <common.h>
 #include <command.h>
 #include <env.h>
 #include <env_internal.h>

env/mmc.c

@@ -5,6 +5,7 @@
 
 /* #define DEBUG */
 
+#include <common.h>
 #include <asm/global_data.h>
 
 #include <command.h>

env/nand.c

@@ -13,6 +13,7 @@
  * Andreas Heppel <aheppel@sysgo.de>
  */
 
+#include <common.h>
 #include <command.h>
 #include <env.h>
 #include <env_internal.h>

env/nowhere.c

@@ -7,6 +7,7 @@
  * Andreas Heppel <aheppel@sysgo.de>
  */
 
+#include <common.h>
 #include <command.h>
 #include <env.h>
 #include <env_internal.h>

env/nvram.c

@@ -7,6 +7,7 @@
  * Andreas Heppel <aheppel@sysgo.de>
  */
 
+#include <common.h>
 #include <command.h>
 #include <env.h>
 #include <env_internal.h>

env/onenand.c

@@ -7,6 +7,7 @@
  * Kyungmin Park <kyungmin.park@samsung.com>
  */
 
+#include <common.h>
 #include <command.h>
 #include <env_internal.h>
 #include <asm/global_data.h>

env/remote.c

@@ -5,10 +5,10 @@
 
 /* #define DEBUG */
 
+#include <common.h>
 #include <command.h>
 #include <env_internal.h>
 #include <asm/global_data.h>
-#include <linux/errno.h>
 #include <linux/stddef.h>
 #include <u-boot/crc.h>
 

env/sf.c

@@ -8,6 +8,7 @@
  *
  * (C) Copyright 2008 Atmel Corporation
  */
+#include <common.h>
 #include <dm.h>
 #include <env.h>
 #include <env_internal.h>

env/ubi.c

@@ -4,6 +4,7 @@
  *        Joe Hershberger <joe.hershberger@ni.com>
  */
 
+#include <common.h>
 #include <asm/global_data.h>
 
 #include <command.h>