瀏覽代碼

Merge branch 'CR_882_basic_jianlong' into 'JH7100_VisionFive_OH_dev'

modify config enable pinctrl/spi/eth phy/wifi/bt

See merge request jh7100/freelight-u-sdk!23
jianlong.huang 2 年之前
父節點
當前提交
ccc1f9e159

+ 2 - 0
conf/buildroot_initramfs_config

@@ -68,6 +68,8 @@ BR2_PACKAGE_LIBDRM_ETNAVIV=y
 BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y
 BR2_PACKAGE_DTC=y
 BR2_PACKAGE_DTC_PROGRAMS=y
+BR2_PACKAGE_LIBGPIOD=y
+BR2_PACKAGE_LIBGPIOD_TOOLS=y
 BR2_PACKAGE_LIBV4L_UTILS=y
 BR2_PACKAGE_LIBTIRPC=y
 BR2_PACKAGE_LIBEVENT=y

+ 18 - 8
conf/sdk_210209_defconfig

@@ -72,13 +72,18 @@ CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BT_BNEP=y
 CONFIG_BT_BNEP_MC_FILTER=y
 CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_HIDP=y
+CONFIG_BT_HS=y
 CONFIG_BT_HCIUART=y
 CONFIG_BT_HCIUART_H4=y
 CONFIG_CFG80211=y
+CONFIG_RFKILL=y
 CONFIG_NET_9P=y
 CONFIG_NET_9P_VIRTIO=y
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_EXTRA_FIRMWARE="regulatory.db regulatory.db.p7s brcm/brcmfmac43430-sdio.bin brcm/brcmfmac43430-sdio.clm_blob brcm/brcmfmac43430-sdio.beagle,beaglev-starlight-jh7100-r0.txt brcm/brcmfmac43430-sdio.starfive,visionfive-v1.txt"
+CONFIG_EXTRA_FIRMWARE_DIR="firmware"
 CONFIG_OF_CONFIGFS=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_VIRTIO_BLK=y
@@ -120,17 +125,14 @@ CONFIG_VIRTIO_NET=y
 CONFIG_STMMAC_ETH=y
 CONFIG_STMMAC_SELFTESTS=y
 CONFIG_DWMAC_DWC_QOS_ETH=y
-# CONFIG_DWMAC_GENERIC is not set
 # CONFIG_NET_VENDOR_SYNOPSYS is not set
 # CONFIG_NET_VENDOR_VIA is not set
 # CONFIG_NET_VENDOR_WIZNET is not set
 # CONFIG_NET_VENDOR_XILINX is not set
-CONFIG_MARVELL_PHY=y
 CONFIG_MICREL_PHY=y
-CONFIG_BCMDHD=y
-CONFIG_BCMDHD_FW_PATH="/etc/firmware/fw_bcm43436b0.bin"
-CONFIG_BCMDHD_NVRAM_PATH="/etc/firmware/nvram_ap6236.txt"
-CONFIG_BCMDHD_SDIO_IRQ=y
+CONFIG_MOTORCOMM_PHY=y
+CONFIG_BRCMFMAC=y
+CONFIG_INPUT_EVDEV=y
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 CONFIG_SERIO_LIBPS2=y
@@ -149,14 +151,21 @@ CONFIG_HW_RANDOM_VIRTIO=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_SPI=y
+# CONFIG_SPI_MEM is not set
+CONFIG_SPI_DESIGNWARE=y
+CONFIG_SPI_DW_DMA=y
+CONFIG_SPI_DW_MMIO=y
 CONFIG_SPI_SIFIVE=y
+CONFIG_SPI_SPIDEV=y
 # CONFIG_PTP_1588_CLOCK is not set
-CONFIG_GPIOLIB=y
+CONFIG_PINCTRL=y
+CONFIG_GPIO_SYSFS=y
 CONFIG_POWER_RESET=y
 CONFIG_POWER_RESET_SYSCON=y
 CONFIG_POWER_RESET_SYSCON_POWEROFF=y
-CONFIG_SENSORS_SFCTMP=y
+CONFIG_SENSORS_SFCTEMP=y
 CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_SYSFS=y
 CONFIG_STARFIVE_WATCHDOG=y
 # CONFIG_MEDIA_CEC_SUPPORT is not set
 CONFIG_MEDIA_SUPPORT=y
@@ -192,6 +201,7 @@ CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_GOLDFISH=y
 CONFIG_DMADEVICES=y
 CONFIG_DW_AXI_DMAC=y
+CONFIG_DMATEST=y
 # CONFIG_VIRTIO_MENU is not set
 # CONFIG_VHOST_MENU is not set
 CONFIG_GOLDFISH=y

+ 1 - 1
conf/starlight-a1-uboot-fit-image.its

@@ -30,7 +30,7 @@
                 };
 
                 fdt {
-                        data = /incbin/("../work/linux/arch/riscv/boot/dts/starfive/starfive_vic7100_evb.dtb");
+                        data = /incbin/("../work/linux/arch/riscv/boot/dts/starfive/jh7100-beaglev-starlight-a1.dtb");
                         type = "flat_dt";
                         arch = "riscv";
                         load = <0x0 0x86000000>;

+ 1 - 1
conf/starlight-uboot-fit-image.its

@@ -30,7 +30,7 @@
                 };
 
                 fdt {
-                        data = /incbin/("../work/linux/arch/riscv/boot/dts/starfive/starfive_vic7100_evb.dtb");
+                        data = /incbin/("../work/linux/arch/riscv/boot/dts/starfive/jh7100-beaglev-starlight.dtb");
                         type = "flat_dt";
                         arch = "riscv";
                         load = <0x0 0x86000000>;

+ 1 - 1
conf/visionfive-uboot-fit-image.its

@@ -30,7 +30,7 @@
                 };
 
                 fdt {
-                        data = /incbin/("../work/linux/arch/riscv/boot/dts/starfive/starfive_vic7100_evb.dtb");
+                        data = /incbin/("../work/linux/arch/riscv/boot/dts/starfive/jh7100-starfive-visionfive-v1.dtb");
                         type = "flat_dt";
                         arch = "riscv";
                         load = <0x0 0x86000000>;