Skip to content

Commit

Permalink
Merge branch 'sophgo' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@carbonfix
carbonfix committed Nov 29, 2024
2 parents edb9ca4 + 9002c9c commit 8226092
Show file tree
Hide file tree
Showing 2,487 changed files with 334,188 additions and 10,359 deletions.
30 changes: 15 additions & 15 deletions .version/version.md
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@

| Package | PATH | URL | Branch | Commit |
|:---------------------------|:------------------------------------|:---------------------------------------------------------|:--------------|:-------------|
| root dir | | https://github.com/sophgo/sophpi.git | sg200x-evb | 8f92b59 |
| build | build | https://github.com/sophgo/build.git | sg200x-dev | bbf2cf1 |
| fsbl | fsbl | https://github.com/sophgo/fsbl.git | sg200x-dev | c42e7f6 |
| opensbi | opensbi | https://github.com/sophgo/opensbi.git | sg200x-dev | ab9b8f8 |
| u-boot-2021.10 | u-boot-2021.10 | https://github.com/sophgo/u-boot-2021.10.git | sg200x-dev | 433b269a04 |
| linux_5.10 | linux_5.10 | https://github.com/sophgo/linux_5.10.git | sg200x-dev | 479119bd153b |
| root dir | | https://github.com/sophgo/sophpi.git | sg200x-evb | d9fca89 |
| build | build | https://github.com/sophgo/build.git | sg200x-dev | b901d17 |
| fsbl | fsbl | https://github.com/sophgo/fsbl.git | sg200x-dev | 2039113 |
| opensbi | opensbi | https://github.com/sophgo/opensbi.git | sg200x-dev | fffb475 |
| u-boot-2021.10 | u-boot-2021.10 | https://github.com/sophgo/u-boot-2021.10.git | sg200x-dev | b70d08ad8d |
| linux_5.10 | linux_5.10 | https://github.com/sophgo/linux_5.10.git | sg200x-dev | 6fe963974e5d |
| ramdisk | ramdisk | https://github.com/sophgo/ramdisk.git | sg200x-dev | 8bf2a74 |
| cvi_mpi | cvi_mpi | https://github.com/sophgo/cvi_mpi.git | sg200x-dev | 47cfe1b |
| SensorSupportList | cvi_mpi/component/isp | https://github.com/sophgo/SensorSupportList.git | sg200x-dev | 7e900fc |
| cvi_mpi | cvi_mpi | https://github.com/sophgo/cvi_mpi.git | sg200x-dev | 8c594a0 |
| SensorSupportList | cvi_mpi/component/isp | https://github.com/sophgo/SensorSupportList.git | sg200x-dev | 257c696 |
| isp_tuning | isp_tuning | https://github.com/sophgo/isp_tuning.git | sg200x-dev | 96731d1 |
| osdrv | osdrv | https://github.com/sophgo/osdrv.git | sg200x-dev | 38e84f3 |
| osdrv | osdrv | https://github.com/sophgo/osdrv.git | sg200x-dev | d8c0b2b |
| oss | oss | https://github.com/sophgo/oss.git | master | a9d88d3 |
| freertos | freertos | https://github.com/sophgo/freertos.git | sg200x-dev | eb9faf5fe |
| FreeRTOS-Kernel | freertos/Source | https://github.com/sophgo/FreeRTOS-Kernel.git | sg200x-dev | d52c1b6e6 |
| Lab-Project-FreeRTOS-POSIX | freertos/Source/FreeRTOS-Plus-POSIX | https://github.com/sophgo/Lab-Project-FreeRTOS-POSIX.git | sg200x-dev | 5042bfd |
| cvibuilder | cvibuilder | https://github.com/sophgo/cvibuilder.git | sg200x-dev | 4309f2a |
| cvikernel | cvikernel | https://github.com/sophgo/cvikernel.git | sg200x-dev | 9f1f57a |
| cviruntime | cviruntime | https://github.com/sophgo/cviruntime.git | sg200x-dev | 3f49386 |
| cvibuilder | cvibuilder | https://github.com/sophgo/cvibuilder.git | sg200x-dev | a300905 |
| cvikernel | cvikernel | https://github.com/sophgo/cvikernel.git | sg200x-dev | 0b37e46 |
| cviruntime | cviruntime | https://github.com/sophgo/cviruntime.git | sg200x-dev | ef80449 |
| cvimath | cvimath | https://github.com/sophgo/cvimath.git | sg200x-dev | ce8705f |
| cnpy | cnpy | https://github.com/sophgo/cnpy.git | tpu | 2f56f4c |
| flatbuffers | flatbuffers | https://github.com/sophgo/flatbuffers.git | master | 6da1cf7 |
| buildroot-2021.05 | buildroot-2021.05 | https://github.com/sophgo/buildroot-2021.05.git | sg200x-dev | 5b7acd1b |
| ive | ive | https://github.com/sophgo/ive.git | master | 87cf68f |
| cvi_rtsp | cvi_rtsp | https://github.com/sophgo/cvi_rtsp.git | master | 3ef7aca |
| tdl_sdk | tdl_sdk | https://github.com/sophgo/tdl_sdk.git | master | 2e43b6e6 |
| ive | ive | https://github.com/sophgo/ive.git | master | 269c9d0 |
| cvi_rtsp | cvi_rtsp | https://github.com/sophgo/cvi_rtsp.git | master | 6d4a2fe |
| tdl_sdk | tdl_sdk | https://github.com/sophgo/tdl_sdk.git | master | 8a044e27 |
8 changes: 5 additions & 3 deletions build/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -473,11 +473,13 @@ config KERNEL_COMPRESS
help
Set kernel source code.

