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 commitc8ffd1356d
, reversing changes made to2ee6f3a5f7
. Reported-by: Jonas Karlman <jonas@kwiboo.se> Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
@@ -9,7 +9,7 @@
|
||||
|
||||
#define LOG_CATEGORY UCLASS_FPGA
|
||||
|
||||
#include <config.h> /* core U-Boot definitions */
|
||||
#include <common.h> /* core U-Boot definitions */
|
||||
#include <console.h>
|
||||
#include <log.h>
|
||||
#include <ACEX1K.h> /* ACEX device family */
|
||||
|
@@ -12,6 +12,7 @@
|
||||
/*
|
||||
* Altera FPGA support
|
||||
*/
|
||||
#include <common.h>
|
||||
#include <errno.h>
|
||||
#include <ACEX1K.h>
|
||||
#include <log.h>
|
||||
|
@@ -7,9 +7,8 @@
|
||||
|
||||
#define LOG_CATEGORY UCLASS_FPGA
|
||||
|
||||
#include <config.h> /* core U-Boot definitions */
|
||||
#include <common.h> /* core U-Boot definitions */
|
||||
#include <log.h>
|
||||
#include <time.h>
|
||||
#include <altera.h>
|
||||
#include <ACEX1K.h> /* ACEX device family */
|
||||
#include <linux/delay.h>
|
||||
|
@@ -5,6 +5,7 @@
|
||||
*/
|
||||
|
||||
/* Generic FPGA support */
|
||||
#include <common.h> /* core U-Boot definitions */
|
||||
#include <init.h>
|
||||
#include <log.h>
|
||||
#include <xilinx.h> /* xilinx specific definitions */
|
||||
|
@@ -3,16 +3,14 @@
|
||||
* Copyright (C) 2018 Intel Corporation <www.intel.com>
|
||||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <altera.h>
|
||||
#include <log.h>
|
||||
#include <time.h>
|
||||
#include <watchdog.h>
|
||||
#include <asm/arch/mailbox_s10.h>
|
||||
#include <asm/arch/smc_api.h>
|
||||
#include <linux/delay.h>
|
||||
#include <linux/errno.h>
|
||||
#include <linux/intel-smc.h>
|
||||
#include <linux/string.h>
|
||||
|
||||
#define RECONFIG_STATUS_POLL_RESP_TIMEOUT_MS 60000
|
||||
#define RECONFIG_STATUS_INTERVAL_DELAY_US 1000000
|
||||
|
@@ -29,6 +29,7 @@
|
||||
* the ispVMLCOUNT function
|
||||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <log.h>
|
||||
#include <linux/string.h>
|
||||
#include <malloc.h>
|
||||
|
@@ -10,6 +10,7 @@
|
||||
* Copyright 2009 Lattice Semiconductor Corp.
|
||||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <log.h>
|
||||
#include <malloc.h>
|
||||
#include <fpga.h>
|
||||
|
@@ -4,7 +4,7 @@
|
||||
* All rights reserved.
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
#include <common.h>
|
||||
#include <asm/io.h>
|
||||
#include <linux/errno.h>
|
||||
#include <asm/arch/fpga_manager.h>
|
||||
|
@@ -13,6 +13,7 @@
|
||||
#include <asm/arch/misc.h>
|
||||
#include <altera.h>
|
||||
#include <asm/arch/pinmux.h>
|
||||
#include <common.h>
|
||||
#include <dm.h>
|
||||
#include <dm/ofnode.h>
|
||||
#include <errno.h>
|
||||
|
@@ -4,7 +4,7 @@
|
||||
* All rights reserved.
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
#include <common.h>
|
||||
#include <asm/io.h>
|
||||
#include <linux/errno.h>
|
||||
#include <asm/arch/fpga_manager.h>
|
||||
|
@@ -6,7 +6,7 @@
|
||||
|
||||
#define LOG_CATEGORY UCLASS_FPGA
|
||||
|
||||
#include <config.h> /* core U-Boot definitions */
|
||||
#include <common.h> /* core U-Boot definitions */
|
||||
#include <log.h>
|
||||
#include <spartan2.h> /* Spartan-II device family */
|
||||
|
||||
|
@@ -11,9 +11,8 @@
|
||||
|
||||
#define LOG_CATEGORY UCLASS_FPGA
|
||||
|
||||
#include <config.h> /* core U-Boot definitions */
|
||||
#include <common.h> /* core U-Boot definitions */
|
||||
#include <log.h>
|
||||
#include <time.h>
|
||||
#include <spartan3.h> /* Spartan-II device family */
|
||||
|
||||
/* Note: The assumption is that we cannot possibly run fast enough to
|
||||
|
@@ -4,6 +4,7 @@
|
||||
* Eran Liberty, Extricom , eran.liberty@gmail.com
|
||||
*/
|
||||
|
||||
#include <common.h> /* core U-Boot definitions */
|
||||
#include <altera.h>
|
||||
#include <linux/delay.h>
|
||||
|
||||
|
@@ -3,6 +3,7 @@
|
||||
* Copyright (C) 2016 Stefan Roese <sr@denx.de>
|
||||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <altera.h>
|
||||
#include <log.h>
|
||||
#include <spi.h>
|
||||
|
@@ -4,6 +4,7 @@
|
||||
* Siva Durga Prasad Paladugu <siva.durga.prasad.paladugu@amd.com>>
|
||||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <cpu_func.h>
|
||||
#include <log.h>
|
||||
#include <asm/arch/sys_proto.h>
|
||||
|
@@ -14,7 +14,7 @@
|
||||
|
||||
#define LOG_CATEGORY UCLASS_FPGA
|
||||
|
||||
#include <config.h>
|
||||
#include <common.h>
|
||||
#include <console.h>
|
||||
#include <log.h>
|
||||
#include <virtex2.h>
|
||||
|
@@ -11,13 +11,13 @@
|
||||
* Xilinx FPGA support
|
||||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <fpga.h>
|
||||
#include <log.h>
|
||||
#include <virtex2.h>
|
||||
#include <spartan2.h>
|
||||
#include <spartan3.h>
|
||||
#include <zynqpl.h>
|
||||
#include <linux/string.h>
|
||||
|
||||
/* Local Static Functions */
|
||||
static int xilinx_validate(xilinx_desc *desc, char *fn);
|
||||
|
@@ -6,6 +6,7 @@
|
||||
*/
|
||||
|
||||
#include <console.h>
|
||||
#include <common.h>
|
||||
#include <compiler.h>
|
||||
#include <cpu_func.h>
|
||||
#include <fpga.h>
|
||||
|
@@ -6,11 +6,10 @@
|
||||
* Joe Hershberger <joe.hershberger@ni.com>
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
#include <common.h>
|
||||
#include <console.h>
|
||||
#include <cpu_func.h>
|
||||
#include <log.h>
|
||||
#include <time.h>
|
||||
#include <asm/cache.h>
|
||||
#include <asm/io.h>
|
||||
#include <fs.h>
|
||||
|
Reference in New Issue
Block a user