GitHub-Mirror/build
2
0
Fork 0
mirror of https://github.com/Fishwaldo/build.git synced 2025-07-14 17:09:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2784 from armbian/master

Browse source 
Sync Tinker-2 branch with trunk
This commit is contained in:
Tony 2021-04-20 21:52:02 -04:00 • committed by GitHub
commit 00f90028d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
44 changed files with 16207 additions and 7182 deletions
Download patch file Download diff file Expand all files Collapse all files

55
patch/u-boot/u-boot-odroid/fix_build_for_recent_host-side_libfdt.patch Normal file
View file

@ -0,0 +1,55 @@
From 001bcba84e1f3ad0f605e5a9bb2fb5cb0e9c605d Mon Sep 17 00:00:00 2001
From: Hugo Grostabussiat <bonstra@bonstra.fr.eu.org>
Date: Fri, 11 Jan 2019 21:33:19 +0100
Subject: [PATCH] tools: fix build for recent host-side libfdt
Recent versions of libfdt removed the _ prefix in the header guards,
causing clashes with the libfdt version embedded in U-boot source tree.
---
include/fdt.h | 3 ++-
include/libfdt.h | 3 ++-
include/libfdt_env.h | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/include/fdt.h b/include/fdt.h
index 526aedb515..3dd42971eb 100644
--- a/include/fdt.h
+++ b/include/fdt.h
@@ -1,5 +1,6 @@
-#ifndef _FDT_H
+#if !defined(_FDT_H) && !defined(FDT_H)
#define _FDT_H
+#define FDT_H
/*
* libfdt - Flat Device Tree manipulation
* Copyright (C) 2006 David Gibson, IBM Corporation.
diff --git a/include/libfdt.h b/include/libfdt.h
index e2bc2e00c1..9d0d4b98ea 100644
--- a/include/libfdt.h
+++ b/include/libfdt.h
@@ -1,5 +1,6 @@
-#ifndef _LIBFDT_H
+#if !defined(_LIBFDT_H) && !defined(LIBFDT_H)
#define _LIBFDT_H
+#define LIBFDT_H
/*
* libfdt - Flat Device Tree manipulation
* Copyright (C) 2006 David Gibson, IBM Corporation.
diff --git a/include/libfdt_env.h b/include/libfdt_env.h
index 6c6845f76c..216e5c6fa1 100644
--- a/include/libfdt_env.h
+++ b/include/libfdt_env.h
@@ -6,8 +6,9 @@
* SPDX-License-Identifier: LGPL-2.1+
*/
-#ifndef _LIBFDT_ENV_H
+#if !defined(_LIBFDT_ENV_H) && !defined(LIBFDT_ENV_H)
#define _LIBFDT_ENV_H
+#define LIBFDT_ENV_H
#include "compiler.h"
#include "linux/types.h"
--
GitLab

6
patch/u-boot/u-boot-rk322x/board_rk322x-box/rk322x-box-add-device-tree-makefile.patch
View file

@ -163,7 +163,7 @@ new file mode 100644
index 00000000..a909aa19
--- /dev/null
+++ b/include/configs/rk322x-box.h
@@ -0,0 +1,27 @@
@@ -0,0 +1,29 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * (C) Copyright 2017 Rockchip Electronics Co., Ltd
@ -175,7 +175,9 @@ index 00000000..a909aa19
+#define ROCKCHIP_DEVICE_SETTINGS \
+ "stdin=serial,usbkbd\0" \
+ "stdout=serial,vidconsole\0" \
+ "stderr=serial,vidconsole\0"
+ "stderr=serial,vidconsole\0" \
+ "fdt_high=0xffffffff\0" \
+ "initrd_high=0xffffffff\0"
+
+#include <configs/rk322x_common.h>
+

24
patch/u-boot/u-boot-rk322x/u-boot-1005-support-rockchip-tee-binary.patch Normal file
View file

@ -0,0 +1,24 @@
From 52a917980ff9c621ff189c652df6f6c4afa7f44c Mon Sep 17 00:00:00 2001
From: Paolo Sabatino <paolo.sabatino@gmail.com>
Date: Mon, 12 Apr 2021 13:42:48 +0000
Subject: [PATCH] Set register r1 to CONFIG_SYS_TEXT_BASE to support rockchip
proprietary OP-TEE binaries
---
common/spl/spl_optee.S | 1 +
1 file changed, 1 insertion(+)
diff --git a/common/spl/spl_optee.S b/common/spl/spl_optee.S
index 8bd1949d..6dde863f 100644
--- a/common/spl/spl_optee.S
+++ b/common/spl/spl_optee.S
@@ -8,5 +8,6 @@
ENTRY(spl_optee_entry)
ldr lr, =CONFIG_SYS_TEXT_BASE
+ ldr r1, =CONFIG_SYS_TEXT_BASE
mov pc, r3
ENDPROC(spl_optee_entry)
--
2.25.1