]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
Merge tag 'u-boot-amlogic-20190812' of https://gitlab.denx.de/u-boot/custodians/u...
authorTom Rini <trini@konsulko.com>
Mon, 12 Aug 2019 22:48:34 +0000 (18:48 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 13 Aug 2019 03:03:35 +0000 (23:03 -0400)
- amlogic: add support for the SEI Robotic SEI510

1  2 
arch/arm/dts/Makefile
arch/arm/mach-meson/board-common.c
board/amlogic/sei510/sei510.c

Simple merge
Simple merge
index 0000000000000000000000000000000000000000,a92fccd3fdaf3dba063aa20007083e58a1862112..5de610d85fc8d20899cf926be00e66949100b235
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,26 +1,26 @@@
 -#include <environment.h>
+ // SPDX-License-Identifier: GPL-2.0+
+ /*
+  * Copyright (C) 2016 BayLibre, SAS
+  * Author: Neil Armstrong <narmstrong@baylibre.com>
+  */
+ #include <common.h>
+ #include <dm.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;
+ }