From 10ce931950da38fe63e7023900d02134fe1fc772 Mon Sep 17 00:00:00 2001
From: Daniel Tartavel <contact@librepc.com>
Date: Fri, 12 Oct 2018 08:49:54 +0200
Subject: [PATCH] - suppressed raspberry pi fondation hardware ( only Mageia
 packages ) - added fsck.repair=1 in config.txt

---
 create_arm_img_urpmi.sh | 25 ++++++++++++++-----------
 rpi/config.txt          |  2 +-
 rpi/u-boot.config       | 11 -----------
 3 files changed, 15 insertions(+), 23 deletions(-)
 delete mode 100644 rpi/u-boot.config

diff --git a/create_arm_img_urpmi.sh b/create_arm_img_urpmi.sh
index 1377cb8..90f244a 100755
--- a/create_arm_img_urpmi.sh
+++ b/create_arm_img_urpmi.sh
@@ -380,6 +380,7 @@ function createrpiimage()
 	fi
 	formatpartitions $BOOTFS ext4
 	copyingsystem
+	
 }
 	
 createimage()
@@ -486,13 +487,14 @@ UUID=$ROOT_UUID  /               ext4    defaults        0       0" > "$BUILD_PA
 	
 	case $TARGET in
 		rpi)
-			info "copying raspberry firmware in /boot"
-			/bin/rsync -rlptDH "$FIRMWARE_PATH/firmware-stable/boot/" "$BOOT"
-			cp -a "$FIRMWARE_PATH/firmware-stable/extra/uname_string" "$BOOT"
-			cp -a "$FIRMWARE_PATH/firmware-stable/extra/uname_string7" "$BOOT"
-			info "copying config.txt"
+#			info "copying raspberry firmware in /boot"
+#			/bin/rsync -rlptDH "$FIRMWARE_PATH/firmware-stable/boot/" "$BOOT"
+#			cp -a "$FIRMWARE_PATH/firmware-stable/extra/uname_string" "$BOOT"
+#			cp -a "$FIRMWARE_PATH/firmware-stable/extra/uname_string7" "$BOOT"
+			info "copying config.txt, boot.cmd and 10-vchiq-permissions.rules"
 			cp "$SOURCE_PATH/$CONFIG_PATH/config.txt" "$BOOT"
-			info "adding modules in /etc/modules"
+			cp "$SOURCE_PATH/$CONFIG_PATH/boot.cmd" "$BOOT"
+			cp "$SOURCE_PATH/$CONFIG_PATH/10-vchiq-permissions.rules" "$BUILD_PATH/etc/udev/rules.d/""
 			echo "vchiq
 snd_bcm2835
 vc4
@@ -503,12 +505,12 @@ brcmfmac" >> "$BUILD_PATH"/etc/modules
 			chown root:root "$BUILD_PATH/etc/modprobe.conf"
 	
 			info "making /boot/cmdline.txt"
-			echo "dwc_otg.lpm_enable=0 console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 console=tty1 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait" > "$BOOT/cmdline.txt"
-			info "copying raspberry modules in /lib/modules"
-			/bin/rsync -rlptDH "$FIRMWARE_PATH/firmware-stable/modules/" "$BUILD_PATH/lib/modules/"
+			echo "dwc_otg.lpm_enable=0 console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 console=tty1 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait fsck.repair=1" > "$BOOT/cmdline.txt"
+#			info "copying raspberry modules in /lib/modules"
+#			/bin/rsync -rlptDH "$FIRMWARE_PATH/firmware-stable/modules/" "$BUILD_PATH/lib/modules/"
 
-			info "copying raspberry optionals files in opt"
-			/bin/rsync -rlptDH "$FIRMWARE_PATH/firmware-stable/opt/" "$BUILD_PATH/opt/"
+#			info "copying raspberry optionals files in opt"
+#			/bin/rsync -rlptDH "$FIRMWARE_PATH/firmware-stable/opt/" "$BUILD_PATH/opt/"
  
 			info "copying wifi firmware file missing in Mageia"
 			/bin/mkdir -p "$ROOT/usr/lib/firmware/brcm/"
@@ -523,6 +525,7 @@ brcmfmac" >> "$BUILD_PATH"/etc/modules
 				error "line $LINENO error copying tools"
 				ERRORN=$((ERRORN++))
 			fi
+			info "copying "
 			;;
 		xu3 | xu4)
 			;;
diff --git a/rpi/config.txt b/rpi/config.txt
index 235246c..a27b5de 100644
--- a/rpi/config.txt
+++ b/rpi/config.txt
@@ -1069,7 +1069,7 @@ arm_freq=900
 ##
 ##     Default off.
 ##
-#dtparam=audio=off
+dtparam=audio=on
 
 ## i2c_arm
 ##     Enable the ARM's i2c interface
diff --git a/rpi/u-boot.config b/rpi/u-boot.config
deleted file mode 100644
index b8ca6e7..0000000
--- a/rpi/u-boot.config
+++ /dev/null
@@ -1,11 +0,0 @@
-# swarren's branch already sets this automatically, so you can skip this
-# Mainline U-Boot will set the following automatically soon
-setenv fdtfile bcm2835-rpi-b.dtb
-
-mmc dev 0
-fatload mmc 0:1 ${kernel_addr_r} zImage
-# IMPORTANT NOTE: On mainline u-boot, the correct variable to use here is ${fdt_addr} and NOT ${fdt_addr_r}
-fatload mmc 0:1 ${fdt_addr_r} ${fdtfile}
-setenv bootargs earlyprintk console=tty0 console=ttyAMA0 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait noinitrd
-# IMPORTANT NOTE: On mainline u-boot, the correct variable to use here is ${fdt_addr} and NOT ${fdt_addr_r}
-bootz ${kernel_addr_r} - ${fdt_addr_r}