config KERNEL_SUSPEND
bool "Enable RISCV Kernel Suspend"
config SUSPEND
bool "Suspend to RAM and standby"
default n
help
Enable kernel power management to support STR
Allow the system to enter sleep states in which main memory is
powered and thus its contents are preserved, such as the
suspend-to-RAM state (e.g. the ACPI S3 state).
endmenu

menu "ROOTFS options"
Expand Down
2 changes: 1 addition & 1 deletion build/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ kernel-setconfig: ${KERNEL_OUTPUT_CONFIG_PATH}
kernel-build: ${KERNEL_OUTPUT_CONFIG_PATH}
$(call print_target)
${Q}echo LOCALVERSION=${LOCALVERSION}
ifneq (${CONFIG_KERNEL_SUSPEND},y)
ifneq (${CONFIG_SUSPEND},y)
${Q}$(MAKE) -j${NPROC} -C ${KERNEL_PATH} O=${KERNEL_PATH}/${KERNEL_OUTPUT_FOLDER} setconfig 'SCRIPT_ARG="SUSPEND=n"'
${Q}$(MAKE) -j${NPROC} -C ${KERNEL_PATH} O=${KERNEL_PATH}/${KERNEL_OUTPUT_FOLDER} savedefconfig
endif
Expand Down
2 changes: 1 addition & 1 deletion build/boards/chip_list.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"cv181x": {
"cv181x": ["cv181x", "cv1811h", "cv1811c", "cv1810c", "cv1810h", "cv1810ha", "cv1812cp", "cv1812cpa", "cv1810ca", "cv1812h", "cv1813h", "cv1812ha", "sg2000", "sg2002"]
"cv181x": ["cv181x", "cv1811h", "cv1811c", "cv1811ca","cv1810c", "cv1810h", "cv1810ha", "cv1812cp", "cv1812cpa", "cv1810ca", "cv1812h", "cv1813h", "cv1812ha", "cv1812ha", "sg2000", "sg2002"]
},

"cv180x": {
Expand Down
2 changes: 1 addition & 1 deletion build/boards/cv181x/cv1811c_wevb_0006a_emmc/cv1811c_wevb_0006a_emmc_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ CONFIG_CHIP_cv1811c=y
CONFIG_BOARD_wevb_0006a_emmc=y
CONFIG_DDR_CFG_ddr3_1866_x16=y
CONFIG_ARCH="riscv"
CONFIG_CROSS_COMPILE="riscv64-unknown-linux-gnu-"
CONFIG_CROSS_COMPILE="riscv64-unknown-linux-musl-"
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_KERNEL_ENTRY_HACK=y
CONFIG_KERNEL_ENTRY_HACK_ADDR="0x80200000"
Expand Down
1 change: 1 addition & 0 deletions build/boards/cv181x/cv1811c_wevb_0006a_spinor/cv1811c_wevb_0006a_spinor_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ CONFIG_SENSOR_SONY_IMX327_2L=y
CONFIG_SENSOR_SONY_IMX327_SLAVE=y
CONFIG_SENSOR_OV_OS04C10=y
CONFIG_SENSOR_OV_OS04A10=y
CONFIG_SENSOR_GCORE_GC2053=y
CONFIG_UBOOT_2021_10=y
CONFIG_KERNEL_SRC_5.10=y
CONFIG_KERNEL_LZMA=y
Expand Down
9 changes: 9 additions & 0 deletions build/boards/cv181x/cv1811ca_wevb_0006a_spinand/config.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"ddr_cfg_list": [
"",
"ddr3_1866_x16",
"ddr3_2133_x16",
"ddr_auto_x16"
],
"board_information": "CA53 + SPINAND + BGA SIP 128MB"
}
50 changes: 50 additions & 0 deletions build/boards/cv181x/cv1811ca_wevb_0006a_spinand/cv1811ca_wevb_0006a_spinand_defconfig
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
CONFIG_CHIP_cv1811ca=y
CONFIG_BOARD_wevb_0006a_spinand=y
CONFIG_DDR_CFG_ddr3_1866_x16=y
CONFIG_ARCH="arm64"
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_CROSS_COMPILE_KERNEL="aarch64-linux-gnu-"
CONFIG_KERNEL_ENTRY_HACK=y
CONFIG_KERNEL_ENTRY_HACK_ADDR="0x80200000"
CONFIG_TOOLCHAIN_GLIBC_ARM64=y
CONFIG_FLASH_SIZE_SHRINK=y
CONFIG_NO_FB=y
CONFIG_NO_TP=y
CONFIG_BOOT_IMAGE_SINGLE_DTB=y
CONFIG_STORAGE_TYPE_spinand=y


