Skip to content

Commit

Permalink
Many changes for rk322x target:
Browse files Browse the repository at this point in the history
- Chanaged default x.org configuration to disable glamor
- Reintroduce patch to use DRM cursor plane as overlay in rk322x-current and -dev
- Updated wifi patches for kernel 5.8.10
- Bumped rk322x to u-boot v2020.07, removed reserved zones from device trees
- Updated OPTEE to v3.10, using ddrbin v1.10
- Bumped rk322x-current to kernel 5.8.y
- Imported new patches from knaerzche's LibreELEC fork for rk322x-dev (kernel 5.8.y)
- Adjusted existing patches to match changes, updated rk322x-dev kernel config file
- Add default modprobe conf file for esp8089 to force the crystal frequency to 40Mhz for rk322x targets
- Removed ssv6051 firmware packages to move to armbian-firmware repository
- Switching ssv6051-wifi.cfg to /lib/firmware for rk322x-legacy
- Removed P2P interface for esp8089 driver for rk322x-legacy
- Optimized ssv6051 performance: kernel module gains -Os flag, disabled p2p interface, enabled HW crypto for CCMP cipher
- Enabled remote control interface, IR GPIO kernel module and HDMI CEC modules
  • Loading branch information
paolosabatino committed Sep 19, 2020
1 parent 7b6920a commit bd17d4d
Show file tree
Hide file tree
Showing 70 changed files with 66,030 additions and 21,211 deletions.
287 changes: 167 additions & 120 deletions config/kernel/linux-rk322x-current.config

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion config/kernel/linux-rk322x-dev.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 5.8.2 Kernel Configuration
# Linux/arm 5.8.9 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="arm-none-linux-gnueabihf-gcc (GNU Toolchain for the A-profile Architecture 9.2-2019.12 (arm-9.10)) 9.2.1 20191025"
CONFIG_CC_IS_GCC=y
Expand Down Expand Up @@ -2834,6 +2834,7 @@ CONFIG_SPI_SPIDEV=y
# CONFIG_SPI_LOOPBACK_TEST is not set
# CONFIG_SPI_TLE62X0 is not set
# CONFIG_SPI_SLAVE is not set
CONFIG_SPI_DYNAMIC=y
# CONFIG_SPMI is not set
# CONFIG_HSI is not set
CONFIG_PPS=y
Expand Down Expand Up @@ -4201,6 +4202,7 @@ CONFIG_DRM_PANEL_BRIDGE=y
# CONFIG_DRM_CDNS_DSI is not set
# CONFIG_DRM_CHRONTEL_CH7033 is not set
CONFIG_DRM_DISPLAY_CONNECTOR=m
# CONFIG_DRM_ITE_IT66121 is not set
# CONFIG_DRM_LVDS_CODEC is not set
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
# CONFIG_DRM_NWL_MIPI_DSI is not set
Expand Down Expand Up @@ -5445,6 +5447,7 @@ CONFIG_HAVE_CLK=y
CONFIG_CLKDEV_LOOKUP=y
CONFIG_HAVE_CLK_PREPARE=y
CONFIG_COMMON_CLK=y
# CONFIG_CLK_HSDK is not set
CONFIG_COMMON_CLK_MAX9485=m
CONFIG_COMMON_CLK_RK808=y
# CONFIG_COMMON_CLK_SI5341 is not set
Expand Down
41 changes: 40 additions & 1 deletion config/kernel/linux-rk322x-legacy.config
Expand Up @@ -1925,6 +1925,10 @@ CONFIG_MVL88W8977=m
#
CONFIG_SSV6051=m
# CONFIG_WL_TI is not set
CONFIG_RTL8822BU=m
CONFIG_RTL8821CU=m
CONFIG_88XXAU=m
CONFIG_RTL8192EU=m
CONFIG_ZD1211RW=m
# CONFIG_ZD1211RW_DEBUG is not set
CONFIG_MWIFIEX=y
Expand Down Expand Up @@ -2814,8 +2818,9 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
# CONFIG_MEDIA_RADIO_SUPPORT is not set
# CONFIG_MEDIA_SDR_SUPPORT is not set
# CONFIG_MEDIA_RC_SUPPORT is not set
CONFIG_MEDIA_RC_SUPPORT=y
CONFIG_MEDIA_CEC_SUPPORT=y
CONFIG_MEDIA_CEC_RC=y
CONFIG_MEDIA_CONTROLLER=y
CONFIG_VIDEO_DEV=y
CONFIG_VIDEO_V4L2_SUBDEV_API=y
Expand All @@ -2840,6 +2845,33 @@ CONFIG_DVB_MAX_ADAPTERS=8
#
# Media drivers
#
CONFIG_RC_CORE=y
CONFIG_RC_MAP=y
# CONFIG_LIRC is not set
CONFIG_RC_DECODERS=y
CONFIG_IR_NEC_DECODER=y
CONFIG_IR_RC5_DECODER=y
CONFIG_IR_RC6_DECODER=y
CONFIG_IR_JVC_DECODER=y
CONFIG_IR_SONY_DECODER=y
CONFIG_IR_SANYO_DECODER=y
CONFIG_IR_SHARP_DECODER=y
CONFIG_IR_MCE_KBD_DECODER=y
CONFIG_IR_XMP_DECODER=y
# CONFIG_IR_IMON_DECODER is not set
CONFIG_RC_DEVICES=y
# CONFIG_RC_ATI_REMOTE is not set
# CONFIG_IR_HIX5HD2 is not set
# CONFIG_IR_IMON is not set
# CONFIG_IR_MCEUSB is not set
# CONFIG_IR_REDRAT3 is not set
# CONFIG_IR_STREAMZAP is not set
# CONFIG_IR_IGORPLUGUSB is not set
# CONFIG_IR_IGUANA is not set
# CONFIG_IR_TTUSBIR is not set
# CONFIG_RC_LOOPBACK is not set
CONFIG_IR_GPIO_CIR=m
# CONFIG_IR_SERIAL is not set
CONFIG_MEDIA_USB_SUPPORT=y

