Skip to content

Commit 675c6f6

Browse files
committed
Merge branch 'zhangtao' into 'dev'
add other hdmi resolution See merge request maix_sw/k230_linux_sdk!138
2 parents a490ea5 + 9ecd906 commit 675c6f6

11 files changed

Lines changed: 102 additions & 113 deletions

File tree

buildroot-overlay/configs/BPI-CanMV-K230D-Zero_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="bananapi-canmv-k230d-zero $(LINUX_DIR)"
2121
BR2_LINUX_KERNEL=y
2222
BR2_LINUX_KERNEL_CUSTOM_GIT=y
2323
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/ruyisdk/linux-xuantie-kernel.git"
24-
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="f050fc62876ad7b8ec66d974bb1c17a0eff30005"
24+
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="ae4a7e6518cd46407be9b648828b6f704d7dc302"
2525
BR2_LINUX_KERNEL_DEFCONFIG="k230"
2626
BR2_LINUX_KERNEL_DTS_SUPPORT=y
2727
BR2_LINUX_KERNEL_INTREE_DTS_NAME="canaan/bananapi-canmv-k230d-zero"

buildroot-overlay/configs/BPI-CanMV-K230D-Zero_ilp32_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="k230d-canmv $(LINUX_DIR)"
2424
BR2_LINUX_KERNEL=y
2525
BR2_LINUX_KERNEL_CUSTOM_GIT=y
2626
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/ruyisdk/linux-xuantie-kernel.git"
27-
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="f050fc62876ad7b8ec66d974bb1c17a0eff30005"
27+
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="ae4a7e6518cd46407be9b648828b6f704d7dc302"
2828
BR2_LINUX_KERNEL_DEFCONFIG="k230"
2929
BR2_LINUX_KERNEL_DTS_SUPPORT=y
3030
BR2_LINUX_KERNEL_INTREE_DTS_NAME="canaan/bananapi-canmv-k230d-zero.dts"

buildroot-overlay/configs/k230_canmv_01studio_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="k230-canmv-01studio $(LINUX_DIR)"
2121
BR2_LINUX_KERNEL=y
2222
BR2_LINUX_KERNEL_CUSTOM_GIT=y
2323
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/ruyisdk/linux-xuantie-kernel.git"
24-
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="f050fc62876ad7b8ec66d974bb1c17a0eff30005"
24+
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="ae4a7e6518cd46407be9b648828b6f704d7dc302"
2525
BR2_LINUX_KERNEL_DEFCONFIG="k230"
2626
BR2_LINUX_KERNEL_DTS_SUPPORT=y
2727
BR2_LINUX_KERNEL_INTREE_DTS_NAME="canaan/k230-canmv-01studio"

buildroot-overlay/configs/k230_canmv_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="k230-canmv $(LINUX_DIR)"
2222
BR2_LINUX_KERNEL=y
2323
BR2_LINUX_KERNEL_CUSTOM_GIT=y
2424
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/ruyisdk/linux-xuantie-kernel.git"
25-
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="f050fc62876ad7b8ec66d974bb1c17a0eff30005"
25+
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="ae4a7e6518cd46407be9b648828b6f704d7dc302"
2626
BR2_LINUX_KERNEL_DEFCONFIG="k230"
2727
BR2_LINUX_KERNEL_DTS_SUPPORT=y
2828
BR2_LINUX_KERNEL_INTREE_DTS_NAME="canaan/k230-canmv"

buildroot-overlay/configs/k230_evb_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="k230-evb $(LINUX_DIR)"
2121
BR2_LINUX_KERNEL=y
2222
BR2_LINUX_KERNEL_CUSTOM_GIT=y
2323
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/ruyisdk/linux-xuantie-kernel.git"
24-
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="f050fc62876ad7b8ec66d974bb1c17a0eff30005"
24+
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="ae4a7e6518cd46407be9b648828b6f704d7dc302"
2525
BR2_LINUX_KERNEL_DEFCONFIG="k230"
2626
BR2_LINUX_KERNEL_DTS_SUPPORT=y
2727
BR2_LINUX_KERNEL_INTREE_DTS_NAME="canaan/k230-evb"

buildroot-overlay/configs/k230d_canmv_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="k230d-canmv $(LINUX_DIR)"
2121
BR2_LINUX_KERNEL=y
2222
BR2_LINUX_KERNEL_CUSTOM_GIT=y
2323
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/ruyisdk/linux-xuantie-kernel.git"
24-
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="f050fc62876ad7b8ec66d974bb1c17a0eff30005"
24+
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="ae4a7e6518cd46407be9b648828b6f704d7dc302"
2525
BR2_LINUX_KERNEL_DEFCONFIG="k230"
2626
BR2_LINUX_KERNEL_DTS_SUPPORT=y
2727
BR2_LINUX_KERNEL_INTREE_DTS_NAME="canaan/k230d-canmv"

buildroot-overlay/configs/k230d_canmv_ilp32_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="k230d-canmv $(LINUX_DIR)"
2424
BR2_LINUX_KERNEL=y
2525
BR2_LINUX_KERNEL_CUSTOM_GIT=y
2626
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/ruyisdk/linux-xuantie-kernel.git"
27-
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="f050fc62876ad7b8ec66d974bb1c17a0eff30005"
27+
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="ae4a7e6518cd46407be9b648828b6f704d7dc302"
2828
BR2_LINUX_KERNEL_DEFCONFIG="k230"
2929
BR2_LINUX_KERNEL_DTS_SUPPORT=y
3030
BR2_LINUX_KERNEL_INTREE_DTS_NAME="canaan/k230d-canmv"

0 commit comments

Comments
 (0)