Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion config/kernel/linux-tqma-current.config
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,6 @@ CONFIG_I2C_CHARDEV=y
CONFIG_I2C_MUX=y
CONFIG_I2C_MUX_PCA954x=y
CONFIG_I2C_CADENCE=m
CONFIG_I2C_DESIGNWARE_PLATFORM=y
CONFIG_I2C_GPIO=m
CONFIG_I2C_IMX=y
CONFIG_I2C_IMX_LPI2C=y
Expand Down
2 changes: 1 addition & 1 deletion config/sources/families/include/imx8_common.inc
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ case $BOARD in
case $BRANCH in

current) # mainline stable kernel
KERNEL_MAJOR_MINOR="6.11"
KERNEL_MAJOR_MINOR="6.12"
;;

edge | default) # use for tests with recent mainline kernels
Expand Down
2 changes: 1 addition & 1 deletion lib/functions/general/bat-cat.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

function run_tool_batcat() {
# Default version
BATCAT_VERSION=${BATCAT_VERSION:-0.24.0} # https://github.com/sharkdp/bat/releases
BATCAT_VERSION=${BATCAT_VERSION:-0.25.0} # https://github.com/sharkdp/bat/releases

declare non_cache_dir="/armbian-tools/batcat" # To deploy/reuse cached batcat in a Docker image.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freesc
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/freescale/Makefile
+++ b/arch/arm64/boot/dts/freescale/Makefile
@@ -198,8 +198,10 @@ dtb-$(CONFIG_ARCH_MXC) += imx8mp-evk-mx8-dlvds-lcd1.dtb
@@ -201,8 +201,10 @@ dtb-$(CONFIG_ARCH_MXC) += imx8mp-evk-mx8-dlvds-lcd1.dtb

imx8mp-tqma8mpql-mba8mpxl-lvds-dtbs += imx8mp-tqma8mpql-mba8mpxl.dtb imx8mp-tqma8mpql-mba8mpxl-lvds.dtbo
imx8mp-tqma8mpql-mba8mpxl-lvds-g133han01-dtbs += imx8mp-tqma8mpql-mba8mpxl.dtb imx8mp-tqma8mpql-mba8mpxl-lvds-g133han01.dtbo
Expand Down