#
Expand All @@ -2861,10 +2893,14 @@ CONFIG_USB_VIDEO_CLASS=y
#
CONFIG_VIDEO_AU0828=m
CONFIG_VIDEO_AU0828_V4L2=y
# CONFIG_VIDEO_AU0828_RC is not set
# CONFIG_VIDEO_CX231XX is not set
# CONFIG_VIDEO_TM6000 is not set

#
# Digital TV USB devices
#
# CONFIG_DVB_USB is not set
CONFIG_DVB_USB_V2=y
CONFIG_DVB_USB_AF9015=m
CONFIG_DVB_USB_AF9035=m
Expand All @@ -2874,6 +2910,7 @@ CONFIG_DVB_USB_AZ6007=m
CONFIG_DVB_USB_CE6230=m
CONFIG_DVB_USB_EC168=m
CONFIG_DVB_USB_GL861=m
# CONFIG_DVB_USB_LME2510 is not set
CONFIG_DVB_USB_MXL111SF=m
CONFIG_DVB_USB_RTL28XXU=m
CONFIG_DVB_USB_DVBSKY=m
Expand Down Expand Up @@ -2926,6 +2963,7 @@ CONFIG_DVB_B2C2_FLEXCOP=m
#
# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
CONFIG_MEDIA_ATTACH=y
CONFIG_VIDEO_IR_I2C=y

#
# I2C Encoders, decoders, sensors and other helper chips
Expand Down Expand Up @@ -3801,6 +3839,7 @@ CONFIG_HID_PICOLCD=m
CONFIG_HID_PICOLCD_FB=y
CONFIG_HID_PICOLCD_BACKLIGHT=y
CONFIG_HID_PICOLCD_LEDS=y
# CONFIG_HID_PICOLCD_CIR is not set
CONFIG_HID_PLANTRONICS=m
CONFIG_HID_PRIMAX=m
CONFIG_HID_ROCCAT=m
Expand Down
16 changes: 6 additions & 10 deletions config/sources/families/rk322x.conf
Expand Up @@ -3,7 +3,7 @@ BOOTENV_FILE='rk322x.txt'
OVERLAY_PREFIX='rk322x'
UBOOT_TARGET_MAP="all u-boot.itb;;u-boot-rk322x-with-spl.bin"
BOOTDELAY=0
BOOTBRANCH='tag:v2020.04'
BOOTBRANCH='tag:v2020.07'
ARCH=armhf
SERIALCON=ttyS2

Expand All @@ -19,7 +19,7 @@ case $BRANCH in

current)

KERNELBRANCH='branch:linux-5.7.y'
KERNELBRANCH='branch:linux-5.8.y'
AUFS=no

;;
Expand Down Expand Up @@ -57,7 +57,7 @@ uboot_custom_postprocess()
# tools/mkimage -n rk322x -T rksd -d tpl/u-boot-tpl.bin u-boot-rk322x-with-spl.bin
#

tools/mkimage -n rk322x -T rksd -d $SRC/packages/blobs/rockchip/rk322x_ddr2_300_ddr3_600_v1.09.bin u-boot-rk322x-with-spl.bin
tools/mkimage -n rk322x -T rksd -d $SRC/packages/blobs/rockchip/rk322x_ddr3_600MHz_ddr2_330MHz_v1.10.bin u-boot-rk322x-with-spl.bin
cat spl/u-boot-spl.bin >> u-boot-rk322x-with-spl.bin
dd if=u-boot.itb of=u-boot-rk322x-with-spl.bin seek=$((0x200 - 0x40)) conv=notrunc

Expand Down Expand Up @@ -97,13 +97,9 @@ family_tweaks_bsp()
cp $SRC/packages/bsp/rockchip/asound.conf $destination/etc/
cp $SRC/packages/bsp/rockchip/89-pulseaudio-usb.rules $destination/etc/udev/rules.d

# For rk322x boards copy ssv6051 wifi firmware files to /etc/firmware
# We don't want to copy it into /lib/firmware to not interfere with armbian
# firmware deb package, so for now put them in a separate position
mkdir -p $destination/etc/firmware
cp $SRC/packages/blobs/ssv6051/ssv6051-wifi.cfg $destination/etc/firmware
cp $SRC/packages/blobs/ssv6051/ssv6051-sw.bin $destination/etc/firmware
echo "options ssv6051 stacfgpath=/etc/firmware/ssv6051-wifi.cfg cfgfirmwarepath=/etc/firmware/" > $destination/etc/modprobe.d/ssv6051.conf
# esp8089 wifi driver modprobe default configuration options
mkdir -p $destination/etc/modprobe.d
cp $SRC/packages/bsp/rk322x/esp8089.conf $destination/etc/modprobe.d/esp8089.conf

# Board selection script
install -m 755 $SRC/packages/bsp/rk322x/rk322x-config $destination/usr/local/bin
Expand Down
Binary file not shown.
Binary file modified packages/blobs/rockchip/rk322x_tee.bin
Binary file not shown.
Binary file removed packages/blobs/ssv6051/ssv6051-sw.bin
Binary file not shown.
91 changes: 0 additions & 91 deletions packages/blobs/ssv6051/ssv6051-wifi.cfg

This file was deleted.

13 changes: 8 additions & 5 deletions packages/bsp/rk322x/40-serverflags.conf
@@ -1,10 +1,13 @@
Section "ServerFlags"
Option "AutoAddGPU" "off"
Option "AutoAddGPU" "off"
Option "Debug" "dmabuf_capable"
EndSection

Section "Device"
Identifier "meson"
Driver "modesetting"
Option "kmsdev" "/dev/dri/card0"
Section "OutputClass"
Identifier "Lima"
Driver "modesetting"
MatchDriver "rockchip"
Option "AccelMethod" "none"
Option "PrimaryGPU" "true"
EndSection

1 change: 1 addition & 0 deletions packages/bsp/rk322x/esp8089.conf
@@ -0,0 +1 @@
options esp8089 crystal_26M_en=0

1 comment on commit bd17d4d

@igorpecovnik
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am getting some error
rk322x-box (rk322x) legacy
arch/arm/boot/dts/rk322x-box.dtb: ERROR (phandle_references): Reference to non-existent node or label "ramoops_mem"

Please sign in to comment.