CONFIG_SENSOR_GCORE_GC4653=y
CONFIG_SENSOR_SMS_SC3335=y
CONFIG_SENSOR_SMS_SC500AI=y
CONFIG_SENSOR_SONY_IMX307=y
CONFIG_SENSOR_SONY_IMX307_2L=y
CONFIG_SENSOR_SONY_IMX307_SLAVE=y
CONFIG_SENSOR_SONY_IMX327=y
CONFIG_SENSOR_SONY_IMX327_2L=y
CONFIG_SENSOR_SONY_IMX327_SLAVE=y
CONFIG_SENSOR_OV_OS04C10=y
CONFIG_SENSOR_OV_OS04A10=y
CONFIG_SENSOR_GCORE_GC2053=y
CONFIG_UBOOT_2021_10=y
CONFIG_KERNEL_SRC_5.10=y
CONFIG_KERNEL_LZMA=y
CONFIG_SKIP_RAMDISK=y
CONFIG_USE_4K_ERASE_SIZE_FOR_JFFS2=y
CONFIG_SENSOR_TUNING_PARAM_cv181x_src_gcore_gc4653=y
# CONFIG_ROOTFS_OVERLAYFS is not set
# CONFIG_TARGET_PACKAGE_CVITRACER is not set
# CONFIG_TARGET_PACKAGE_GDBSERVER is not set
# CONFIG_TARGET_PACKAGE_LIBCRYPTO is not set
# CONFIG_TARGET_PACKAGE_LIBZ is not set
# CONFIG_TARGET_PACKAGE_OTASERVER is not set
# CONFIG_TARGET_PACKAGE_RSYSLOG is not set
CONFIG_TARGET_PACKAGE_CRONTABS=y
# CONFIG_TARGET_PACKAGE_GATORD is not set
CONFIG_TARGET_PACKAGE_DROPBEAR=y
CONFIG_TARGET_PACKAGE_WIFI=y
CONFIG_TARGET_PACKAGE_NTP=y
CONFIG_ENABLE_FREERTOS=y
CONFIG_ENABLE_RTOS_DUMP_PRINT=y
CONFIG_DUMP_PRINT_SZ_IDX=17
CONFIG_UBOOT_SPL_CUSTOM=n
16 changes: 16 additions & 0 deletions build/boards/cv181x/cv1811ca_wevb_0006a_spinand/dts_arm/cv1811ca_wevb_0006a_spinand.dts
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
/dts-v1/;
#include "cv181x_base_arm.dtsi"
#include "cv181x_asic_qfn.dtsi"
#include "cv181x_asic_spinand.dtsi"
#include "cv181x_default_memmap.dtsi"

/*
&mipi_rx{
snsr-reset = <&portc 13 GPIO_ACTIVE_LOW>, <&portc 13 GPIO_ACTIVE_LOW>, <&portc 13 GPIO_ACTIVE_LOW>;
};
*/

/ {

};

16 changes: 16 additions & 0 deletions build/boards/cv181x/cv1811ca_wevb_0006a_spinand/dts_arm64/cv1811ca_wevb_0006a_spinand.dts
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
/dts-v1/;
#include "cv181x_base_arm.dtsi"
#include "cv181x_asic_qfn.dtsi"
#include "cv181x_asic_spinand.dtsi"
#include "cv181x_default_memmap.dtsi"

/*
&mipi_rx{
snsr-reset = <&portc 13 GPIO_ACTIVE_LOW>, <&portc 13 GPIO_ACTIVE_LOW>, <&portc 13 GPIO_ACTIVE_LOW>;
};
*/

/ {

};

Loading

0 comments on commit 8226092

Please sign in to comment.