From c2ea48715092c8e4977ecd63f340283372d01aac Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Wed, 26 Jul 2023 14:39:29 +0800
Subject: [PATCH] Update config.txt and pinctrl path

---
 /dev/null                             |   30 ------------------------------
 images/build.sh                       |   14 +++++++-------
 images/files/config-igkboard-6ull.txt |   14 +++++++-------
 images/files/pinctrl-igkboard-6ull    |    0 
 4 files changed, 14 insertions(+), 44 deletions(-)

diff --git a/images/build.sh b/images/build.sh
index d448f0f..5f8488d 100755
--- a/images/build.sh
+++ b/images/build.sh
@@ -189,7 +189,7 @@
     cp -rf $KERNEL_BINPATH/zImage       ${MNT_POINT}/
     cp -rf $KERNEL_BINPATH/${BOARD}.dtb ${MNT_POINT}/
     cp -rf $KERNEL_BINPATH/overlays/    ${MNT_POINT}/
-    cp -rf files/config*.txt            ${MNT_POINT}/
+    cp -rf files/config-${BOARD}.txt    ${MNT_POINT}/config.txt
     sync && umount ${MNT_POINT}
 
     pr_info "update drivers in root filesystem"
@@ -200,12 +200,12 @@
     pr_info "start install root filesystem"
     mount -t ext4 /dev/mapper/${LOOP_DEV}p2 ${MNT_POINT}
     cp -af $ROOTFS/*                    ${MNT_POINT}
-    cp -rf files/pinctrl                ${MNT_POINT}/usr/bin/
-    cp -rf files/pinloop                ${MNT_POINT}/usr/bin/
-    cp -rf files/expand_rootfs          ${MNT_POINT}/usr/bin/
-    chmod +x ${MNT_POINT}/usr/bin/pinctrl
-    chmod +x ${MNT_POINT}/usr/bin/pinloop
-    chmod +x ${MNT_POINT}/usr/bin/expand_rootfs
+    cp -rf files/pinctrl-${BOARD}       ${MNT_POINT}/usr/sbin/pinctrl
+    cp -rf files/pinloop                ${MNT_POINT}/usr/sbin/
+    cp -rf files/expand_rootfs          ${MNT_POINT}/usr/sbin/
+    chmod +x ${MNT_POINT}/usr/sbin/pinctrl
+    chmod +x ${MNT_POINT}/usr/sbin/pinloop
+    chmod +x ${MNT_POINT}/usr/sbin/expand_rootfs
     sync && umount ${MNT_POINT}
 
     pr_warn "Build $DISTRO-$DISVER system image down"
diff --git a/images/files/config-nolcd.txt b/images/files/config-igkboard-6ull.txt
similarity index 74%
rename from images/files/config-nolcd.txt
rename to images/files/config-igkboard-6ull.txt
index a17de28..d23b6fd 100644
--- a/images/files/config-nolcd.txt
+++ b/images/files/config-igkboard-6ull.txt
@@ -1,8 +1,8 @@
 # Enable LCD overlay
-#dtoverlay_lcd=no
+#dtoverlay_lcd=yes
 
 # Enable Camera overlay
-#dtoverlay_cam=no
+#dtoverlay_cam=yes
 
 # Eanble 1-Wire overlay
 #dtoverlay_w1=yes
@@ -11,19 +11,19 @@
 #dtoverlay_adc=yes
 
 # Enable I2C overlay
-dtoverlay_i2c=1
+#dtoverlay_i2c=1
 
 # Enable SPI overlay, SPI1 conflict with UART8(NB-IoT/4G module)
-dtoverlay_spi=1
+#dtoverlay_spi=1
 
 # Enable UART overlays
-dtoverlay_uart=2 3 4 7
+#dtoverlay_uart=2 3 4 7
 
 # Enable CAN overlays
-dtoverlay_can=1 2
+#dtoverlay_can=1 2
 
 # Enable PWM overlays, PWM8 conflict with UART8(NB-IoT/4G module)
-dtoverlay_pwm=7
+#dtoverlay_pwm=7
 
 # Enable extra overlays
 #dtoverlay_extra=nbiot-4g
diff --git a/images/files/config-lcd.txt b/images/files/config-lcd.txt
deleted file mode 100644
index 2237484..0000000
--- a/images/files/config-lcd.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-# Enable LCD overlay
-dtoverlay_lcd=yes
-
-# Enable Camera overlay
-dtoverlay_cam=yes
-
-# Eanble 1-Wire overlay
-#dtoverlay_w1=yes
-
-# Enable ADC overlay
-#dtoverlay_adc=yes
-
-# Enable I2C overlay
-dtoverlay_i2c=1
-
-# Enable SPI overlay, SPI1 conflict with UART8(NB-IoT/4G module)
-dtoverlay_spi=1
-
-# Enable UART overlays
-dtoverlay_uart=2 3 4 7
-
-# Enable CAN overlays
-dtoverlay_can=1 2
-
-# Enable PWM overlays, PWM8 conflict with UART8(NB-IoT/4G module)
-dtoverlay_pwm=7
-
-# Enable extra overlays
-#dtoverlay_extra=nbiot-4g
-
diff --git a/images/files/pinctrl b/images/files/pinctrl-igkboard-6ull
similarity index 100%
rename from images/files/pinctrl
rename to images/files/pinctrl-igkboard-6ull

--
Gitblit v1.9.1