From 69553ad37547b9202350da5a8e72c8b53e9462d3 Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Sat, 29 Oct 2022 10:19:23 +0800
Subject: [PATCH] Merge branch 'master' of ssh://master.iot-yun.club:2280/imx6ull
---
bsp/kernel/patch/linux-imx-lf-5.15.32-2.0.0.patch | 82 ++++++++++++++++++--------
tools/setup_tools.sh | 43 +-------------
2 files changed, 59 insertions(+), 66 deletions(-)
diff --git a/bsp/kernel/patch/linux-imx-lf-5.15.32-2.0.0.patch b/bsp/kernel/patch/linux-imx-lf-5.15.32-2.0.0.patch
index 375ce63..224f2fb 100644
--- a/bsp/kernel/patch/linux-imx-lf-5.15.32-2.0.0.patch
+++ b/bsp/kernel/patch/linux-imx-lf-5.15.32-2.0.0.patch
@@ -1,6 +1,6 @@
diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/igkboard.dts linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/igkboard.dts
--- linux-imx/arch/arm/boot/dts/igkboard.dts 1970-01-01 08:00:00.000000000 +0800
-+++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/igkboard.dts 2022-10-06 10:55:47.564618629 +0800
++++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/igkboard.dts 2022-10-19 20:15:25.788083251 +0800
@@ -0,0 +1,603 @@
+/*
+ * Device Tree Source for LingYun IGKBoard(IoT Gateway Kit Board)
@@ -605,10 +605,9 @@
+ };
+
+};
-\ No newline at end of file
diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/Makefile linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/Makefile
--- linux-imx/arch/arm/boot/dts/Makefile 2022-07-22 03:24:17.000000000 +0800
-+++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/Makefile 2022-10-06 10:55:47.564618629 +0800
++++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/Makefile 2022-10-10 21:24:04.761882834 +0800
@@ -1586,3 +1586,6 @@
aspeed-bmc-portwell-neptune.dtb \
aspeed-bmc-quanta-q71l.dtb \
@@ -616,9 +615,40 @@
+DTC_FLAGS_igkboard := -@
+dtb-$(CONFIG_SOC_IMX6UL) += igkboard.dtb
+subdir-$(CONFIG_SOC_IMX6UL) += overlays
+diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/adc.dts linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/adc.dts
+--- linux-imx/arch/arm/boot/dts/overlays/adc.dts 1970-01-01 08:00:00.000000000 +0800
++++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/adc.dts 2022-10-19 20:15:03.940542000 +0800
+@@ -0,0 +1,27 @@
++/*
++ * Copyright (C) 2022 LingYun IoT System Studio
++ * Author: Guo Wenxue<guowenxue@gmail.com>
++ */
++/dts-v1/;
++/plugin/;
++
++#include "../imx6ul-pinfunc.h"
++
++/* 40-pin extended GPIO, ADC interfaces */
++
++&adc1 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_adc1>;
++ num-channels = <5>;
++ vref-supply = <®_peri_3v3>;
++ status = "okay";
++};
++
++&iomuxc {
++ pinctrl_adc1: adc1grp {
++ fsl,pins = <
++ MX6UL_PAD_GPIO1_IO01__GPIO1_IO01 0xb0 /* ADC1_1 --->TS_YN */
++ MX6UL_PAD_GPIO1_IO04__GPIO1_IO04 0xb0 /* ADC1_4 --->TS_XP */
++ >;
++ };
++};
diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/cam.dts linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/cam.dts
--- linux-imx/arch/arm/boot/dts/overlays/cam.dts 1970-01-01 08:00:00.000000000 +0800
-+++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/cam.dts 2022-10-06 10:55:47.564618629 +0800
++++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/cam.dts 2022-10-10 21:24:04.761882834 +0800
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2022 LingYun IoT System Studio
@@ -646,7 +676,7 @@
+
diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/can1.dts linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/can1.dts
--- linux-imx/arch/arm/boot/dts/overlays/can1.dts 1970-01-01 08:00:00.000000000 +0800
-+++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/can1.dts 2022-10-06 10:55:47.564618629 +0800
++++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/can1.dts 2022-10-10 21:24:04.761882834 +0800
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2022 LingYun IoT System Studio
@@ -678,7 +708,7 @@
+
diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/can2.dts linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/can2.dts
--- linux-imx/arch/arm/boot/dts/overlays/can2.dts 1970-01-01 08:00:00.000000000 +0800
-+++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/can2.dts 2022-10-06 10:55:47.564618629 +0800
++++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/can2.dts 2022-10-10 21:24:04.761882834 +0800
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2022 LingYun IoT System Studio
@@ -710,7 +740,7 @@
+
diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/i2c1.dts linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/i2c1.dts
--- linux-imx/arch/arm/boot/dts/overlays/i2c1.dts 1970-01-01 08:00:00.000000000 +0800
-+++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/i2c1.dts 2022-10-06 10:55:47.564618629 +0800
++++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/i2c1.dts 2022-10-10 21:24:04.761882834 +0800
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2022 LingYun IoT System Studio
@@ -742,7 +772,7 @@
+
diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/lcd.dts linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/lcd.dts
--- linux-imx/arch/arm/boot/dts/overlays/lcd.dts 1970-01-01 08:00:00.000000000 +0800
-+++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/lcd.dts 2022-10-06 10:55:47.564618629 +0800
++++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/lcd.dts 2022-10-10 21:24:04.761882834 +0800
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2022 LingYun IoT System Studio
@@ -835,8 +865,8 @@
+};
diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/Makefile linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/Makefile
--- linux-imx/arch/arm/boot/dts/overlays/Makefile 1970-01-01 08:00:00.000000000 +0800
-+++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/Makefile 2022-10-06 10:55:47.564618629 +0800
-@@ -0,0 +1,18 @@
++++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/Makefile 2022-10-19 20:14:57.464677901 +0800
+@@ -0,0 +1,19 @@
+# SPDX-License-Identifier: GPL-2.0
+# required for overlay support
+
@@ -855,10 +885,10 @@
+dtb-y += lcd.dtbo
+dtb-y += cam.dtbo
+dtb-y += nbiot-4g.dtbo
-\ No newline at end of file
++dtb-y += adc.dtbo
diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/nbiot-4g.dts linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/nbiot-4g.dts
--- linux-imx/arch/arm/boot/dts/overlays/nbiot-4g.dts 1970-01-01 08:00:00.000000000 +0800
-+++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/nbiot-4g.dts 2022-10-06 10:55:47.564618629 +0800
++++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/nbiot-4g.dts 2022-10-10 21:24:04.761882834 +0800
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2022 LingYun IoT System Studio
@@ -896,7 +926,7 @@
+
diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/pwm7.dts linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/pwm7.dts
--- linux-imx/arch/arm/boot/dts/overlays/pwm7.dts 1970-01-01 08:00:00.000000000 +0800
-+++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/pwm7.dts 2022-10-06 10:55:47.564618629 +0800
++++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/pwm7.dts 2022-10-10 21:24:04.761882834 +0800
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2022 LingYun IoT System Studio
@@ -928,7 +958,7 @@
+
diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/pwm8.dts linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/pwm8.dts
--- linux-imx/arch/arm/boot/dts/overlays/pwm8.dts 1970-01-01 08:00:00.000000000 +0800
-+++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/pwm8.dts 2022-10-06 10:55:47.564618629 +0800
++++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/pwm8.dts 2022-10-10 21:24:04.761882834 +0800
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2022 LingYun IoT System Studio
@@ -960,7 +990,7 @@
+
diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/spi1.dts linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/spi1.dts
--- linux-imx/arch/arm/boot/dts/overlays/spi1.dts 1970-01-01 08:00:00.000000000 +0800
-+++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/spi1.dts 2022-10-06 10:55:47.564618629 +0800
++++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/spi1.dts 2022-10-10 21:24:04.761882834 +0800
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2022 LingYun IoT System Studio
@@ -1003,7 +1033,7 @@
+};
diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/uart2.dts linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/uart2.dts
--- linux-imx/arch/arm/boot/dts/overlays/uart2.dts 1970-01-01 08:00:00.000000000 +0800
-+++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/uart2.dts 2022-10-06 10:55:47.564618629 +0800
++++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/uart2.dts 2022-10-10 21:24:04.761882834 +0800
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2022 LingYun IoT System Studio
@@ -1033,7 +1063,7 @@
+};
diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/uart3.dts linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/uart3.dts
--- linux-imx/arch/arm/boot/dts/overlays/uart3.dts 1970-01-01 08:00:00.000000000 +0800
-+++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/uart3.dts 2022-10-06 10:55:47.564618629 +0800
++++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/uart3.dts 2022-10-10 21:24:04.761882834 +0800
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2022 LingYun IoT System Studio
@@ -1064,7 +1094,7 @@
+
diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/uart4.dts linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/uart4.dts
--- linux-imx/arch/arm/boot/dts/overlays/uart4.dts 1970-01-01 08:00:00.000000000 +0800
-+++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/uart4.dts 2022-10-06 10:55:47.564618629 +0800
++++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/uart4.dts 2022-10-10 21:24:04.761882834 +0800
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2022 LingYun IoT System Studio
@@ -1095,7 +1125,7 @@
+
diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/uart7.dts linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/uart7.dts
--- linux-imx/arch/arm/boot/dts/overlays/uart7.dts 1970-01-01 08:00:00.000000000 +0800
-+++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/uart7.dts 2022-10-06 10:55:47.564618629 +0800
++++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/uart7.dts 2022-10-10 21:24:04.761882834 +0800
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2022 LingYun IoT System Studio
@@ -1126,7 +1156,7 @@
+
diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/w1.dts linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/w1.dts
--- linux-imx/arch/arm/boot/dts/overlays/w1.dts 1970-01-01 08:00:00.000000000 +0800
-+++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/w1.dts 2022-10-06 10:55:47.564618629 +0800
++++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/w1.dts 2022-10-10 21:24:04.761882834 +0800
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2022 LingYun IoT System Studio
@@ -1161,7 +1191,7 @@
+
diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/configs/igkboard_defconfig linux-imx-lf-5.15.32-2.0.0/arch/arm/configs/igkboard_defconfig
--- linux-imx/arch/arm/configs/igkboard_defconfig 1970-01-01 08:00:00.000000000 +0800
-+++ linux-imx-lf-5.15.32-2.0.0/arch/arm/configs/igkboard_defconfig 2022-10-06 11:05:22.312555493 +0800
++++ linux-imx-lf-5.15.32-2.0.0/arch/arm/configs/igkboard_defconfig 2022-10-19 20:12:14.180091154 +0800
@@ -0,0 +1,587 @@
+CONFIG_KERNEL_LZO=y
+CONFIG_SYSVIPC=y
@@ -1752,25 +1782,25 @@
+# CONFIG_FTRACE is not set
diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/drivers/video/backlight/pwm_bl.c linux-imx-lf-5.15.32-2.0.0/drivers/video/backlight/pwm_bl.c
--- linux-imx/drivers/video/backlight/pwm_bl.c 2022-07-22 03:24:23.000000000 +0800
-+++ linux-imx-lf-5.15.32-2.0.0/drivers/video/backlight/pwm_bl.c 2022-10-06 11:02:43.047970154 +0800
++++ linux-imx-lf-5.15.32-2.0.0/drivers/video/backlight/pwm_bl.c 2022-10-10 21:24:04.761882834 +0800
@@ -552,6 +552,7 @@
if (!state.period && (data->pwm_period_ns > 0))
state.period = data->pwm_period_ns;
-
+
+ state.enabled = true; /* Add by guowenxue to enalbe backlight as default */
ret = pwm_apply_state(pb->pwm, &state);
if (ret) {
dev_err(&pdev->dev, "failed to apply initial PWM state: %d\n",
diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/Makefile linux-imx-lf-5.15.32-2.0.0/Makefile
--- linux-imx/Makefile 2022-07-22 03:24:17.000000000 +0800
-+++ linux-imx-lf-5.15.32-2.0.0/Makefile 2022-10-06 10:55:47.568618548 +0800
++++ linux-imx-lf-5.15.32-2.0.0/Makefile 2022-10-19 20:11:19.873219761 +0800
@@ -382,6 +382,8 @@
# Default value for CROSS_COMPILE is not to prefix executables
# Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile
ARCH ?= $(SUBARCH)
+ARCH = arm
-+CROSS_COMPILE?=/opt/buildroot/cortexA7/bin/arm-linux-
-
++CROSS_COMPILE ?= /opt/gcc-arm-10.3-2021.07/bin/arm-none-linux-gnueabihf-
+
# Architecture as present in compile.h
UTS_MACHINE := $(ARCH)
@@ -1880,6 +1882,7 @@
diff --git a/tools/setup_tools.sh b/tools/setup_tools.sh
index 8c80b6a..4c75e07 100755
--- a/tools/setup_tools.sh
+++ b/tools/setup_tools.sh
@@ -2,8 +2,6 @@
# This shell script used to setup imx6ull build envrionment
#
-LYFTP_PUB=http://wekei-iot.com:2211/imx/igkboard/tools/lintools
-
# display in yellow
function pr_warn() {
echo -e "\033[40;33m --W-- $1 \033[0m\n"
@@ -47,7 +45,7 @@
systools="coreutils jq wget curl tree gawk sed unzip cpio lz4 lzop zstd rsync kmod kpartx tmux \
desktop-file-utils iputils-ping xterm diffstat chrpath asciidoc docbook-utils help2man \
build-essential gcc g++ make cmake automake groff socat flex texinfo bison texi2html \
- git cvs subversion mercurial autoconf autoconf-archive \
+ bc git cvs subversion mercurial autoconf autoconf-archive \
python2 python3 python3-pip python3-pexpect python3-git python3-jinja2 libsdl1.2-dev \
lib32z1 libssl-dev libncurses-dev lib32ncurses-dev libgl1-mesa-dev libglu1-mesa-dev \
"
@@ -69,49 +67,16 @@
binfmt-support qemu qemu-user-static debootstrap debian-archive-keyring "
apt install -y $devtools
-
- #sudo update-alternatives --install /usr/bin/arm-linux-gnueabihf-gcc arm-linux-gnueabihf-gcc /usr/bin/arm-linux-gnueabihf-gcc-9 10
-}
-
-function install_buildroot()
-{
- BUILDROOT_PATH=/opt/buildroot
- BUILDROOT_NAME=cortexA7
-
- BUILDROOT_VER=buildroot-2021.02.7-cortexA7
- BUILDROOT_TAR=${BUILDROOT_VER}.tar.bz2
- BUILDROOT_DLADDR=${LYFTP_PUB}/$BUILDROOT_TAR
-
- if [ -d ${BUILDROOT_PATH}/${BUILDROOT_NAME} ] ; then
- pr_warn "Buildroot already installed to $BUILDROOT_PATH/$BUILDROOT_NAME"
- return 0;
- fi
-
- mkdir -p ${BUILDROOT_PATH}
-
- if [ ! -f $BUILDROOT_TAR ] ; then
- pr_info "download $BUILDROOT_VER now..."
- wget -c $BUILDROOT_DLADDR
- fi
-
- pr_info "install $BUILDROOT_VER to $BUILDROOT_PATH/$BUILDROOT_NAME now..."
- tar -xjf ${BUILDROOT_TAR} -C ${BUILDROOT_PATH}
-
- $BUILDROOT_PATH/$BUILDROOT_NAME/bin/arm-linux-gcc -v
-
- pr_info "Cross compiler: $BUILDROOT_PATH/$BUILDROOT_NAME/bin/arm-linux-"
-
- rm -f ${BUILDROOT_TAR}
}
# NXP document suggest cross compiler from ARM Developer:
# https://developer.arm.com/downloads/-/arm-gnu-toolchain-downloads
function install_crosstool()
{
- ARMTOOL_VER=11.2-2022.02
+ ARMTOOL_VER=10.3-2021.07
ARMTOOL_NAME=gcc-arm-$ARMTOOL_VER
ARMTOOL_PACK=${ARMTOOL_NAME}-`uname -p`-arm-none-linux-gnueabihf
- ARMTOOL_URL=https://developer.arm.com/-/media/Files/downloads/gnu/$ARMTOOL_VER/binrel/
+ ARMTOOL_URL=https://developer.arm.com/-/media/Files/downloads/gnu-a/$ARMTOOL_VER/binrel/
if [ -d /opt/$ARMTOOL_NAME ] ; then
pr_info "$ARMTOOL_NAME crosstool already installed, skip it"
@@ -142,6 +107,4 @@
install_devtools
install_crosstool
-
-#install_buildroot
--
Gitblit v1.9.1