From: Tom Rini <trini@konsulko.com>
Date: Mon, 12 Aug 2019 22:48:34 +0000 (-0400)
Subject: Merge tag 'u-boot-amlogic-20190812' of https://gitlab.denx.de/u-boot/custodians/u... 
X-Git-Tag: v2019.10-rc2~2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=60f38d82c45fef55ac04ee52b234e6dd07e31935;p=oweals%2Fu-boot.git

Merge tag 'u-boot-amlogic-20190812' of https://gitlab.denx.de/u-boot/custodians/u-boot-amlogic

- amlogic: add support for the SEI Robotic SEI510
---

60f38d82c45fef55ac04ee52b234e6dd07e31935
diff --cc board/amlogic/sei510/sei510.c
index 0000000000,a92fccd3fd..5de610d85f
mode 000000,100644..100644
--- a/board/amlogic/sei510/sei510.c
+++ b/board/amlogic/sei510/sei510.c
@@@ -1,0 -1,26 +1,26 @@@
+ // SPDX-License-Identifier: GPL-2.0+
+ /*
+  * Copyright (C) 2016 BayLibre, SAS
+  * Author: Neil Armstrong <narmstrong@baylibre.com>
+  */
+ 
+ #include <common.h>
+ #include <dm.h>
 -#include <environment.h>
++#include <env_internal.h>
+ #include <asm/io.h>
+ #include <asm/arch/axg.h>
+ #include <asm/arch/sm.h>
+ #include <asm/arch/eth.h>
+ #include <asm/arch/mem.h>
+ 
+ int misc_init_r(void)
+ {
+ 	meson_eth_init(PHY_INTERFACE_MODE_RMII,
+ 		       MESON_USE_INTERNAL_RMII_PHY);
+ 
+ 	meson_generate_serial_ethaddr();
+ 
+ 	env_set("serial#", "AMLG12ASEI510");
+ 
+ 	return 0;
+ }