Skip to content
Snippets Groups Projects
Commit 03de305e authored by Tom Rini's avatar Tom Rini
Browse files

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


As part of bringing the master branch back in to next, we need to allow
for all of these changes to exist here.

Reported-by: default avatarJonas Karlman <jonas@kwiboo.se>
Signed-off-by: default avatarTom Rini <trini@konsulko.com>
parent d4781422
No related branches found
No related tags found
No related merge requests found
Showing
with 30 additions and 16 deletions
...@@ -598,6 +598,22 @@ R: Marc Murphy <marc.murphy@sancloud.com> ...@@ -598,6 +598,22 @@ R: Marc Murphy <marc.murphy@sancloud.com>
S: Supported S: Supported
F: arch/arm/dts/am335x-sancloud* F: arch/arm/dts/am335x-sancloud*
ARM SC5XX
M: Nathan Barrett-Morrison <nathan.morrison@timesys.com>
M: Greg Malysa <greg.malysa@timesys.com>
M: Ian Roberts <ian.roberts@timesys.com>
M: Vasileios Bimpikas <vasileios.bimpikas@analog.com>
M: Utsav Agarwal <utsav.agarwal@analog.com>
M: Arturs Artamonovs <arturs.artamonovs@analog.com>
S: Supported
T: git https://github.com/analogdevicesinc/lnxdsp-u-boot
F: arch/arm/include/asm/arch-adi/
F: arch/arm/mach-sc5xx/
F: drivers/clk/adi/
F: drivers/serial/serial_adi_uart4.c
F: drivers/timer/adi_sc5xx_timer.c
F: include/env/adi/
ARM SNAPDRAGON ARM SNAPDRAGON
M: Caleb Connolly <caleb.connolly@linaro.org> M: Caleb Connolly <caleb.connolly@linaro.org>
M: Neil Armstrong <neil.armstrong@linaro.org> M: Neil Armstrong <neil.armstrong@linaro.org>
......
...@@ -7,11 +7,13 @@ ...@@ -7,11 +7,13 @@
#include <config.h> #include <config.h>
#include <command.h> #include <command.h>
#include <common.h>
#include <env.h> #include <env.h>
#include <malloc.h> #include <malloc.h>
#include <time.h>
#include <env_internal.h> #include <env_internal.h>
#include <vsprintf.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/errno.h>
#include <linux/types.h> #include <linux/types.h>
#include <api_public.h> #include <api_public.h>
#include <u-boot/crc.h> #include <u-boot/crc.h>
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
* Copyright (c) 2011 The Chromium OS Authors. * Copyright (c) 2011 The Chromium OS Authors.
*/ */
#include <common.h>
#include <api_public.h> #include <api_public.h>
#include <log.h> #include <log.h>
#include <linux/types.h>
/* TODO(clchiou): add support of video device */ /* TODO(clchiou): add support of video device */
......
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
*/ */
#include <config.h> #include <config.h>
#include <common.h>
#include <net.h> #include <net.h>
#include <linux/types.h> #include <linux/types.h>
#include <api_public.h> #include <api_public.h>
......
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
#include <linux/types.h> #include <linux/types.h>
#include <api_public.h> #include <api_public.h>
#include <asm/u-boot.h>
#include <asm/global_data.h> #include <asm/global_data.h>
#include "api_private.h" #include "api_private.h"
......
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
#include <linux/types.h> #include <linux/types.h>
#include <api_public.h> #include <api_public.h>
#include <asm/u-boot.h>
#include <asm/global_data.h> #include <asm/global_data.h>
#include "api_private.h" #include "api_private.h"
......
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
#include <linux/types.h> #include <linux/types.h>
#include <api_public.h> #include <api_public.h>
#include <asm/u-boot.h>
#include <asm/global_data.h> #include <asm/global_data.h>
#include "api_private.h" #include "api_private.h"
......
...@@ -6,10 +6,10 @@ ...@@ -6,10 +6,10 @@
*/ */
#include <config.h> #include <config.h>
#include <common.h>
#include <api_public.h> #include <api_public.h>
#include <part.h> #include <part.h>
#include <scsi.h> #include <scsi.h>
#include <linux/types.h>
#if defined(CONFIG_CMD_USB) && defined(CONFIG_USB_STORAGE) #if defined(CONFIG_CMD_USB) && defined(CONFIG_USB_STORAGE)
#include <usb.h> #include <usb.h>
......
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
#ifndef __ASM_ARC_GLOBAL_DATA_H #ifndef __ASM_ARC_GLOBAL_DATA_H
#define __ASM_ARC_GLOBAL_DATA_H #define __ASM_ARC_GLOBAL_DATA_H
#include <asm/u-boot.h>
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
/* Architecture-specific global data */ /* Architecture-specific global data */
struct arch_global_data { struct arch_global_data {
......
...@@ -1853,6 +1853,9 @@ config TARGET_LS1046AFRWY ...@@ -1853,6 +1853,9 @@ config TARGET_LS1046AFRWY
development platform that supports the QorIQ LS1046A development platform that supports the QorIQ LS1046A
Layerscape Architecture processor. Layerscape Architecture processor.
config ARCH_SC5XX
bool "Analog Devices SC5XX-processor family"
config TARGET_SL28 config TARGET_SL28
bool "Support sl28" bool "Support sl28"
select ARCH_LS1028A select ARCH_LS1028A
...@@ -2286,6 +2289,8 @@ source "arch/arm/mach-rockchip/Kconfig" ...@@ -2286,6 +2289,8 @@ source "arch/arm/mach-rockchip/Kconfig"
source "arch/arm/mach-s5pc1xx/Kconfig" source "arch/arm/mach-s5pc1xx/Kconfig"
source "arch/arm/mach-sc5xx/Kconfig"
source "arch/arm/mach-snapdragon/Kconfig" source "arch/arm/mach-snapdragon/Kconfig"
source "arch/arm/mach-socfpga/Kconfig" source "arch/arm/mach-socfpga/Kconfig"
......
...@@ -78,6 +78,7 @@ machine-$(CONFIG_ARCH_OWL) += owl ...@@ -78,6 +78,7 @@ machine-$(CONFIG_ARCH_OWL) += owl
machine-$(CONFIG_ARCH_RENESAS) += renesas machine-$(CONFIG_ARCH_RENESAS) += renesas
machine-$(CONFIG_ARCH_ROCKCHIP) += rockchip machine-$(CONFIG_ARCH_ROCKCHIP) += rockchip
machine-$(CONFIG_ARCH_S5PC1XX) += s5pc1xx machine-$(CONFIG_ARCH_S5PC1XX) += s5pc1xx
machine-$(CONFIG_ARCH_SC5XX) += sc5xx
machine-$(CONFIG_ARCH_SNAPDRAGON) += snapdragon machine-$(CONFIG_ARCH_SNAPDRAGON) += snapdragon
machine-$(CONFIG_ARCH_SOCFPGA) += socfpga machine-$(CONFIG_ARCH_SOCFPGA) += socfpga
machine-$(CONFIG_ARCH_STM32) += stm32 machine-$(CONFIG_ARCH_STM32) += stm32
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
* CPU specific code * CPU specific code
*/ */
#include <common.h>
#include <command.h> #include <command.h>
#include <cpu_func.h> #include <cpu_func.h>
#include <irq_func.h> #include <irq_func.h>
......
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
* (c) 2007 Pengutronix, Sascha Hauer <s.hauer@pengutronix.de> * (c) 2007 Pengutronix, Sascha Hauer <s.hauer@pengutronix.de>
*/ */
#include <common.h>
#include <asm/arch/imx-regs.h> #include <asm/arch/imx-regs.h>
#include <asm/arch/clock.h> #include <asm/arch/clock.h>
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
* Sascha Hauer, Pengutronix * Sascha Hauer, Pengutronix
*/ */
#include <common.h>
#include <div64.h> #include <div64.h>
#include <init.h> #include <init.h>
#include <asm/arch/imx-regs.h> #include <asm/arch/imx-regs.h>
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
* Sascha Hauer, Pengutronix * Sascha Hauer, Pengutronix
*/ */
#include <common.h>
#include <init.h> #include <init.h>
#include <asm/arch/imx-regs.h> #include <asm/arch/imx-regs.h>
#include <asm/io.h> #include <asm/io.h>
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
* Alex Zuepke <azu@sysgo.de> * Alex Zuepke <azu@sysgo.de>
*/ */
#include <common.h> #include <linux/types.h>
#if defined(CONFIG_ARCH_TEGRA) #if defined(CONFIG_ARCH_TEGRA)
static ulong timestamp; static ulong timestamp;
......
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
* CPU specific code * CPU specific code
*/ */
#include <common.h>
#include <command.h> #include <command.h>
#include <cpu_func.h> #include <cpu_func.h>
#include <irq_func.h> #include <irq_func.h>
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
*/ */
#include <asm-offsets.h> #include <asm-offsets.h>
#include <common.h>
#include <config.h> #include <config.h>
/* /*
......
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
#include <cpu_func.h> #include <cpu_func.h>
#include <asm/cache.h> #include <asm/cache.h>
#include <linux/types.h> #include <linux/types.h>
#include <common.h>
#if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF) #if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF)
void invalidate_dcache_all(void) void invalidate_dcache_all(void)
......
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
* CPU specific code * CPU specific code
*/ */
#include <common.h>
#include <command.h> #include <command.h>
#include <cpu_func.h> #include <cpu_func.h>
#include <irq_func.h> #include <irq_func.h>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment