Browse Source

[OE]: 5.10.6 sdk building ok

1. Remove multimedia library from buildroot,
   only keep alsa,v4l,drm lib, and v4l2test, drm_test
2. Keep 5.10.6 kernel config to be same with vic_starlight
3. Moify its to use starfive_vic7100_evb.dtb, this may change later
4. Recommand test on starlight board

Signed-off-by: Andy Hu <andy.hu@starfivetech.com>
Andy Hu 2 years ago
parent
commit
b64f3e474d

+ 3 - 3
.gitmodules

@@ -1,15 +1,15 @@
 [submodule "buildroot"]
 	path = buildroot
 	url = http://192.168.110.45/jh7100/buildroot.git
-	branch = JH7100_VisionFive_devel
+	branch = JH7100_VisionFive_OH_dev
 [submodule "HiFive_U-Boot"]
 	path = HiFive_U-Boot
 	url = http://192.168.110.45/jh7100/u-boot.git
-	branch = JH7100_VisionFive_devel
+	branch = JH7100_VisionFive_OH_dev
 [submodule "linux"]
 	path = linux
 	url = http://192.168.110.45/jh7100/linux.git
-	branch = visionfive-5.15.y-devel
+	branch = vic_starlight
 [submodule "opensbi"]
 	path = opensbi
 	url = http://192.168.110.45/jh7100/opensbi.git

+ 1 - 1
Makefile

@@ -29,7 +29,7 @@ buildroot_rootfs_config := $(confdir)/buildroot_rootfs_config
 
 linux_srcdir := $(srcdir)/linux
 linux_wrkdir := $(wrkdir)/linux
-linux_defconfig := $(confdir)/visionfive_defconfig
+linux_defconfig := $(confdir)/sdk_210209_defconfig
 
 vmlinux := $(linux_wrkdir)/vmlinux
 vmlinux_stripped := $(linux_wrkdir)/vmlinux-stripped

+ 3 - 82
conf/buildroot_initramfs_config

@@ -2,7 +2,7 @@ BR2_riscv=y
 BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
 BR2_KERNEL_HEADERS_CUSTOM_GIT=y
 BR2_KERNEL_HEADERS_CUSTOM_REPO_URL="http://192.168.110.45/jh7100/linux.git"
-BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION="visionfive-5.15.y-devel"
+BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION="vic_starlight"
 BR2_PACKAGE_GLIBC_UTILS=y
 BR2_GCC_VERSION_10_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
@@ -20,79 +20,13 @@ BR2_PACKAGE_ALSA_UTILS_AMIXER=y
 BR2_PACKAGE_ALSA_UTILS_APLAY=y
 BR2_PACKAGE_ALSA_UTILS_ASEQDUMP=y
 BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
-BR2_PACKAGE_FFMPEG_GPL=y
-BR2_PACKAGE_FFMPEG_FFPROBE=y
-BR2_PACKAGE_FFMPEG_AVRESAMPLE=y
-BR2_PACKAGE_FFMPEG_POSTPROC=y
-BR2_PACKAGE_GSTREAMER1=y
-BR2_PACKAGE_GSTREAMER1_CHECK=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_INSTALL_TOOLS=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOMIXER=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORATE=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOTESTSRC=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ENCODING=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_RAWPARSE=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEORATE=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ALSA=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_OGG=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_OPUS=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VORBIS=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_JPEG=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PNG=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUDIOPARSERS=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUTODETECT=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_DEBUGUTILS=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_DEINTERLACE=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_FLV=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ID3DEMUX=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_IMAGEFREEZE=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_INTERLEAVE=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_LAW=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_LEVEL=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MATROSKA=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MULTIFILE=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MULTIPART=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTSP=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOCROP=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOFILTER=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOMIXER=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_WAVENC=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_LAME=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2_PROBE=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_FLAC=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_PULSE=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VPX=y
-BR2_PACKAGE_GST1_PLUGINS_BAD=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUTOCONVERT=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ID3TAG=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_JPEGFORMAT=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGDEMUX=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGTSDEMUX=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RAWPARSE=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SPEED=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOFILTERS=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOFRAME_AUDIOLEVEL=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOPARSERS=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FBDEV=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_KMS=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPUS=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_X265=y
-BR2_PACKAGE_GST1_PLUGINS_UGLY=y
-BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_ASFDEMUX=y
-BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_MPEG2DEC=y
-BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_X264=y
-BR2_PACKAGE_GST1_LIBAV=y
-BR2_PACKAGE_GST1_RTSP_SERVER=y
-BR2_PACKAGE_PULSEAUDIO_DAEMON=y
 BR2_PACKAGE_DHRYSTONE=y
 BR2_PACKAGE_GDB=y
 BR2_PACKAGE_GDB_VERSION_9_2=y
 BR2_PACKAGE_IOZONE=y
 BR2_PACKAGE_LMBENCH=y
 BR2_PACKAGE_STRACE=y
+BR2_PACKAGE_LIBTOOL=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_EXFAT=y
 BR2_PACKAGE_EXFAT_UTILS=y
@@ -126,6 +60,7 @@ BR2_PACKAGE_LIBKCAPI_ENCAPP=y
 BR2_PACKAGE_LIBKCAPI_RNGAPP=y
 BR2_PACKAGE_LIBKCAPI_SPEED=y
 BR2_PACKAGE_LIBKCAPI_TEST=y
+BR2_PACKAGE_LIBDRM=y
 BR2_PACKAGE_LIBDRM_RADEON=y
 BR2_PACKAGE_LIBDRM_AMDGPU=y
 BR2_PACKAGE_LIBDRM_NOUVEAU=y
@@ -134,11 +69,6 @@ BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y
 BR2_PACKAGE_DTC=y
 BR2_PACKAGE_DTC_PROGRAMS=y
 BR2_PACKAGE_LIBV4L_UTILS=y
-BR2_PACKAGE_LIBCAMERA=y
-BR2_PACKAGE_LIBCAMERA_V4L2=y
-BR2_PACKAGE_LIBCAMERA_PIPELINE_UVCVIDEO=y
-BR2_PACKAGE_LIBCAMERA_PIPELINE_STARFIVE=y
-BR2_PACKAGE_LIBOPUSENC=y
 BR2_PACKAGE_LIBTIRPC=y
 BR2_PACKAGE_LIBEVENT=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
@@ -175,17 +105,8 @@ BR2_PACKAGE_BASH=y
 BR2_PACKAGE_SCREEN=y
 BR2_PACKAGE_HTOP=y
 BR2_PACKAGE_UTIL_LINUX_MOUNT=y
-BR2_PACKAGE_WAVE511=y
-BR2_PACKAGE_WAVE521=y
-BR2_PACKAGE_CODAJ12=y
-BR2_PACKAGE_SF_OMX_IL=y
-BR2_PACKAGE_SF_OMX_IL_TEST=y
-BR2_PACKAGE_SF_GST_OMX=y
 BR2_PACKAGE_V4L2_TEST=y
-BR2_PACKAGE_PP_TEST=y
-BR2_PACKAGE_LIBCAMERA_APPS=y
 BR2_PACKAGE_DRM_TEST=y
-BR2_PACKAGE_FFMPEG_TEST=y
 BR2_TARGET_OPENSBI=y
 BR2_PACKAGE_HOST_GENEXT2FS=y
 BR2_PACKAGE_HOST_GENIMAGE=y

+ 3 - 23
conf/sdk_210209_defconfig

@@ -72,7 +72,6 @@ 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_HCIUART=y
 CONFIG_BT_HCIUART_H4=y
 CONFIG_CFG80211=y
@@ -121,6 +120,7 @@ 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
@@ -149,16 +149,9 @@ CONFIG_HW_RANDOM_VIRTIO=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_SPI=y
-CONFIG_SPI_DEBUG=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_GPIO_SYSFS=y
 CONFIG_POWER_RESET=y
 CONFIG_POWER_RESET_SYSCON=y
 CONFIG_POWER_RESET_SYSCON_POWEROFF=y
@@ -168,33 +161,20 @@ CONFIG_STARFIVE_WATCHDOG=y
 # CONFIG_MEDIA_CEC_SUPPORT is not set
 CONFIG_MEDIA_SUPPORT=y
 CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
-CONFIG_MEDIA_USB_SUPPORT=y
-CONFIG_USB_VIDEO_CLASS=y
 CONFIG_V4L_PLATFORM_DRIVERS=y
 CONFIG_VIDEO_STF_VIN=y
-# CONFIG_VIN_SENSOR_OV5640=y
-# CONFIG_VIN_SENSOR_SC2235=y
-CONFIG_VIN_SENSOR_OV4689=y
-# CONFIG_VIDEO_STARFIVE_VIN_SENSOR_IMX219=y
+CONFIG_VIDEO_STARFIVE_VIN_SENSOR_IMX219=y
 CONFIG_DRM=y
-# CONFIG_FB=y
 CONFIG_FB_STARFIVE=y
 CONFIG_FB_STARFIVE_HDMI_TDA998X=y
-CONFIG_FB_STARFIVE_VIDEO=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
-# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_LOGO=y
 CONFIG_SOUND=y
 CONFIG_SND=y
 CONFIG_SND_SOC=y
-CONFIG_SND_STARFIVE_SPDIF=y
-CONFIG_SND_STARFIVE_SPDIF_PCM=y
-CONFIG_SND_SOC_AC108=y
-CONFIG_SND_SOC_SPDIF=y
-CONFIG_SND_SOC_WM8960=y
+CONFIG_SND_STARFIVE_PWMDAC=y
 CONFIG_SND_SIMPLE_CARD=y
-CONFIG_SND_AUDIO_GRAPH_CARD=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_STORAGE=y

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

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