diff --git a/.oebuild/manifest.yaml b/.oebuild/manifest.yaml index 94bc2a7c6822cbb67161db6ccac897290bf1205c..129d20b20f5772d56efa6f93d5067821044fd2cd 100644 --- a/.oebuild/manifest.yaml +++ b/.oebuild/manifest.yaml @@ -27,12 +27,18 @@ manifest_list: HiEuler-driver: remote_url: https://gitee.com/HiEuler/hardware_driver.git version: 8aac83210ded782f908ecdc2a52dc8a386f6550d + HiEuler-driver-kernel-6.6: + remote_url: https://gitee.com/hieulerpi/HiEuler_PI_Peripherals_Driver.git + version: 2e94ccde53bed4c68ff0440b5baa4562e60f0138 + HiEuler-mpp-sample-kernel-6.6: + remote_url: https://gitee.com/hieulerpi/SS928V100_PEGASUS_MPP_Sample.git + version: 7df6374005a246467f0cb222e07e9798b00154cb HiEdge-driver: remote_url: https://gitee.com/HiEuler/hiedge_driver.git version: 0a87fac88ab30e0f5673a40440a9468fd1a97dae Hispark-ss928v100-gcc-sdk: remote_url: https://gitee.com/HiSpark/ss928v100_gcc.git - version: 460536dca14b9c91a16b20cea87cfeb712517a3f + version: 72807933fb21da5872add2e60193864f018f28de Jailhouse: remote_url: https://gitee.com/src-openeuler/Jailhouse.git version: 5fc52fe2d58fd3fd929d97d1f10dbf7b49cdb53e @@ -375,7 +381,7 @@ manifest_list: gdk-pixbuf: remote_url: https://gitee.com/src-openeuler/gdk-pixbuf2.git version: 937f760c19145e0f9e7e5be67b3b346e7684130e - genext2fs: + genext2fs: remote_url: https://gitee.com/src-oepkgs/genext2fs.git version: 4d50c496ec414f88ef7d96cecefdb3d8877f4cc4 geographic_info: @@ -992,7 +998,7 @@ manifest_list: version: 80744f17a0ec0300e9bc4e140c35120460a05a8a mcs: remote_url: https://gitee.com/openeuler/mcs.git - version: 1710c7d0de42e591513cfa0ab4de3de0ca8158a1 + version: 10f2b20e893ab516d1886a37482c6977ff35d9ba mcs-x86: remote_url: https://gitee.com/openeuler/mcs.git version: e1a51d29fb09c3fb35f1666fbe7138840e8f26f8 diff --git a/bsp/meta-hisilicon/recipes-bsp/ss928/files/0001-yocto-928-sdk-build-support.patch b/bsp/meta-hisilicon/recipes-bsp/ss928/files/0001-yocto-928-sdk-build-support.patch index 322b303db503450341fdd1467cf2af325b9d4eee..9709a8fe3c5df8f85ca0e771d1db5b39c760ddc8 100644 --- a/bsp/meta-hisilicon/recipes-bsp/ss928/files/0001-yocto-928-sdk-build-support.patch +++ b/bsp/meta-hisilicon/recipes-bsp/ss928/files/0001-yocto-928-sdk-build-support.patch @@ -22,7 +22,7 @@ index 7056005..0eb5388 100644 # CONFIG_KERNEL_AARCH64_V01C01_LINUX_MUSL is not set # CONFIG_KERNEL_AARCH64_LINUX_MUSL_LLVM1504 is not set export CONFIG_KERNEL_AARCH64_V01C01_LINUX=y --export CONFIG_OT_CROSS=aarch64-v01c01-linux-gnu- +-export CONFIG_OT_CROSS=aarch64-openeuler-linux-gnu- +export CONFIG_OT_CROSS=aarch64-openeuler-linux- export CONFIG_LIBC_TYPE=glibc export CONFIG_KERNEL_BIT=KERNEL_BIT_64 @@ -30,7 +30,7 @@ index 7056005..0eb5388 100644 export CONFIG_USER_AARCH64_V01C01_LINUX=y # CONFIG_USER_AARCH64_V01C01_LINUX_MUSL is not set # CONFIG_USER_AARCH64_LINUX_MUSL_LLVM1504 is not set --export CONFIG_OT_CROSS_LIB=aarch64-v01c01-linux-gnu- +-export CONFIG_OT_CROSS_LIB=aarch64-openeuler-linux-gnu- +export CONFIG_OT_CROSS_LIB=aarch64-openeuler-linux- export CONFIG_USER_BIT=USER_BIT_64 export CONFIG_LINUX_STYLE=y @@ -442,6 +442,19 @@ index 0000000..937f774 + SDK_exit(); + return 0; +} +diff --git a/smp/a55_linux/mpp/Makefile.linux.param b/smp/a55_linux/mpp/Makefile.linux.param +index f00f096..de8332d 100644 +--- a/smp/a55_linux/mpp/Makefile.linux.param ++++ b/smp/a55_linux/mpp/Makefile.linux.param +@@ -40,7 +40,7 @@ else + export LLVM_KERNEL_TOOLCHAIN_ARGS:=KBUILD_MODPOST_WARN=1 + GCC_DIR := $(shell dirname $$(which $(CC))) + GCC_VER := $(shell $(CC) -v 2>&1 | awk '/gcc version/ {print $$3}') +-MPP_CFLAGS += -isystem $(GCC_DIR)/../lib64/gcc/aarch64-openeuler-linux-gnu/$(GCC_VER)/include/ --sysroot $(GCC_DIR)/../aarch64-openeuler-linux-gnu/sysroot/ -Wno-unused-command-line-argument ++MPP_CFLAGS += -isystem $(GCC_DIR)/../lib/gcc/aarch64-linux-gnu/$(GCC_VER)/include/ -Wno-unused-command-line-argument + endif + export AR:=$(CROSS)ar + -- 2.34.1 diff --git a/bsp/meta-hisilicon/recipes-bsp/ss928/files/0002-fix-928-sdk-cipher-invalid.patch b/bsp/meta-hisilicon/recipes-bsp/ss928/files/0002-fix-928-sdk-cipher-invalid.patch index 625f8abd1bc11b459cae15fc64b104b3f9dba6d0..32c846e4aac92da6caa62dde5dc8c099523f75d2 100644 --- a/bsp/meta-hisilicon/recipes-bsp/ss928/files/0002-fix-928-sdk-cipher-invalid.patch +++ b/bsp/meta-hisilicon/recipes-bsp/ss928/files/0002-fix-928-sdk-cipher-invalid.patch @@ -5,18 +5,6 @@ Subject: [PATCH] fix ot_cipher function err Signed-off-by: oee - ---- a/smp/a55_linux/mpp/component/security_subsys/cipher/v3/src/drv/arch/ss928v100/cipher_cfg.h -+++ b/smp/a55_linux/mpp/component/security_subsys/cipher/v3/src/drv/arch/ss928v100/cipher_cfg.h -@@ -47,7 +47,7 @@ - * #define CRYPTO_SMMU_SUPPORT - */ - /* support interrupt */ --#define CRYPTO_OS_INT_SUPPORT -+//#define CRYPTO_OS_INT_SUPPORT - - /* the hardware version */ - #define CHIP_SYMC_VER_V300 --- a/smp/a55_linux/mpp/component/security_subsys/cipher/v3/src/drv/drivers/core/drv_lib.c +++ b/smp/a55_linux/mpp/component/security_subsys/cipher/v3/src/drv/drivers/core/drv_lib.c @@ -253,6 +253,8 @@ td_s32 module_addr_map(td_void) @@ -36,18 +24,3 @@ Signed-off-by: oee } /* ---- a/smp/a55_linux/mpp/component/security_subsys/klad/src/arch/ss928v100/klad_cfg.h -+++ b/smp/a55_linux/mpp/component/security_subsys/klad/src/arch/ss928v100/klad_cfg.h -@@ -35,10 +35,10 @@ - #define KLAD_ROUTE_NUM 2 - - /* logical module klad support interrupt */ --#define KLAD_INT_SUPPORT -+//#define KLAD_INT_SUPPORT - - /* logical module rkp support interrupt */ --#define RKP_INT_SUPPORT -+//#define RKP_INT_SUPPORT - - /* interrupt klad number, designated by RKP_INT_RAW.kl_int_num */ - #define KLAD_CLR_ROUTE 0x02 diff --git a/bsp/meta-hisilicon/recipes-bsp/ss928/files/load_sdk_driver b/bsp/meta-hisilicon/recipes-bsp/ss928/files/load_sdk_driver index 5cf3c5002be91fec22468fdb5c2f89354abf37af..46083d09476bb88e593689800951a582736a725f 100644 --- a/bsp/meta-hisilicon/recipes-bsp/ss928/files/load_sdk_driver +++ b/bsp/meta-hisilicon/recipes-bsp/ss928/files/load_sdk_driver @@ -14,7 +14,7 @@ #### os08b10 #### ####################Variables Definition########################## -SNS_TYPE0=os08a20; # sensor type +SNS_TYPE0=imx347_slave; # sensor type SNS_TYPE1=os08a20; # sensor type SNS_TYPE2=os08a20; # sensor type SNS_TYPE3=os08a20; # sensor type @@ -63,6 +63,8 @@ function insert_ko() insmod $ko_path/ot_otp.ko insmod $ko_path/ot_cipher.ko insmod $ko_path/ot_klad.ko + + insmod /opt/sample/tsensor/hi_tsensor.ko } function remove_ko() @@ -84,6 +86,8 @@ function remove_ko() rmmod ot_otp rmmod ot_cipher rmmod ot_klad + + rmmod /opt/sample/tsensor/hi_tsensor.ko } load_usage() diff --git a/bsp/meta-hisilicon/recipes-bsp/ss928/hieulerpi1-bsp-pkg.bb b/bsp/meta-hisilicon/recipes-bsp/ss928/hieulerpi1-bsp-pkg.bb index fdfb050adddac36c62259242388be28f4e683d24..8f09b651fc13d685b6b6df648a9a2f3df916e86d 100644 --- a/bsp/meta-hisilicon/recipes-bsp/ss928/hieulerpi1-bsp-pkg.bb +++ b/bsp/meta-hisilicon/recipes-bsp/ss928/hieulerpi1-bsp-pkg.bb @@ -17,13 +17,13 @@ SRC_URI = " \ ', ' \ file://HiEuler-driver/drivers/ko${RT_SUFFIX}.tar.gz \ file://HiEuler-driver/drivers/ko-extra.tar.gz \ + file://HiEuler-driver/drivers/ws73.tar.gz \ ', d)} \ file://HiEuler-driver/drivers/btools \ file://HiEuler-driver/drivers/S90AutoRun \ file://HiEuler-driver/drivers/pinmux.sh \ file://HiEuler-driver/drivers/env.tar.gz \ file://HiEuler-driver/drivers/can-tools.tar.gz \ - file://HiEuler-driver/drivers/ws73.tar.gz \ file://HiEuler-driver/drivers/sparklink-tools.tar.gz \ file://HiEuler-driver/mcu \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' file://hieulerpi1-bsp.service file://hieulerpi1-fb.service ', '', d)} \ @@ -107,10 +107,12 @@ do_install () { install -m 0755 ${WORKDIR}/HiEuler-driver/mcu/virt-tty ${D}/usr/sbin install -m 0755 ${WORKDIR}/HiEuler-driver/mcu/LiteOS.bin ${D}/firmware - install -d ${D}${sysconfdir}/ws73 - cp ${WORKDIR}/ws73/firmware/* ${D}${sysconfdir}/ws73/ - cp ${WORKDIR}/ws73/ko/* ${D}/ko/ - cp ${WORKDIR}/ws73/config/* ${D}${sysconfdir}/ + if ${@bb.utils.contains('DISTRO_FEATURES', 'kernel6', 'false', 'true', d)}; then + install -d ${D}${sysconfdir}/ws73 + cp ${WORKDIR}/ws73/firmware/* ${D}${sysconfdir}/ws73/ + cp ${WORKDIR}/ws73/ko/* ${D}/ko/ + cp ${WORKDIR}/ws73/config/* ${D}${sysconfdir}/ + fi install -m 0755 ${WORKDIR}/sparklink-tools/sparklinkd ${D}/usr/sbin install -m 0755 ${WORKDIR}/sparklink-tools/sparklinkctrl ${D}/usr/sbin diff --git a/bsp/meta-hisilicon/recipes-bsp/ss928/hieulerpi1-mpp-sample.bb b/bsp/meta-hisilicon/recipes-bsp/ss928/hieulerpi1-mpp-sample.bb new file mode 100644 index 0000000000000000000000000000000000000000..ec53568a140c486d17c80fce8f1b6c2835fb9c49 --- /dev/null +++ b/bsp/meta-hisilicon/recipes-bsp/ss928/hieulerpi1-mpp-sample.bb @@ -0,0 +1,49 @@ +DESCRIPTION = "use yocto to re-compile mpp sample for hieulerpi1, just for kernel 6.6" +SECTION = "mpp sample" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1748ada63ab6140110ad5ed27a8b8d18" + +OPENEULER_LOCAL_NAME = "HiEuler-mpp-sample-kernel-6.6" + +SRC_URI = " \ + file://HiEuler-mpp-sample-kernel-6.6 \ +" + +S = "${WORKDIR}/HiEuler-mpp-sample-kernel-6.6" + +inherit module oee-archive + +do_compile() { + cd ${S}/src + sed -i 's/aarch64-openeuler-linux-gnu-/aarch64-openeuler-linux-/' Makefile.param + oe_runmake + + cd - +} + +do_install () { + install -d ${D}/root/sample + find ${S}/src -type f -executable ! -name "*.so*" ! -name "*.a" ! -name "*.o" ! -name "*.c" ! -name "Makefile" \ + | xargs -I {} install -m 0755 {} ${D}/root/sample + + mkdir -p ${S}/deploy/{include,lib} + cp -a ${S}/include/hisilicon/* ${S}/deploy/include + cp -a ${S}/lib/gcc/hisilicon/* ${S}/deploy/lib + cd ${S}/deploy + tar czf include.tar.gz include/ + tar caf lib.tar.gz lib/ + cd - +} + +do_deploy[nostamp] = "1" +do_deploy() { + install -d ${DEPLOY_DIR}/third_party_sdk + install -m 0644 ${S}/deploy/include.tar.gz ${DEPLOY_DIR}/third_party_sdk + install -m 0644 ${S}/deploy/lib.tar.gz ${DEPLOY_DIR}/third_party_sdk +} + +FILES:${PN} = " /root/sample " + +INHIBIT_PACKAGE_STRIP = "1" + +addtask deploy after do_install \ No newline at end of file diff --git a/bsp/meta-hisilicon/recipes-bsp/ss928/hieulerpi1-peripherals-driver.bb b/bsp/meta-hisilicon/recipes-bsp/ss928/hieulerpi1-peripherals-driver.bb new file mode 100644 index 0000000000000000000000000000000000000000..49a7042f54cfea0f8d21cdf343902c56cd3039ba --- /dev/null +++ b/bsp/meta-hisilicon/recipes-bsp/ss928/hieulerpi1-peripherals-driver.bb @@ -0,0 +1,79 @@ +DESCRIPTION = "use yocto to re-compile peripherals driver for hieulerpi1, just for kernel 6.6" +SECTION = "peripherals driver" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d229da563da18fe5d58cd95a6467d584" + +OPENEULER_LOCAL_NAME = "HiEuler-driver-kernel-6.6" + +SRC_URI = " \ + file://HiEuler-driver-kernel-6.6 \ +" + +S = "${WORKDIR}/HiEuler-driver-kernel-6.6" + +inherit module + +do_compile() { + export CROSS_COMPILE=aarch64-openeuler-linux- + export KERNELDIR=${STAGING_KERNEL_BUILDDIR} + + cd ${S}/i2c_soft + oe_runmake + + cd ${S}/gpio + oe_runmake + + cd ${S}/oled + oe_runmake + + cd ${S}/WS73 + oe_runmake + + cd ${S}/hi_adc + oe_runmake driver + oe_runmake application + + cd ${S}/Tsensor + oe_runmake driver + oe_runmake application + + cd - +} + +do_install () { + install -d ${D}/opt/sample/mipi_rx + install -d ${D}/opt/sample/mipi_rx/imx347 + install -d ${D}/opt/sample/mipi_rx/sc450ai + install -m 644 ${S}/i2c_soft/i2c_soft_driver.ko ${D}/opt/sample/mipi_rx + install -m 755 ${S}/scripts_and_configs/mipi_rx/imx347/sns23_reset_4x2lane.sh ${D}/opt/sample/mipi_rx/imx347 + install -m 755 ${S}/scripts_and_configs/mipi_rx/sc450ai/sns23_reset_4x2lane.sh ${D}/opt/sample/mipi_rx/sc450ai + + install -d ${D}/opt/sample/gpio + install -m 644 ${S}/gpio/gpio_driver.ko ${D}/opt/sample/gpio + + install -d ${D}/opt/sample/oled + install -m 644 ${S}/oled/i2c_oled_driver.ko ${D}/opt/sample/oled + + install -d ${D}/opt/sample/ws73 + install -d ${D}/etc + install -d ${D}/etc/ws73 + install -d ${D}/etc/wireless + install -m 644 ${S}/WS73/output/bin/ws73_cfg.ini ${D}/etc + install -m 755 ${S}/scripts_and_configs/ws73/wifi_sta.sh ${S}/scripts_and_configs/ws73/wifi_ap.sh ${D}/opt/sample/ws73 + find ${S}/WS73/output/bin -type f -name "*.ko" -exec install -m 644 {} ${D}/opt/sample/ws73 \; + find ${S}/WS73/firmware/us -type f -name "*.bin" -exec install -m 644 {} ${D}/etc/ws73 \; + find ${S}/scripts_and_configs/ws73/wireless -type f \ + | xargs -I {} install -m 0644 {} ${D}/etc/wireless + + install -d ${D}/opt/sample/adc + install -m 644 ${S}/hi_adc/hi_adc.ko ${D}/opt/sample/adc + install -m 755 ${S}/hi_adc/hi_adc_driver_sample/hi_adc_driver_sample ${D}/opt/sample/adc + + install -d ${D}/opt/sample/tsensor + install -m 644 ${S}/Tsensor/hi_tsensor.ko ${D}/opt/sample/tsensor + install -m 755 ${S}/Tsensor/hi_tsensor_driver_sample/hi_tsensor_driver_sample ${D}/opt/sample/tsensor +} + +FILES:${PN} = " /opt/sample /etc/wireless /etc/ws73 /etc/ws73_cfg.ini " + +INHIBIT_PACKAGE_STRIP = "1" \ No newline at end of file diff --git a/bsp/meta-hisilicon/recipes-bsp/ss928/hieulerpi1-sdk-pkg.bb b/bsp/meta-hisilicon/recipes-bsp/ss928/hieulerpi1-sdk-pkg.bb index 36648a35d818895638bfdea2188f22773305fb58..54ddb3b1badd6e651d7102a60b60e9693e3b1d00 100644 --- a/bsp/meta-hisilicon/recipes-bsp/ss928/hieulerpi1-sdk-pkg.bb +++ b/bsp/meta-hisilicon/recipes-bsp/ss928/hieulerpi1-sdk-pkg.bb @@ -31,29 +31,19 @@ do_compile() { cd ${S}/smp/a55_linux/mpp/out/obj oe_runmake cd - - cd ${S}/smp/a55_linux/mpp/sample - oe_runmake - cd - } do_install () { cd ${S}/smp/a55_linux/mpp/out/ install -m 0750 ${WORKDIR}/load_sdk_driver ko/ tar czf ko.tar.gz ko/ - tar czf include.tar.gz include/ - tar caf lib.tar.gz lib/ cd - - install -d ${D}/root/sample - find ${S}/smp/a55_linux/mpp/sample -type f -executable ! -name "*.so*" ! -name "*.a" ! -name "*.o" ! -name "*.c" ! -name "Makefile" \ - | xargs -I {} install -m 0755 {} ${D}/root/sample } do_deploy[nostamp] = "1" do_deploy() { install -d ${DEPLOY_DIR}/third_party_sdk install -m 0644 ${S}/smp/a55_linux/mpp/out/ko.tar.gz ${DEPLOY_DIR}/third_party_sdk - install -m 0644 ${S}/smp/a55_linux/mpp/out/lib.tar.gz ${DEPLOY_DIR}/third_party_sdk - install -m 0644 ${S}/smp/a55_linux/mpp/out/include.tar.gz ${DEPLOY_DIR}/third_party_sdk } addtask deploy after do_install diff --git a/bsp/meta-hisilicon/recipes-core/images/bsp-hieulerpi1.inc b/bsp/meta-hisilicon/recipes-core/images/bsp-hieulerpi1.inc index c6ab909d5ba044ca2e5511cc9f21d0f6a8fc75db..ad42e2541cd3bccf29ab431f38d4bb206d784c06 100644 --- a/bsp/meta-hisilicon/recipes-core/images/bsp-hieulerpi1.inc +++ b/bsp/meta-hisilicon/recipes-core/images/bsp-hieulerpi1.inc @@ -4,7 +4,12 @@ IMAGE_INSTALL:append = " \ hieulerpi1-tf-a \ hieulerpi1-bsp-pkg \ -i2c-soft \ -${@bb.utils.contains('DISTRO_FEATURES', 'kernel6', '', 'ch343', d)} \ +${@bb.utils.contains('DISTRO_FEATURES', 'kernel6', ' \ + hieulerpi1-peripherals-driver \ + hieulerpi1-mpp-sample \ +', ' \ + i2c-soft \ + ch343 \ +', d)} \ mcu-tool \ " diff --git a/bsp/meta-hisilicon/recipes-kernel/linux/files/config/hieulerpi1/hieulerpi1_kernel6_defconfig b/bsp/meta-hisilicon/recipes-kernel/linux/files/config/hieulerpi1/hieulerpi1_kernel6_defconfig index c5b87ddfadfd2b22410a9fdd701b1ee7876ace1a..94a6f07bb8be8fba8d3754fe6e531a2c588f346f 100644 --- a/bsp/meta-hisilicon/recipes-kernel/linux/files/config/hieulerpi1/hieulerpi1_kernel6_defconfig +++ b/bsp/meta-hisilicon/recipes-kernel/linux/files/config/hieulerpi1/hieulerpi1_kernel6_defconfig @@ -914,7 +914,10 @@ CONFIG_NET_HANDSHAKE=y CONFIG_INET=y CONFIG_IP_MULTICAST=y # CONFIG_IP_ADVANCED_ROUTER is not set -# CONFIG_IP_PNP is not set +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +# CONFIG_IP_PNP_BOOTP is not set +# CONFIG_IP_PNP_RARP is not set # CONFIG_NET_IPIP is not set # CONFIG_NET_IPGRE_DEMUX is not set CONFIG_NET_IP_TUNNEL=m @@ -973,13 +976,14 @@ CONFIG_NETFILTER_INGRESS=y CONFIG_NETFILTER_EGRESS=y CONFIG_NETFILTER_NETLINK=m CONFIG_NETFILTER_FAMILY_BRIDGE=y +CONFIG_NETFILTER_FAMILY_ARP=y CONFIG_NETFILTER_BPF_LINK=y # CONFIG_NETFILTER_NETLINK_HOOK is not set # CONFIG_NETFILTER_NETLINK_ACCT is not set # CONFIG_NETFILTER_NETLINK_QUEUE is not set CONFIG_NETFILTER_NETLINK_LOG=m # CONFIG_NETFILTER_NETLINK_OSF is not set -CONFIG_NF_CONNTRACK=m +CONFIG_NF_CONNTRACK=y # CONFIG_NF_LOG_SYSLOG is not set CONFIG_NF_CONNTRACK_MARK=y # CONFIG_NF_CONNTRACK_ZONES is not set @@ -1029,7 +1033,7 @@ CONFIG_NFT_COMPAT=m # CONFIG_NFT_TPROXY is not set # CONFIG_NFT_SYNPROXY is not set # CONFIG_NF_FLOW_TABLE is not set -CONFIG_NETFILTER_XTABLES=m +CONFIG_NETFILTER_XTABLES=y # # Xtables combined modules @@ -1158,7 +1162,7 @@ CONFIG_IP_VS_MH_TAB_INDEX=12 # # IP: Netfilter Configuration # -CONFIG_NF_DEFRAG_IPV4=m +CONFIG_NF_DEFRAG_IPV4=y # CONFIG_NF_SOCKET_IPV4 is not set # CONFIG_NF_TPROXY_IPV4 is not set CONFIG_NF_TABLES_IPV4=y @@ -1181,7 +1185,9 @@ CONFIG_IP_NF_NAT=m # CONFIG_IP_NF_TARGET_REDIRECT is not set # CONFIG_IP_NF_MANGLE is not set # CONFIG_IP_NF_RAW is not set -# CONFIG_IP_NF_ARPTABLES is not set +CONFIG_IP_NF_ARPTABLES=y +# CONFIG_IP_NF_ARPFILTER is not set +# CONFIG_IP_NF_ARP_MANGLE is not set # end of IP: Netfilter Configuration # @@ -1198,7 +1204,7 @@ CONFIG_NF_TABLES_IPV6=y # CONFIG_IP6_NF_IPTABLES is not set # end of IPv6: Netfilter Configuration -CONFIG_NF_DEFRAG_IPV6=m +CONFIG_NF_DEFRAG_IPV6=y # CONFIG_NF_TABLES_BRIDGE is not set # CONFIG_NF_CONNTRACK_BRIDGE is not set # CONFIG_BRIDGE_NF_EBTABLES is not set @@ -1318,7 +1324,9 @@ CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" # CONFIG_MAC80211_DEBUGFS is not set # CONFIG_MAC80211_DEBUG_MENU is not set CONFIG_MAC80211_STA_HASH_MAX_SIZE=0 -# CONFIG_RFKILL is not set +CONFIG_RFKILL=y +# CONFIG_RFKILL_INPUT is not set +# CONFIG_RFKILL_GPIO is not set # CONFIG_NET_9P is not set # CONFIG_CAIF is not set # CONFIG_CEPH_LIB is not set @@ -1842,6 +1850,7 @@ CONFIG_USB_NET_ZAURUS=y # CONFIG_USB_NET_CX82310_ETH is not set # CONFIG_USB_NET_KALMIA is not set CONFIG_USB_NET_QMI_WWAN=y +# CONFIG_USB_HSO is not set # CONFIG_USB_NET_INT51X1 is not set # CONFIG_USB_IPHETH is not set # CONFIG_USB_SIERRA_NET is not set @@ -3624,7 +3633,12 @@ CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_PCI=y # CONFIG_USB_XHCI_PCI_RENESAS is not set CONFIG_USB_XHCI_PLATFORM=y -# CONFIG_USB_EHCI_HCD is not set +CONFIG_USB_EHCI_HCD=y +# CONFIG_USB_EHCI_ROOT_HUB_TT is not set +CONFIG_USB_EHCI_TT_NEWSCHED=y +CONFIG_USB_EHCI_PCI=y +# CONFIG_USB_EHCI_FSL is not set +# CONFIG_USB_EHCI_HCD_PLATFORM is not set # CONFIG_USB_OXU210HP_HCD is not set # CONFIG_USB_ISP116X_HCD is not set # CONFIG_USB_MAX3421_HCD is not set @@ -3770,6 +3784,7 @@ CONFIG_USB_SERIAL_OPTION=y # CONFIG_USB_IDMOUSE is not set # CONFIG_USB_APPLEDISPLAY is not set # CONFIG_APPLE_MFI_FASTCHARGE is not set +# CONFIG_USB_SISUSBVGA is not set # CONFIG_USB_LD is not set # CONFIG_USB_TRANCEVIBRATOR is not set # CONFIG_USB_IOWARRIOR is not set @@ -4535,6 +4550,7 @@ CONFIG_NFS_V2=y CONFIG_NFS_V3=y CONFIG_NFS_V3_ACL=y # CONFIG_NFS_V4 is not set +# CONFIG_ROOT_NFS is not set CONFIG_NFS_DISABLE_UDP_SUPPORT=y # CONFIG_NFSD is not set CONFIG_GRACE_PERIOD=y diff --git a/bsp/meta-hisilicon/recipes-kernel/linux/files/dtbs/ss928-pi-kernel6.dts b/bsp/meta-hisilicon/recipes-kernel/linux/files/dtbs/ss928-pi-kernel6.dts index 5d13e66c4a05af7e9ccf47b10ac0619db96c1193..2d8c8e43c1ee50ee659cce2484095320385d6f8a 100644 --- a/bsp/meta-hisilicon/recipes-kernel/linux/files/dtbs/ss928-pi-kernel6.dts +++ b/bsp/meta-hisilicon/recipes-kernel/linux/files/dtbs/ss928-pi-kernel6.dts @@ -1,3 +1,4 @@ + /dts-v1/; /memreserve/ 0x0000000052fff000 0x0000000001a02000; @@ -319,27 +320,6 @@ clock-frequency = <0x186a0>; status = "okay"; }; - i2c@0 { - compatible = "i2c,soft"; - reg = <0x00 0x00>; - #address-cells = <0x01>; - #size-cells = <0x00>; - gpio-scl = <0x06 0x07 0x00>; - gpio-sda = <0x06 0x06 0x00>; - clock-frequency = <0xf4240>; - status = "okay"; - }; - - i2c@1 { - compatible = "i2c,soft"; - reg = <0x01 0x00>; - #address-cells = <0x01>; - #size-cells = <0x00>; - gpio-scl = <0x07 0x02 0x00>; - gpio-sda = <0x07 0x00 0x00>; - clock-frequency = <0xf4240>; - status = "okay"; - }; amba { compatible = "arm,amba-bus"; @@ -539,7 +519,7 @@ status = "okay"; }; - gpio_chip@11091000 { + gpio_chip1: gpio_chip@11091000 { compatible = "arm,pl061\0arm,primecell"; reg = <0x11091000 0x1000>; interrupts = <0x00 0x4a 0x04>; @@ -549,7 +529,7 @@ status = "okay"; }; - gpio_chip@11092000 { + gpio_chip2: gpio_chip@11092000 { compatible = "arm,pl061\0arm,primecell"; reg = <0x11092000 0x1000>; interrupts = <0x00 0x4b 0x04>; @@ -1110,6 +1090,28 @@ reset-names = "pwm0\0pwm1"; status = "okay"; }; + + i2c_bus6: i2c@0 { + compatible = "i2c,soft"; + reg = <0x0 0x0>; + #address-cells = <0x1>; + #size-cells = <0x0>; + gpio-scl = <&gpio_chip1 0x7 0>; + gpio-sda = <&gpio_chip1 0x6 0>; + clock-frequency = <100000>; // 100K + status = "okay"; + }; + + i2c_bus7: i2c@1 { + compatible ="i2c,soft"; + reg = <0x1 0x0>; + #address-cells = <0x1>; + #size-cells = <0x0>; + gpio-scl = <&gpio_chip2 0x2 0>; + gpio-sda = <&gpio_chip2 0x0 0>; + clock-frequency = <100000>; // 100K + status = "okay"; + }; }; aliases { diff --git a/meta-openeuler/recipes-core/busybox/files/defconfig b/meta-openeuler/recipes-core/busybox/files/defconfig index 9ae27dcdb35052e63f39047373a007ae61fd6e14..939510b7def29f02663e2ba25587987c829fe85a 100644 --- a/meta-openeuler/recipes-core/busybox/files/defconfig +++ b/meta-openeuler/recipes-core/busybox/files/defconfig @@ -984,10 +984,10 @@ CONFIG_VCONFIG=y # CONFIG_FEATURE_WGET_OPENSSL is not set # CONFIG_WHOIS is not set # CONFIG_ZCIP is not set -# CONFIG_UDHCPD is not set +CONFIG_UDHCPD=y # CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set -# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set -CONFIG_DHCPD_LEASES_FILE="" +CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY=y +CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases" # CONFIG_DUMPLEASES is not set # CONFIG_DHCPRELAY is not set CONFIG_UDHCPC=y