mirror of
https://github.com/sipeed/LicheeRV-Nano-Build.git
synced 2026-11-09 18:04:55 -06:00
Merge branch 'sipeed:main' into main
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
<physical_partition type="sd">
|
||||
<partition label="BOOT" size_in_kb="80960" readonly="false" file="boot.sd"/>
|
||||
<partition label="ROOTFS" size_in_kb="1048576" readonly="false" file="rootfs.sd" />
|
||||
<partition label="ROOTFS" size_in_kb="1126400" readonly="false" file="rootfs.sd" />
|
||||
</physical_partition>
|
||||
|
||||
@@ -4,7 +4,7 @@ if [ "$1" = "start" ]
|
||||
then
|
||||
. /etc/profile
|
||||
panel_value=$(grep '^panel=' /boot/uEnv.txt | cut -d '=' -f 2)
|
||||
if [ "$panel_value" = "MaixCam_Pro" ]
|
||||
if [ "$panel_value" = "st7701_lct024bsi20" ]
|
||||
then
|
||||
echo "load cst7xx touchscreen driver"
|
||||
insmod /mnt/system/ko/hynitron_touch_new.ko
|
||||
|
||||
@@ -393,7 +393,7 @@ BR2_PACKAGE_AXP2101=y
|
||||
|
||||
BR2_TARGET_ROOTFS_EXT2=y
|
||||
BR2_TARGET_ROOTFS_EXT2_4=y
|
||||
BR2_TARGET_ROOTFS_EXT2_SIZE="900M"
|
||||
BR2_TARGET_ROOTFS_EXT2_SIZE="1100M"
|
||||
|
||||
BR2_ROOTFS_OVERLAY="$(TOPDIR)/board/cvitek/SG200X/overlay"
|
||||
BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="$(TOPDIR)/board/cvitek/SG200X/busybox-extra.config"
|
||||
|
||||
@@ -601,7 +601,7 @@ BR2_PACKAGE_AXP2101=y
|
||||
|
||||
BR2_TARGET_ROOTFS_EXT2=y
|
||||
BR2_TARGET_ROOTFS_EXT2_4=y
|
||||
BR2_TARGET_ROOTFS_EXT2_SIZE="900M"
|
||||
BR2_TARGET_ROOTFS_EXT2_SIZE="1100M"
|
||||
|
||||
BR2_ROOTFS_OVERLAY="$(TOPDIR)/board/cvitek/SG200X/overlay"
|
||||
BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="$(TOPDIR)/board/cvitek/SG200X/busybox-extra.config"
|
||||
|
||||
@@ -2969,6 +2969,15 @@ static const struct usb_device_id uvc_ids[] = {
|
||||
.bInterfaceSubClass = 1,
|
||||
.bInterfaceProtocol = 0,
|
||||
.driver_info = UVC_INFO_META(V4L2_META_FMT_D4XX) },
|
||||
/* HikCamera */
|
||||
{ .match_flags = USB_DEVICE_ID_MATCH_DEVICE
|
||||
| USB_DEVICE_ID_MATCH_INT_INFO,
|
||||
.idVendor = 0x2bdf,
|
||||
.idProduct = 0x0102,
|
||||
.bInterfaceClass = USB_CLASS_VIDEO,
|
||||
.bInterfaceSubClass = 1,
|
||||
.bInterfaceProtocol = 0,
|
||||
.driver_info = (kernel_ulong_t)&uvc_quirk_probe_minmax },
|
||||
/* Generic USB Video Class */
|
||||
{ USB_INTERFACE_INFO(USB_CLASS_VIDEO, 1, UVC_PC_PROTOCOL_UNDEFINED) },
|
||||
{ USB_INTERFACE_INFO(USB_CLASS_VIDEO, 1, UVC_PC_PROTOCOL_15) },
|
||||
|
||||
@@ -225,7 +225,7 @@ static int do_startvo(struct cmd_tbl *cmdtp, int flag, int argc, char * const ar
|
||||
panel_desc.hs_timing_cfg = &hs_timing_cfg_st7701_480x854;
|
||||
panel_desc.dsi_init_cmds = dsi_init_cmds_st7701_480x854;
|
||||
panel_desc.dsi_init_cmds_size = ARRAY_SIZE(dsi_init_cmds_st7701_480x854);
|
||||
} else if (strcmp(panel_name,"MaixCam_Pro") == 0) { // 2.4 inch // g
|
||||
} else if (strcmp(panel_name,"st7701_lct024bsi20") == 0) { // 2.4 inch // g
|
||||
panel_desc.panel_name = "D240SI31";
|
||||
panel_desc.dev_cfg = &dev_cfg_d240si31;
|
||||
panel_desc.hs_timing_cfg = &hs_timing_cfg_d240si31; // g
|
||||
|
||||
Reference in New Issue
Block a user