From e8f71869179f5c099228958a3d869b20005f7273 Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Thu, 02 Jul 2020 18:08:02 +0800
Subject: [PATCH] update build_QT5.sh shell script, add comment for unrecognized command line option ‘-std=c++11’ error
---
linux-bsp/patches/linux-3.2.0-ok335x.patch | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/linux-bsp/patches/linux-3.2.0-ok335x.patch b/linux-bsp/patches/linux-3.2.0-ok335x.patch
index c12b7ec..7adae61 100644
--- a/linux-bsp/patches/linux-3.2.0-ok335x.patch
+++ b/linux-bsp/patches/linux-3.2.0-ok335x.patch
@@ -1,6 +1,6 @@
diff -Nuar linux-3.2.0/arch/arm/mach-omap2/board-am335xevm.c linux-3.2.0-ok335x/arch/arm/mach-omap2/board-am335xevm.c
--- linux-3.2.0/arch/arm/mach-omap2/board-am335xevm.c 2014-01-22 18:20:21.000000000 +0800
-+++ linux-3.2.0-ok335x/arch/arm/mach-omap2/board-am335xevm.c 2019-11-30 12:47:45.669731513 +0800
++++ linux-3.2.0-ok335x/arch/arm/mach-omap2/board-am335xevm.c 2020-06-25 11:38:40.014710772 +0800
@@ -116,8 +116,8 @@
#define SCREEN_SIZE_480X272_4 3
#define SCREEN_SIZE_800X600_10 4
@@ -126,7 +126,7 @@
}
diff -Nuar linux-3.2.0/build.sh linux-3.2.0-ok335x/build.sh
--- linux-3.2.0/build.sh 1970-01-01 08:00:00.000000000 +0800
-+++ linux-3.2.0-ok335x/build.sh 2019-11-30 12:48:35.089732461 +0800
++++ linux-3.2.0-ok335x/build.sh 2020-06-25 11:38:40.042710772 +0800
@@ -0,0 +1,75 @@
+#!/bin/bash
+
@@ -205,7 +205,7 @@
+
diff -Nuar linux-3.2.0/.cfg-ok335x linux-3.2.0-ok335x/.cfg-ok335x
--- linux-3.2.0/.cfg-ok335x 1970-01-01 08:00:00.000000000 +0800
-+++ linux-3.2.0-ok335x/.cfg-ok335x 2019-11-30 12:51:32.313735861 +0800
++++ linux-3.2.0-ok335x/.cfg-ok335x 2020-06-25 11:49:20.106727321 +0800
@@ -0,0 +1,2936 @@
+#
+# Automatically generated file; DO NOT EDIT.
@@ -3145,7 +3145,7 @@
+# CONFIG_CORDIC is not set
diff -Nuar linux-3.2.0/ChangeLog.txt linux-3.2.0-ok335x/ChangeLog.txt
--- linux-3.2.0/ChangeLog.txt 1970-01-01 08:00:00.000000000 +0800
-+++ linux-3.2.0-ok335x/ChangeLog.txt 2019-11-30 12:47:45.721731514 +0800
++++ linux-3.2.0-ok335x/ChangeLog.txt 2020-06-25 11:38:40.042710772 +0800
@@ -0,0 +1,15 @@
+
+1. Nandflash(MT29F2G08ABAEAWP, 256M) Partition
@@ -3164,7 +3164,7 @@
+
diff -Nuar linux-3.2.0/drivers/input/touchscreen/ft5x06_ts.c linux-3.2.0-ok335x/drivers/input/touchscreen/ft5x06_ts.c
--- linux-3.2.0/drivers/input/touchscreen/ft5x06_ts.c 2014-01-17 14:37:52.000000000 +0800
-+++ linux-3.2.0-ok335x/drivers/input/touchscreen/ft5x06_ts.c 2019-11-30 12:47:45.721731514 +0800
++++ linux-3.2.0-ok335x/drivers/input/touchscreen/ft5x06_ts.c 2020-06-25 11:38:40.042710772 +0800
@@ -16,7 +16,7 @@
*
* VERSION DATE AUTHOR Note
@@ -3192,9 +3192,21 @@
ret = i2c_add_driver(&ft5x0x_ts_driver);
//printk("ret=%d\n",ret);
return ret;
+diff -Nuar linux-3.2.0/kernel/timeconst.pl linux-3.2.0-ok335x/kernel/timeconst.pl
+--- linux-3.2.0/kernel/timeconst.pl 2013-11-20 14:14:15.000000000 +0800
++++ linux-3.2.0-ok335x/kernel/timeconst.pl 2020-06-25 11:40:55.518713581 +0800
+@@ -370,7 +370,7 @@
+ }
+
+ @val = @{$canned_values{$hz}};
+- if (!defined(@val)) {
++ if (!(@val)) {
+ @val = compute_values($hz);
+ }
+ output($hz, @val);
diff -Nuar linux-3.2.0/Makefile linux-3.2.0-ok335x/Makefile
--- linux-3.2.0/Makefile 2019-07-28 20:25:29.000000000 +0800
-+++ linux-3.2.0-ok335x/Makefile 2019-11-30 12:48:36.865732495 +0800
++++ linux-3.2.0-ok335x/Makefile 2020-06-25 11:38:40.058710772 +0800
@@ -192,8 +192,8 @@
# Default value for CROSS_COMPILE is not to prefix executables
# Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile
--
Gitblit v1.9.1