From 6ac70f6eb75fdd5ff757ef09e18d96e09760f173 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor.pecovnik@gmail.com>
Date: Tue, 6 Apr 2021 22:59:52 +0200
Subject: [PATCH] Bugfix - adjust u-boot compiler issues

This fixes Rockpi S u-boot compilation on GCC10 / Hirsute host
---
 .../0001-fixing-dtc-error.patch               | 26 +++++++
 .../compiler_adjustements.patch               | 67 +++++++++++++++++++
 2 files changed, 93 insertions(+)
 create mode 100644 patch/u-boot/u-boot-rockchip64/0001-fixing-dtc-error.patch
 create mode 100644 patch/u-boot/u-boot-rockchip64/board_rockpi-s/compiler_adjustements.patch

diff --git a/patch/u-boot/u-boot-rockchip64/0001-fixing-dtc-error.patch b/patch/u-boot/u-boot-rockchip64/0001-fixing-dtc-error.patch
new file mode 100644
index 000000000..6b930b18d
--- /dev/null
+++ b/patch/u-boot/u-boot-rockchip64/0001-fixing-dtc-error.patch
@@ -0,0 +1,26 @@
+From 97bca7b4cec321501a710cb0ce8b598a9e746a19 Mon Sep 17 00:00:00 2001
+From: Igor Pecovnik <igor.pecovnik@gmail.com>
+Date: Mon, 8 Mar 2021 13:12:41 +0000
+Subject: [PATCH] ;spi;u-boot-spl.kwb:u-boot.flash
+
+Signed-off-by: Igor Pecovnik <igor.pecovnik@gmail.com>
+---
+ scripts/dtc/dtc-lexer.l | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/dtc/dtc-lexer.l b/scripts/dtc/dtc-lexer.l
+index fd825eb..f57c9a7 100644
+--- a/scripts/dtc/dtc-lexer.l
++++ b/scripts/dtc/dtc-lexer.l
+@@ -38,7 +38,7 @@ LINECOMMENT	"//".*\n
+ #include "srcpos.h"
+ #include "dtc-parser.tab.h"
+ 
+-YYLTYPE yylloc;
++extern YYLTYPE yylloc;
+ extern bool treesource_error;
+ 
+ /* CAUTION: this will stop working if we ever use yyless() or yyunput() */
+-- 
+Created with Armbian build tools https://github.com/armbian/build
+
diff --git a/patch/u-boot/u-boot-rockchip64/board_rockpi-s/compiler_adjustements.patch b/patch/u-boot/u-boot-rockchip64/board_rockpi-s/compiler_adjustements.patch
new file mode 100644
index 000000000..61d608059
--- /dev/null
+++ b/patch/u-boot/u-boot-rockchip64/board_rockpi-s/compiler_adjustements.patch
@@ -0,0 +1,67 @@
+From 8b491a20035b1312a578d1de6fd9c78bcde068e1 Mon Sep 17 00:00:00 2001
+From: Igor Pecovnik <igor.pecovnik@gmail.com>
+Date: Tue, 6 Apr 2021 21:22:30 +0000
+Subject: [PATCH] Patching something
+
+Signed-off-by: Igor Pecovnik <igor.pecovnik@gmail.com>
+---
+ arch/arm/dts/Makefile   | 30 +-----------------------------
+ scripts/dtc/dtc-lexer.l |  1 -
+ 2 files changed, 1 insertion(+), 30 deletions(-)
+
+diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
+index 594614a..9d12e51 100644
+--- a/arch/arm/dts/Makefile
++++ b/arch/arm/dts/Makefile
+@@ -28,35 +28,7 @@ dtb-$(CONFIG_EXYNOS5) += exynos5250-arndale.dtb \
+ 	exynos5422-odroidxu3.dtb
+ dtb-$(CONFIG_EXYNOS7420) += exynos7420-espresso7420.dtb
+ dtb-$(CONFIG_ARCH_ROCKCHIP) += \
+-	rk3036-sdk.dtb \
+-	rk3066a-mk808.dtb \
+-	rk3126-evb.dtb \
+-	rk3128-evb.dtb \
+-	rk3188-radxarock.dtb \
+-	rk3288-evb.dtb \
+-	rk3288-fennec.dtb \
+-	rk3288-firefly.dtb \
+-	rk3288-miqi.dtb \
+-	rk3288-phycore-rdk.dtb \
+-	rk3288-popmetal.dtb \
+-	rk3288-rock2-square.dtb \
+-	rk3288-tinker.dtb \
+-	rk3288-veyron-jerry.dtb \
+-	rk3288-veyron-mickey.dtb \
+-	rk3288-veyron-minnie.dtb \
+-	rk3288-vyasa.dtb \
+-	rk3308-evb.dtb \
+-	rk3328-evb.dtb \
+-	rk3368-lion.dtb \
+-	rk3368-sheep.dtb \
+-	rk3368-geekbox.dtb \
+-	rk3368-px5-evb.dtb \
+-	rk3399-evb.dtb \
+-	rk3399-firefly.dtb \
+-	rk3399-puma-ddr1333.dtb \
+-	rk3399-puma-ddr1600.dtb \
+-	rk3399-puma-ddr1866.dtb \
+-	rv1108-evb.dtb
++	rk3308-evb.dtb
+ dtb-$(CONFIG_ARCH_MESON) += \
+ 	meson-gxbb-odroidc2.dtb
+ dtb-$(CONFIG_TEGRA) += tegra20-harmony.dtb \
+diff --git a/scripts/dtc/dtc-lexer.l b/scripts/dtc/dtc-lexer.l
+index f57c9a7..24af549 100644
+--- a/scripts/dtc/dtc-lexer.l
++++ b/scripts/dtc/dtc-lexer.l
+@@ -38,7 +38,6 @@ LINECOMMENT	"//".*\n
+ #include "srcpos.h"
+ #include "dtc-parser.tab.h"
+ 
+-extern YYLTYPE yylloc;
+ extern bool treesource_error;
+ 
+ /* CAUTION: this will stop working if we ever use yyless() or yyunput() */
+-- 
+Created with Armbian build tools https://github.com/armbian/build
+