Merge remote-tracking branch 'origin/v6.1' into v6.5

This commit is contained in:
Hin-Tak Leung 2024-01-10 15:54:35 +00:00
commit c693d203d9
2 changed files with 7 additions and 5 deletions

View file

@ -181,6 +181,7 @@ grep -q "^snd-soc-wm8960$" /etc/modules || \
#set dtoverlays #set dtoverlays
CONFIG=/boot/config.txt CONFIG=/boot/config.txt
[ -f /boot/firmware/config.txt ] && CONFIG=/boot/firmware/config.txt
[ -f /boot/firmware/usercfg.txt ] && CONFIG=/boot/firmware/usercfg.txt [ -f /boot/firmware/usercfg.txt ] && CONFIG=/boot/firmware/usercfg.txt
sed -i -e 's:#dtparam=i2c_arm=on:dtparam=i2c_arm=on:g' $CONFIG || true sed -i -e 's:#dtparam=i2c_arm=on:dtparam=i2c_arm=on:g' $CONFIG || true

View file

@ -14,6 +14,7 @@ fi
uname_r=$(uname -r) uname_r=$(uname -r)
CONFIG=/boot/config.txt CONFIG=/boot/config.txt
[ -f /boot/firmware/config.txt ] && CONFIG=/boot/firmware/config.txt
[ -f /boot/firmware/usercfg.txt ] && CONFIG=/boot/firmware/usercfg.txt [ -f /boot/firmware/usercfg.txt ] && CONFIG=/boot/firmware/usercfg.txt
get_overlay() { get_overlay() {