Skip to content

Commit

Permalink
Merge branch 'zhangtao' into 'dev'
Browse files Browse the repository at this point in the history 
add other hdmi resolution

See merge request maix_sw/k230_linux_sdk!138
  • Loading branch information
@zzxcanaan
zzxcanaan committed Nov 26, 2024
2 parents a490ea5 + 9ecd906 commit 675c6f6
Show file tree
Hide file tree
Showing 11 changed files with 102 additions and 113 deletions.
2 changes: 1 addition & 1 deletion buildroot-overlay/configs/BPI-CanMV-K230D-Zero_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="bananapi-canmv-k230d-zero $(LINUX_DIR)"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_GIT=y
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/ruyisdk/linux-xuantie-kernel.git"
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="f050fc62876ad7b8ec66d974bb1c17a0eff30005"
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="ae4a7e6518cd46407be9b648828b6f704d7dc302"
BR2_LINUX_KERNEL_DEFCONFIG="k230"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="canaan/bananapi-canmv-k230d-zero"
Expand Down
2 changes: 1 addition & 1 deletion buildroot-overlay/configs/BPI-CanMV-K230D-Zero_ilp32_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="k230d-canmv $(LINUX_DIR)"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_GIT=y
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/ruyisdk/linux-xuantie-kernel.git"
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="f050fc62876ad7b8ec66d974bb1c17a0eff30005"
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="ae4a7e6518cd46407be9b648828b6f704d7dc302"
BR2_LINUX_KERNEL_DEFCONFIG="k230"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="canaan/bananapi-canmv-k230d-zero.dts"
Expand Down
2 changes: 1 addition & 1 deletion buildroot-overlay/configs/k230_canmv_01studio_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="k230-canmv-01studio $(LINUX_DIR)"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_GIT=y
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/ruyisdk/linux-xuantie-kernel.git"
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="f050fc62876ad7b8ec66d974bb1c17a0eff30005"
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="ae4a7e6518cd46407be9b648828b6f704d7dc302"
BR2_LINUX_KERNEL_DEFCONFIG="k230"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="canaan/k230-canmv-01studio"
Expand Down
2 changes: 1 addition & 1 deletion buildroot-overlay/configs/k230_canmv_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="k230-canmv $(LINUX_DIR)"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_GIT=y
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/ruyisdk/linux-xuantie-kernel.git"
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="f050fc62876ad7b8ec66d974bb1c17a0eff30005"
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="ae4a7e6518cd46407be9b648828b6f704d7dc302"
BR2_LINUX_KERNEL_DEFCONFIG="k230"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="canaan/k230-canmv"
Expand Down
2 changes: 1 addition & 1 deletion buildroot-overlay/configs/k230_evb_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="k230-evb $(LINUX_DIR)"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_GIT=y
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/ruyisdk/linux-xuantie-kernel.git"
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="f050fc62876ad7b8ec66d974bb1c17a0eff30005"
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="ae4a7e6518cd46407be9b648828b6f704d7dc302"
BR2_LINUX_KERNEL_DEFCONFIG="k230"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="canaan/k230-evb"
Expand Down
2 changes: 1 addition & 1 deletion buildroot-overlay/configs/k230d_canmv_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="k230d-canmv $(LINUX_DIR)"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_GIT=y
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/ruyisdk/linux-xuantie-kernel.git"
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="f050fc62876ad7b8ec66d974bb1c17a0eff30005"
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="ae4a7e6518cd46407be9b648828b6f704d7dc302"
BR2_LINUX_KERNEL_DEFCONFIG="k230"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="canaan/k230d-canmv"
Expand Down
2 changes: 1 addition & 1 deletion buildroot-overlay/configs/k230d_canmv_ilp32_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="k230d-canmv $(LINUX_DIR)"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_GIT=y
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/ruyisdk/linux-xuantie-kernel.git"
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="f050fc62876ad7b8ec66d974bb1c17a0eff30005"
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="ae4a7e6518cd46407be9b648828b6f704d7dc302"
BR2_LINUX_KERNEL_DEFCONFIG="k230"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="canaan/k230d-canmv"
Expand Down
Loading

0 comments on commit 675c6f6

Please sign in to comment.