mirror of
https://github.com/Fishwaldo/build.git
synced 2025-03-15 11:21:29 +00:00
Merge pull request #2802 from armbian/master
Sync branch Tinker-2 with trunk
This commit is contained in:
Tony
GitHub
commit
c3da3778ad
27 changed files with 550 additions and 137 deletions
|
|
@ -38,9 +38,12 @@ build tools</h3>
|
|||
## What do you need to get started?
|
||||
|
||||
- x64 machine with at least 2GB of memory and ~35GB of disk space for a VM, container or native OS,
|
||||
- Ubuntu Focal 20.04 x64 for native building or any [Docker](https://docs.armbian.com/Developer-Guide_Building-with-Docker/) capable x64 Linux for containerised,
|
||||
- Ubuntu Hirsute 21.04 x64 for native building or any [Docker](https://docs.armbian.com/Developer-Guide_Building-with-Docker/) capable x64 Linux for containerised,
|
||||
- Hirsute is required for newer non-LTS releases.. ex: Bullseye, Sid, Groovy, Hirsute
|
||||
- If building for LTS releases.. ex: Focal, Bionic, Buster, it is possible to use Ubuntu 20.04 Focal, but it is not supported
|
||||
- superuser rights (configured sudo or root access).
|
||||
|
||||
|
||||
<p align=right><a href=#table-of-contents>⇧</a></p>
|
||||
|
||||
## How to build an image or a kernel?
|
||||
|
|
|
|||
|
|
@ -6,6 +6,12 @@ if [ -f /etc/pulse/default.pa ]; then sed "s/load-module module-udev-detect$/& t
|
|||
|
||||
# set wallpapper to armbian
|
||||
|
||||
keys=/etc/dconf/db/local.d/00-bg
|
||||
profile=/etc/dconf/profile/user
|
||||
|
||||
install -Dv /dev/null $keys
|
||||
install -Dv /dev/null $profile
|
||||
|
||||
echo "[org/budgie/desktop/background]
|
||||
picture-uri='file:///usr/share/backgrounds/armbian/armbian03-Dre0x-Minum-dark-3840x2160.jpg'
|
||||
picture-options='zoom'
|
||||
|
|
@ -18,16 +24,6 @@ picture-options='zoom'
|
|||
primary-color='#456789'
|
||||
secondary-color='#FFFFFF'" >> $keys
|
||||
|
||||
echo "/org/budgie/desktop/background/picture-uri
|
||||
/org/budgie/desktop/background/picture-options
|
||||
/org/budgie/desktop/background/primary-color
|
||||
/org/budgie/desktop/background/secondary-color
|
||||
|
||||
/org/budgie/desktop/screensaver/picture-uri
|
||||
/org/budgie/desktop/screensaver/picture-options
|
||||
/org/budgie/desktop/screensaver/primary-color
|
||||
/org/budgie/desktop/screensaver/secondary-color" >> $locks
|
||||
|
||||
echo "user-db:user
|
||||
system-db:local" >> $profile
|
||||
|
||||
|
|
|
|||
|
|
@ -6,6 +6,12 @@ if [ -f /etc/pulse/default.pa ]; then sed "s/load-module module-udev-detect$/& t
|
|||
|
||||
# set wallpapper to armbian
|
||||
|
||||
keys=/etc/dconf/db/local.d/00-bg
|
||||
profile=/etc/dconf/profile/user
|
||||
|
||||
install -Dv /dev/null $keys
|
||||
install -Dv /dev/null $profile
|
||||
|
||||
echo "[org/cinnamon/desktop/background]
|
||||
picture-uri='file:///usr/share/backgrounds/armbian/armbian03-Dre0x-Minum-dark-3840x2160.jpg'
|
||||
picture-options='zoom'
|
||||
|
|
@ -18,16 +24,6 @@ picture-options='zoom'
|
|||
primary-color='#456789'
|
||||
secondary-color='#FFFFFF'" >> $keys
|
||||
|
||||
echo "/org/cinnamon/desktop/background/picture-uri
|
||||
/org/cinnamon/desktop/background/picture-options
|
||||
/org/cinnamon/desktop/background/primary-color
|
||||
/org/cinnamon/desktop/background/secondary-color
|
||||
|
||||
/org/cinnamon/desktop/screensaver/picture-uri
|
||||
/org/cinnamon/desktop/screensaver/picture-options
|
||||
/org/cinnamon/desktop/screensaver/primary-color
|
||||
/org/cinnamon/desktop/screensaver/secondary-color" >> $locks
|
||||
|
||||
echo "user-db:user
|
||||
system-db:local" >> $profile
|
||||
|
||||
|
|
|
|||
|
|
@ -5,6 +5,11 @@ if [ -d /etc/armbian/lightdm ]; then cp -R /etc/armbian/lightdm /etc/; fi
|
|||
if [ -f /etc/pulse/default.pa ]; then sed "s/load-module module-udev-detect$/& tsched=0/g" -i /etc/pulse/default.pa; fi
|
||||
|
||||
# set wallpapper to armbian
|
||||
keys=/etc/dconf/db/local.d/00-bg
|
||||
profile=/etc/dconf/profile/user
|
||||
|
||||
install -Dv /dev/null $keys
|
||||
install -Dv /dev/null $profile
|
||||
|
||||
echo "[org/gnome/desktop/background]
|
||||
picture-uri='file:///usr/share/backgrounds/armbian/armbian03-Dre0x-Minum-dark-3840x2160.jpg'
|
||||
|
|
@ -18,16 +23,6 @@ picture-options='zoom'
|
|||
primary-color='#456789'
|
||||
secondary-color='#FFFFFF'" >> $keys
|
||||
|
||||
echo "/org/gnome/desktop/background/picture-uri
|
||||
/org/gnome/desktop/background/picture-options
|
||||
/org/gnome/desktop/background/primary-color
|
||||
/org/gnome/desktop/background/secondary-color
|
||||
|
||||
/org/gnome/desktop/screensaver/picture-uri
|
||||
/org/gnome/desktop/screensaver/picture-options
|
||||
/org/gnome/desktop/screensaver/primary-color
|
||||
/org/gnome/desktop/screensaver/secondary-color" >> $locks
|
||||
|
||||
echo "user-db:user
|
||||
system-db:local" >> $profile
|
||||
|
||||
|
|
|
|||
|
|
@ -6,6 +6,12 @@ if [ -f /etc/pulse/default.pa ]; then sed "s/load-module module-udev-detect$/& t
|
|||
|
||||
# set wallpapper to armbian
|
||||
|
||||
keys=/etc/dconf/db/local.d/00-bg
|
||||
profile=/etc/dconf/profile/user
|
||||
|
||||
install -Dv /dev/null $keys
|
||||
install -Dv /dev/null $profile
|
||||
|
||||
echo "[org/mate/desktop/background]
|
||||
picture-filename='/usr/share/backgrounds/armbian/armbian03-Dre0x-Minum-dark-3840x2160.jpg'
|
||||
picture-options='zoom'
|
||||
|
|
@ -18,16 +24,6 @@ picture-options='zoom'
|
|||
primary-color='#456789'
|
||||
secondary-color='#FFFFFF'" >> $keys
|
||||
|
||||
echo "/org/mate/desktop/background/picture-filename
|
||||
/org/mate/desktop/background/picture-options
|
||||
/org/mate/desktop/background/primary-color
|
||||
/org/mate/desktop/background/secondary-color
|
||||
|
||||
/org/mate/screensaver/picture-filename
|
||||
/org/mate/screensaver/picture-options
|
||||
/org/mate/screensaver/primary-color
|
||||
/org/mate/screensaver/secondary-color" >> $locks
|
||||
|
||||
echo "user-db:user
|
||||
system-db:local" >> $profile
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ gir1.2-gdm-1.0 gir1.2-geoclue-2.0 gir1.2-gnomebluetooth-1.0 gir1.2-gnomedesktop-
|
|||
gir1.2-json-1.0 gir1.2-mutter-7 gir1.2-nm-1.0 gir1.2-nma-1.0 gir1.2-polkit-1.0 gir1.2-rsvg-2.0 gir1.2-soup-2.4 gir1.2-upowerglib-1.0 gjs
|
||||
gnome-desktop3-data gnome-keyring gnome-session-bin gnome-session-common gnome-settings-daemon gnome-settings-daemon-common gnome-shell
|
||||
gnome-shell-common hunspell-en-us libaccountsservice0 libaspell15 libcamel-1.2-62 libebackend-1.2-10 libebook-1.2-20 libebook-contacts-1.2-3
|
||||
libecal-2.0-1 libedata-book-1.2-26 libedata-cal-2.0-1 libedataserver-1.2-25 libedataserverui-1.2-2 libenchant-2-2 libfontenc1 libgck-1-0
|
||||
libecal-2.0-1 libedata-book-1.2-26 libedata-cal-2.0-1 libedataserver-1.2-26 libedataserverui-1.2-3 libenchant-2-2 libfontenc1 libgck-1-0
|
||||
libgcr-base-3-1 libgcr-ui-3-1 libgdata-common libgdata22 libgdm1 libgeoclue-2-0 libgeocode-glib0 libgjs0g libgnome-autoar-0-0 libgnome-bluetooth13
|
||||
libgnome-desktop-3-19 libgoa-1.0-0b libgoa-1.0-common libgraphene-1.0-0 libgweather-3-16 libgweather-common libibus-1.0-5 libical3 libimobiledevice6
|
||||
libjavascriptcoregtk-4.0-18 libmutter-7-0 libnma0 libphonenumber8 libplist3 libprotobuf23 libtext-iconv-perl libunwind8 libupower-glib3 libusbmuxd6
|
||||
|
|
|
|||
|
|
@ -0,0 +1,14 @@
|
|||
# install lightdm greeter
|
||||
cp -R "${SRC}"/packages/blobs/desktop/lightdm "${destination}"/etc/armbian
|
||||
|
||||
# install default desktop settings
|
||||
mkdir -p "${destination}"/etc/skel
|
||||
cp -R "${SRC}"/packages/blobs/desktop/skel/. "${destination}"/etc/skel
|
||||
|
||||
# install logo for login screen
|
||||
mkdir -p "${destination}"/usr/share/pixmaps/armbian
|
||||
cp "${SRC}"/packages/blobs/desktop/icons/armbian.png "${destination}"/usr/share/pixmaps/armbian
|
||||
|
||||
# install wallpapers
|
||||
mkdir -p "${destination}"/usr/share/backgrounds/armbian/
|
||||
cp "${SRC}"/packages/blobs/desktop/wallpapers/armbian*.jpg "${destination}"/usr/share/backgrounds/armbian/
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
xserver-xorg xserver-xorg-video-fbdev xfonts-base xinit x11-xserver-utils xinit xorg-docs-core x11-apps xorg-docs xscreensaver xfonts-100dpi
|
||||
xfonts-75dpi xfonts-base xfonts-encodings xfonts-scalable xfonts-utils xcursor-themes xdg-user-dirs xdg-user-dirs-gtk keyutils redshift dbus-x11
|
||||
xwallpaper xterm xtermcontrol xtermset arandr libxcursor1 xcursor-themes mousetweaks xbacklight brltty brltty-x11
|
||||
lightdm lightdm-gtk-greeter lightdm-settings lightdm-gtk-greeter-settings numix-gtk-theme
|
||||
bluez bluez-tools bluez-cups blueman gnome-bluetooth libgnome-bluetooth13
|
||||
libgl1-mesa-dri policykit-1 profile-sync-daemon nitrogen thunar
|
||||
i3 i3-wm libev4 libxcb-cursor0 i3lock i3status dunst libanyevent-i3-perl libjson-xs-perl
|
||||
xtitle xttitle vifm terminator conky conky-all rofi compton feh
|
||||
fonts-arphic-ukai fonts-arphic-uming fonts-dejavu-core fonts-freefont-ttf fonts-guru fonts-guru-extra fonts-kacst fonts-kacst-one fonts-khmeros-core
|
||||
fonts-liberation fonts-opensymbol fonts-nanum fonts-stix fonts-symbola
|
||||
libfont-afm-perl libfontconfig1 libfontembed1 libfontenc1 gnome-font-viewer fontconfig fontconfig-config
|
||||
policykit-desktop-privileges policykit-1-gnome
|
||||
network-manager-pptp network-manager-l2tp network-manager-openconnect network-manager-openvpn network-manager-openvpn-gnome network-manager-vpnc
|
||||
libproxy1-plugin-gsettings libproxy1-plugin-networkmanager libproxy1-plugin-gsettings
|
||||
pamix pasystray pavucontrol pavumeter pavucontrol-qt pulseaudio-module-bluetooth gstreamer1.0-pulseaudio gstreamer1.0-packagekit
|
||||
gstreamer1.0-plugins-base-apps
|
||||
libu2f-udev libwmf0.2-7-gtk openprinting-ppds hplip system-config-printer-gnome indicator-printers
|
||||
p7zip-full zip anacron doc-base foomatic-db-compressed-ppds
|
||||
ghostscript-x inputattach kerneloops language-pack-en libatk-adaptor libgail-common libnotify-bin software-properties-gtk speech-dispatcher
|
||||
spice-vdagent dictionaries-common hunspell-en-us
|
||||
cups cups-bsd cups-client cups-filters system-config-printer system-config-printer-common printer-driver-all
|
||||
samba smbclient cifs-utils
|
||||
ubuntu-drivers-common ubuntu-docs ubuntu-wallpapers ubuntu-wallpapers-hirsute ttf-ubuntu-font-family fonts-ubuntu-font-family-console
|
||||
tracker tracker-extract tracker-miner-fs update-inetd update-manager update-manager-core update-notifier update-notifier-common
|
||||
laptop-detect usb-creator-common usb-creator-gtk overlay-scrollbar overlay-scrollbar-gtk2
|
||||
gnome-system-monitor gnome-system-tools gnome-power-manager gnome-orca evince evince-common caffeine lxappearance gdebi
|
||||
apport-gtk dmz-cursor-theme libgsettings-qt1 libappindicator3-1 gir1.2-appindicator3-0.1 gromit
|
||||
totem totem-common totem-plugins
|
||||
|
|
@ -0,0 +1 @@
|
|||
gdm3
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
# overwrite stock lightdm greeter configuration
|
||||
if [ -d /etc/armbian/lightdm ]; then cp -R /etc/armbian/lightdm /etc/; fi
|
||||
|
||||
# Disable Pulseaudio timer scheduling which does not work with sndhdmi driver
|
||||
if [ -f /etc/pulse/default.pa ]; then sed "s/load-module module-udev-detect$/& tsched=0/g" -i /etc/pulse/default.pa; fi
|
||||
|
||||
# set wallpapper to armbian
|
||||
|
||||
|
||||
1
config/desktop/hirsute/environments/i3-wm/only_for
Normal file
1
config/desktop/hirsute/environments/i3-wm/only_for
Normal file
|
|
@ -0,0 +1 @@
|
|||
arm64
|
||||
1
config/desktop/hirsute/environments/i3-wm/support
Normal file
1
config/desktop/hirsute/environments/i3-wm/support
Normal file
|
|
@ -0,0 +1 @@
|
|||
csc
|
||||
|
|
@ -1 +1 @@
|
|||
csc
|
||||
supported
|
||||
|
|
|
|||
|
|
@ -1,11 +1,14 @@
|
|||
# install custom xorg for pinebook-pro
|
||||
cp -R "${SRC}"/packages/bsp/pinebook-pro/xorg.conf "${destination}"/etc/X11/xorg.conf.d/
|
||||
mkdir -p "${destination}"/etc/X11/
|
||||
cp -R "${SRC}"/packages/bsp/pinebook-pro/xorg.conf "${destination}"/etc/X11/
|
||||
|
||||
# install custom asound state for pinebook-pro
|
||||
cp -R "${SRC}"/packages/asound.state/ "${destination}"/etc/
|
||||
cp -R "${SRC}"/packages/blobs/asound.state/asound.state.pinebook-pro "${destination}"/etc/
|
||||
|
||||
## touchpad and keyboard tweaks
|
||||
mkdir -p $destination/etc/X11/xorg.conf.d/
|
||||
# from https://github.com/ayufan-rock64/linux-package/tree/master/root-pinebookpro
|
||||
cp $SRC/packages/bsp/pinebook-pro/40-pinebookpro-touchpad.conf $destination/etc/X11/xorg.conf.d/
|
||||
#keyboard hwdb
|
||||
mkdir -p $destination/etc/udev/hwdb.d/
|
||||
cp $SRC/packages/bsp/pinebook-pro/10-usb-kbd.hwdb $destination/etc/udev/hwdb.d/
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# powerconfig, touchpad, and special keys
|
||||
cp $SRC/packages/bsp/pinebook-pro/xfce4-power-manager.xml ${SDCARD}/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/
|
||||
cp $SRC/packages/bsp/pinebook-pro/pointers.xml ${SDCARD}/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/
|
||||
cp $SRC/packages/bsp/pinebook-pro/xfce4-keyboard-shortcuts.xml ${SDCARD}/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/
|
||||
cp $SRC/packages/bsp/pinebook-pro/xfce4-power-manager.xml $destination/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/
|
||||
cp $SRC/packages/bsp/pinebook-pro/pointers.xml $destination/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/
|
||||
cp $SRC/packages/bsp/pinebook-pro/xfce4-keyboard-shortcuts.xml $destination/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/
|
||||
|
|
|
|||
|
|
@ -371,22 +371,6 @@ family_tweaks_bsp()
|
|||
fi
|
||||
fi
|
||||
|
||||
if [[ $BOARD == pinebook-pro ]]; then
|
||||
|
||||
## accelerated X
|
||||
cp $SRC/packages/bsp/pinebook-pro/xorg.conf $destination/etc/X11/
|
||||
## touchpad and keyboard tweaks
|
||||
# from https://github.com/ayufan-rock64/linux-package/tree/master/root-pinebookpro
|
||||
cp $SRC/packages/bsp/pinebook-pro/40-pinebookpro-touchpad.conf $destination/etc/X11/xorg.conf.d/
|
||||
mkdir -p $destination/etc/udev/hwdb.d/
|
||||
cp $SRC/packages/bsp/pinebook-pro/10-usb-kbd.hwdb $destination/etc/udev/hwdb.d/
|
||||
## brightness and power management defaults
|
||||
mkdir -p $destination/usr/local/share/xdg/xfce4/xfconf/xfce-perchannel-xml/
|
||||
cp $SRC/packages/bsp/pinebook-pro/xfce4-power-manager.xml $destination/usr/local/share/xdg/xfce4/xfconf/xfce-perchannel-xml/
|
||||
## additional keyboard configs in lib/desktop.sh
|
||||
|
||||
fi
|
||||
|
||||
if [[ $BOARD == helios64 ]]; then
|
||||
|
||||
mkdir -p $destination/etc/udev/rules.d/
|
||||
|
|
|
|||
|
|
@ -115,6 +115,11 @@ pinebook-pro current focal desktop beta
|
|||
pinebook-pro current focal desktop beta yes gnome config_base 3dsupport,browsers,chat,desktop_tools,editors,email,internet,multimedia,office,programming,remote_desktop
|
||||
pinebook-pro current focal desktop beta yes mate config_base 3dsupport,browsers,chat,desktop_tools,editors,email,internet,multimedia,office,programming,remote_desktop
|
||||
pinebook-pro current focal desktop beta yes xfce config_base 3dsupport,browsers,chat,desktop_tools,editors,email,internet,multimedia,office,programming,remote_desktop
|
||||
pinebook-pro current hirsute desktop beta yes budgie config_base 3dsupport,browsers,chat,desktop_tools,editors,email,internet,multimedia,office,programming,remote_desktop
|
||||
pinebook-pro current hirsute desktop beta yes cinnamon config_base 3dsupport,browsers,chat,desktop_tools,editors,email,internet,multimedia,office,programming,remote_desktop
|
||||
pinebook-pro current hirsute desktop beta yes gnome config_base 3dsupport,browsers,chat,desktop_tools,editors,email,internet,multimedia,office,programming,remote_desktop
|
||||
pinebook-pro current hirsute desktop beta yes mate config_base 3dsupport,browsers,chat,desktop_tools,editors,email,internet,multimedia,office,programming,remote_desktop
|
||||
pinebook-pro current hirsute desktop beta yes xfce config_base 3dsupport,browsers,chat,desktop_tools,editors,email,internet,multimedia,office,programming,remote_desktop
|
||||
|
||||
|
||||
# Pine H64
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
FROM ubuntu:20.04
|
||||
FROM ubuntu:21.04
|
||||
ARG DEBIAN_FRONTEND=noninteractive
|
||||
RUN apt-get update \
|
||||
&& apt-get install -y --no-install-recommends \
|
||||
|
|
|
|||
|
|
@ -42,40 +42,40 @@ compilation_prepare()
|
|||
|
||||
if [[ "${version}" == "4.19."* ]] && [[ "$LINUXFAMILY" == sunxi* || "$LINUXFAMILY" == meson64 || \
|
||||
"$LINUXFAMILY" == mvebu64 || "$LINUXFAMILY" == mt7623 || "$LINUXFAMILY" == mvebu ]]; then
|
||||
display_alert "Adjustin" "packaging" "info"
|
||||
display_alert "Adjusting" "packaging" "info"
|
||||
cd "$kerneldir" || exit
|
||||
process_patch_file "${SRC}/patch/misc/general-packaging-4.19.y.patch" "applying"
|
||||
fi
|
||||
|
||||
if [[ "${version}" == "4.14."* ]] && [[ "$LINUXFAMILY" == s5p6818 || "$LINUXFAMILY" == mvebu64 || \
|
||||
"$LINUXFAMILY" == imx7d || "$LINUXFAMILY" == odroidxu4 || "$LINUXFAMILY" == mvebu ]]; then
|
||||
display_alert "Adjustin" "packaging" "info"
|
||||
display_alert "Adjusting" "packaging" "info"
|
||||
cd "$kerneldir" || exit
|
||||
process_patch_file "${SRC}/patch/misc/general-packaging-4.14.y.patch" "applying"
|
||||
fi
|
||||
|
||||
if [[ "${version}" == "4.4."* || "${version}" == "4.9."* ]] && \
|
||||
[[ "$LINUXFAMILY" == rockpis || "$LINUXFAMILY" == rk3399 ]]; then
|
||||
display_alert "Adjustin" "packaging" "info"
|
||||
display_alert "Adjusting" "packaging" "info"
|
||||
cd "$kerneldir" || exit
|
||||
process_patch_file "${SRC}/patch/misc/general-packaging-4.4.y-rk3399.patch" "applying"
|
||||
fi
|
||||
|
||||
if [[ "${version}" == "4.4."* ]] && \
|
||||
[[ "$LINUXFAMILY" == rockchip64 || "$LINUXFAMILY" == station* ]]; then
|
||||
display_alert "Adjustin" "packaging" "info"
|
||||
display_alert "Adjusting" "packaging" "info"
|
||||
cd "$kerneldir" || exit
|
||||
process_patch_file "${SRC}/patch/misc/general-packaging-4.4.y-rockchip64.patch" "applying"
|
||||
fi
|
||||
|
||||
if [[ "${version}" == "4.4."* ]] && [[ "$LINUXFAMILY" == rockchip || "$LINUXFAMILY" == rk322x ]]; then
|
||||
display_alert "Adjustin" "packaging" "info"
|
||||
display_alert "Adjusting" "packaging" "info"
|
||||
cd "$kerneldir" || exit
|
||||
process_patch_file "${SRC}/patch/misc/general-packaging-4.4.y.patch" "applying"
|
||||
fi
|
||||
|
||||
if [[ "${version}" == "4.9."* ]] && [[ "$LINUXFAMILY" == meson64 || "$LINUXFAMILY" == odroidc4 ]]; then
|
||||
display_alert "Adjustin" "packaging" "info"
|
||||
display_alert "Adjusting" "packaging" "info"
|
||||
cd "$kerneldir" || exit
|
||||
process_patch_file "${SRC}/patch/misc/general-packaging-4.9.y.patch" "applying"
|
||||
fi
|
||||
|
|
@ -586,7 +586,7 @@ compilation_prepare()
|
|||
|
||||
|
||||
if linux-version compare $version ge 4.4 && linux-version compare $version lt 5.8; then
|
||||
display_alert "Adjustin" "Framebuffer driver for ST7789 IPS display" "info"
|
||||
display_alert "Adjusting" "Framebuffer driver for ST7789 IPS display" "info"
|
||||
process_patch_file "${SRC}/patch/misc/fbtft-st7789v-invert-color.patch" "applying"
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -9,12 +9,16 @@ BACKTITLE="Armbian RK322x device tree board selection | Paolo Sabatino"
|
|||
TITLE="Board configuration"
|
||||
MENU_TITLE="Please choose your board"
|
||||
|
||||
COLOR_RED="\Z1"
|
||||
COLOR_BLACK="\Z0"
|
||||
|
||||
CONFIRM_FLASH_MISMATCH="\nYour board has a type of internal memory but you \
|
||||
selected a board without support for that.\n\nYou will not be able to detect \
|
||||
the internal memory and your system may not boot anymore\n\nAre you sure?"
|
||||
|
||||
COLOR_RED="\Z1"
|
||||
COLOR_BLACK="\Z0"
|
||||
NOTE_LED_GPIO_SELECTION="${COLOR_RED}Important:${COLOR_BLACK} select the \
|
||||
led/gpio configuration looking on the markings of the board.\nThe right \
|
||||
configuration may solve problems with devices detection like leds,\nwifi and bluetooth\n\n"
|
||||
|
||||
EFUSE_PATH="/sys/bus/nvmem/devices/rockchip-efuse0/nvmem"
|
||||
SDIO_WIFI_PATH="/sys/bus/sdio/devices/mmc1:0001:1"
|
||||
|
|
@ -57,9 +61,10 @@ DT_FLASH_OVERLAYS+=(["emmc"]="eMMC only flash memory")
|
|||
DT_FLASH_OVERLAYS+=(["nand"]="NAND only flash memory")
|
||||
DT_FLASH_OVERLAYS+=(["emmc-nand"]="eMMC or NAND flash memory")
|
||||
|
||||
DT_LED_OVERLAYS+=(["led-conf1"]="LED configuration #1 (Chiptrip)")
|
||||
DT_LED_OVERLAYS+=(["led-conf2"]="LED configuration #2 (R329q)")
|
||||
DT_LED_OVERLAYS+=(["led-conf3"]="LED configuration #3 (R28-MXQ)")
|
||||
DT_LED_OVERLAYS+=(["led-conf1"]="Chiptrip brand (MX1VR, MX4VR)")
|
||||
DT_LED_OVERLAYS+=(["led-conf2"]="R329q, MXQ-RK3229")
|
||||
DT_LED_OVERLAYS+=(["led-conf3"]="R28-MXQ")
|
||||
DT_LED_OVERLAYS+=(["led-conf4"]="T066/T066-V2")
|
||||
|
||||
DT_CPU_OVERLAYS+=(["cpu-hs"]="RK3228B or RK3229")
|
||||
|
||||
|
|
@ -323,7 +328,7 @@ function select_led_configuration() {
|
|||
DIALOG_ENTRIES+=($KEY "${DT_LED_OVERLAYS[$KEY]}")
|
||||
done
|
||||
|
||||
MENU_TITLE="${BOARD_INFO}Select the led wiring configuation\n"
|
||||
MENU_TITLE="${BOARD_INFO}${NOTE_LED_GPIO_SELECTION}"
|
||||
|
||||
MENU_CMD=(dialog --colors --backtitle "$BACKTITLE" --title "$TITLE" --default-item "$SELECTION" --menu "$MENU_TITLE" 24 0 20)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
diff --git a/arch/arm/boot/dts/rk322x-box.dts b/arch/arm/boot/dts/rk322x-box.dts
|
||||
new file mode 100644
|
||||
index 00000000..42436dbf
|
||||
index 00000000..fbd19649
|
||||
--- /dev/null
|
||||
+++ b/arch/arm/boot/dts/rk322x-box.dts
|
||||
@@ -0,0 +1,268 @@
|
||||
|
|
@ -246,29 +246,29 @@ index 00000000..42436dbf
|
|||
+ dr_mode = "host";
|
||||
+};
|
||||
+
|
||||
+&cpu0_opp_table {
|
||||
+// GPU voltages are raised a bit to raise logic voltage
|
||||
+// that has to handle DDR3@660 Mhz from ddrbin.
|
||||
+&gpu_opp_table {
|
||||
+
|
||||
+ opp-408000000 {
|
||||
+ opp-hz = /bits/ 64 <408000000>;
|
||||
+ opp-microvolt = <1050000 1050000 1400000>;
|
||||
+ opp-microvolt-L0 = <1050000 1050000 1400000>;
|
||||
+ opp-microvolt-L1 = <1050000 1050000 1400000>;
|
||||
+ clock-latency-ns = <40000>;
|
||||
+ opp-suspend;
|
||||
+ opp-200000000 {
|
||||
+ opp-hz = /bits/ 64 <200000000>;
|
||||
+ opp-microvolt = <1075000>;
|
||||
+ opp-microvolt-L0 = <1075000>;
|
||||
+ opp-microvolt-L1 = <1050000>;
|
||||
+ };
|
||||
+
|
||||
+ opp-600000000 {
|
||||
+ opp-hz = /bits/ 64 <600000000>;
|
||||
+ opp-microvolt = <1050000 1050000 1400000>;
|
||||
+ opp-microvolt-L0 = <1050000 1050000 1400000>;
|
||||
+ opp-microvolt-L1 = <1050000 1050000 1400000>;
|
||||
+ opp-300000000 {
|
||||
+ opp-hz = /bits/ 64 <300000000>;
|
||||
+ opp-microvolt = <1075000>;
|
||||
+ opp-microvolt-L0 = <1075000>;
|
||||
+ opp-microvolt-L1 = <1050000>;
|
||||
+ };
|
||||
+
|
||||
+ opp-816000000 {
|
||||
+ opp-hz = /bits/ 64 <816000000>;
|
||||
+ opp-microvolt = <1050000 1050000 1400000>;
|
||||
+ opp-microvolt-L0 = <1050000 1050000 1400000>;
|
||||
+ opp-microvolt-L1 = <1050000 1050000 1400000>;
|
||||
+ opp-500000000 {
|
||||
+ opp-hz = /bits/ 64 <500000000>;
|
||||
+ opp-microvolt = <1150000>;
|
||||
+ opp-microvolt-L0 = <1150000>;
|
||||
+ opp-microvolt-L1 = <1100000>;
|
||||
+ };
|
||||
+
|
||||
+};
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
diff --git a/arch/arm/boot/dts/overlay/Makefile b/arch/arm/boot/dts/overlay/Makefile
|
||||
new file mode 100755
|
||||
index 00000000..48eb5249
|
||||
index 00000000..abd197ed
|
||||
--- /dev/null
|
||||
+++ b/arch/arm/boot/dts/overlay/Makefile
|
||||
@@ -0,0 +1,27 @@
|
||||
@@ -0,0 +1,28 @@
|
||||
+# SPDX-License-Identifier: GPL-2.0
|
||||
+dtbo-$(CONFIG_ARCH_ROCKCHIP) += \
|
||||
+ rk322x-emmc.dtbo \
|
||||
|
|
@ -12,6 +12,7 @@ index 00000000..48eb5249
|
|||
+ rk322x-led-conf1.dtbo \
|
||||
+ rk322x-led-conf2.dtbo \
|
||||
+ rk322x-led-conf3.dtbo \
|
||||
+ rk322x-led-conf4.dtbo \
|
||||
+ rk322x-cpu-hs.dtbo \
|
||||
+ rk322x-cpu-stability.dtbo \
|
||||
+ rk322x-bluetooth.dtbo \
|
||||
|
|
@ -33,10 +34,10 @@ index 00000000..48eb5249
|
|||
+
|
||||
diff --git a/arch/arm/boot/dts/overlay/README.rk322x-overlays b/arch/arm/boot/dts/overlay/README.rk322x-overlays
|
||||
new file mode 100755
|
||||
index 00000000..1609a892
|
||||
index 00000000..8823a01d
|
||||
--- /dev/null
|
||||
+++ b/arch/arm/boot/dts/overlay/README.rk322x-overlays
|
||||
@@ -0,0 +1,79 @@
|
||||
@@ -0,0 +1,80 @@
|
||||
+This document describes overlays provided in the kernel packages
|
||||
+For generic Armbian overlays documentation please see
|
||||
+https://docs.armbian.com/User-Guide_Allwinner_overlays/
|
||||
|
|
@ -90,8 +91,9 @@ index 00000000..1609a892
|
|||
+usually choose a different GPIO for the auxiliary led, but the main "working"
|
||||
+led is always wired to the same gpio (although it may be active high or low)
|
||||
+led-conf1 is commonly found in boards made by Chiptrip manufacturer
|
||||
+led-conf2 is found in other boards with R329Q marking
|
||||
+led-conf2 is found in other boards with R329Q and MXQ_RK3229 marking
|
||||
+led-conf3 is found in boards with R28-MXQ marking
|
||||
+led-conf4 is found on boards with T066 marking
|
||||
+
|
||||
+### rk322x-bluetooth
|
||||
+
|
||||
|
|
@ -629,6 +631,180 @@ index 00000000..39f4547e
|
|||
+ };
|
||||
+
|
||||
+};
|
||||
diff --git a/arch/arm/boot/dts/overlay/rk322x-led-conf4.dts b/arch/arm/boot/dts/overlay/rk322x-led-conf4.dts
|
||||
new file mode 100644
|
||||
index 00000000..e9cda296
|
||||
--- /dev/null
|
||||
+++ b/arch/arm/boot/dts/overlay/rk322x-led-conf4.dts
|
||||
@@ -0,0 +1,81 @@
|
||||
+/dts-v1/;
|
||||
+/plugin/;
|
||||
+
|
||||
+#include <dt-bindings/gpio/gpio.h>
|
||||
+#include <dt-bindings/input/rk-input.h>
|
||||
+#include <dt-bindings/pinctrl/rockchip.h>
|
||||
+
|
||||
+/ {
|
||||
+
|
||||
+ fragment@0 {
|
||||
+ target-path = "/gpio-leds";
|
||||
+ __overlay__ {
|
||||
+
|
||||
+ working {
|
||||
+ gpios = <&gpio1 RK_PA2 GPIO_ACTIVE_HIGH>;
|
||||
+ linux,default-trigger = "none";
|
||||
+ };
|
||||
+
|
||||
+ auxiliary {
|
||||
+ gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_HIGH>;
|
||||
+ label = "auxiliary";
|
||||
+ linux,default-trigger = "mmc2";
|
||||
+ default-state = "off";
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&gpio_led_aux>;
|
||||
+ };
|
||||
+
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ fragment@1 {
|
||||
+ target-path = "/pinctrl/gpio";
|
||||
+ __overlay__ {
|
||||
+
|
||||
+ gpio_led_working: gpio-led-working {
|
||||
+ rockchip,pins = <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
+ };
|
||||
+
|
||||
+ gpio_led_aux: gpio-led-aux {
|
||||
+ rockchip,pins = <1 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
+ };
|
||||
+
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ fragment@2 {
|
||||
+ target = <&gpio_keys>;
|
||||
+ __overlay__ {
|
||||
+
|
||||
+ reset {
|
||||
+ gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_LOW>;
|
||||
+ label = "reset";
|
||||
+ linux,code = <KEY_RESTART>;
|
||||
+ debounce-interval = <200>;
|
||||
+ wakeup-source;
|
||||
+ };
|
||||
+
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ fragment@3 {
|
||||
+ target = <&sdio_pwrseq>;
|
||||
+ __overlay__ {
|
||||
+
|
||||
+ reset-gpios = <&gpio2 RK_PD3 GPIO_ACTIVE_LOW>; /* GPIO2_D3 */
|
||||
+
|
||||
+ };
|
||||
+
|
||||
+ };
|
||||
+
|
||||
+ fragment@4 {
|
||||
+ target = <&wifi_enable_h>;
|
||||
+ __overlay__ {
|
||||
+
|
||||
+ rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
+
|
||||
+ };
|
||||
+
|
||||
+ };
|
||||
+
|
||||
+};
|
||||
diff --git a/arch/arm/boot/dts/overlay/rk322x-led-conf5.dts b/arch/arm/boot/dts/overlay/rk322x-led-conf5.dts
|
||||
new file mode 100644
|
||||
index 00000000..e9cda296
|
||||
--- /dev/null
|
||||
+++ b/arch/arm/boot/dts/overlay/rk322x-led-conf5.dts
|
||||
@@ -0,0 +1,81 @@
|
||||
+/dts-v1/;
|
||||
+/plugin/;
|
||||
+
|
||||
+#include <dt-bindings/gpio/gpio.h>
|
||||
+#include <dt-bindings/input/rk-input.h>
|
||||
+#include <dt-bindings/pinctrl/rockchip.h>
|
||||
+
|
||||
+/ {
|
||||
+
|
||||
+ fragment@0 {
|
||||
+ target-path = "/gpio-leds";
|
||||
+ __overlay__ {
|
||||
+
|
||||
+ working {
|
||||
+ gpios = <&gpio1 RK_PA2 GPIO_ACTIVE_HIGH>;
|
||||
+ linux,default-trigger = "none";
|
||||
+ };
|
||||
+
|
||||
+ auxiliary {
|
||||
+ gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_HIGH>;
|
||||
+ label = "auxiliary";
|
||||
+ linux,default-trigger = "mmc2";
|
||||
+ default-state = "off";
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&gpio_led_aux>;
|
||||
+ };
|
||||
+
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ fragment@1 {
|
||||
+ target-path = "/pinctrl/gpio";
|
||||
+ __overlay__ {
|
||||
+
|
||||
+ gpio_led_working: gpio-led-working {
|
||||
+ rockchip,pins = <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
+ };
|
||||
+
|
||||
+ gpio_led_aux: gpio-led-aux {
|
||||
+ rockchip,pins = <1 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
+ };
|
||||
+
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ fragment@2 {
|
||||
+ target = <&gpio_keys>;
|
||||
+ __overlay__ {
|
||||
+
|
||||
+ reset {
|
||||
+ gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_LOW>;
|
||||
+ label = "reset";
|
||||
+ linux,code = <KEY_RESTART>;
|
||||
+ debounce-interval = <200>;
|
||||
+ wakeup-source;
|
||||
+ };
|
||||
+
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ fragment@3 {
|
||||
+ target = <&sdio_pwrseq>;
|
||||
+ __overlay__ {
|
||||
+
|
||||
+ reset-gpios = <&gpio2 RK_PD3 GPIO_ACTIVE_LOW>; /* GPIO2_D3 */
|
||||
+
|
||||
+ };
|
||||
+
|
||||
+ };
|
||||
+
|
||||
+ fragment@4 {
|
||||
+ target = <&wifi_enable_h>;
|
||||
+ __overlay__ {
|
||||
+
|
||||
+ rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
+
|
||||
+ };
|
||||
+
|
||||
+ };
|
||||
+
|
||||
+};
|
||||
diff --git a/arch/arm/boot/dts/overlay/rk322x-nand.dts b/arch/arm/boot/dts/overlay/rk322x-nand.dts
|
||||
new file mode 100755
|
||||
index 00000000..5675f5b3
|
||||
|
|
@ -731,10 +907,10 @@ index 00000000..f6a1a720
|
|||
+};
|
||||
diff --git a/arch/arm/boot/dts/overlay/rk322x-wlan-esp8089.dts b/arch/arm/boot/dts/overlay/rk322x-wlan-esp8089.dts
|
||||
new file mode 100755
|
||||
index 00000000..76c13a6b
|
||||
index 00000000..75a2ac8b
|
||||
--- /dev/null
|
||||
+++ b/arch/arm/boot/dts/overlay/rk322x-wlan-esp8089.dts
|
||||
@@ -0,0 +1,38 @@
|
||||
@@ -0,0 +1,24 @@
|
||||
+/dts-v1/;
|
||||
+/plugin/;
|
||||
+
|
||||
|
|
@ -758,20 +934,6 @@ index 00000000..76c13a6b
|
|||
+ };
|
||||
+ };
|
||||
+
|
||||
+ fragment@1 {
|
||||
+ target = <&sdio_pwrseq>;
|
||||
+ __overlay__ {
|
||||
+ reset-gpios = <&gpio2 27 GPIO_ACTIVE_LOW>;
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ fragment@2 {
|
||||
+ target = <&wifi_enable_h>;
|
||||
+ __overlay__ {
|
||||
+ rockchip,pins = <2 27 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+};
|
||||
diff --git a/arch/arm/boot/dts/overlay/rk322x-wlan-ssv6051.dts b/arch/arm/boot/dts/overlay/rk322x-wlan-ssv6051.dts
|
||||
new file mode 100755
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
diff --git a/arch/arm/boot/dts/rk322x-box.dts b/arch/arm/boot/dts/rk322x-box.dts
|
||||
new file mode 100644
|
||||
index 000000000..6f2c52cf5
|
||||
index 000000000..fc6f41c56
|
||||
--- /dev/null
|
||||
+++ b/arch/arm/boot/dts/rk322x-box.dts
|
||||
@@ -0,0 +1,462 @@
|
||||
@@ -0,0 +1,480 @@
|
||||
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
|
||||
+
|
||||
+/dts-v1/;
|
||||
|
|
@ -466,3 +466,21 @@ index 000000000..6f2c52cf5
|
|||
+ };
|
||||
+
|
||||
+};
|
||||
+
|
||||
+&gpu_opp_table {
|
||||
+
|
||||
+ opp-200000000 {
|
||||
+ opp-hz = /bits/ 64 <200000000>;
|
||||
+ opp-microvolt = <1075000>;
|
||||
+ };
|
||||
+
|
||||
+ opp-300000000 {
|
||||
+ opp-hz = /bits/ 64 <300000000>;
|
||||
+ opp-microvolt = <1075000>;
|
||||
+ };
|
||||
+
|
||||
+ opp-500000000 {
|
||||
+ opp-hz = /bits/ 64 <500000000>;
|
||||
+ opp-microvolt = <1150000>;
|
||||
+ };
|
||||
+};
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
diff --git a/arch/arm/boot/dts/overlay/Makefile b/arch/arm/boot/dts/overlay/Makefile
|
||||
new file mode 100755
|
||||
index 000000000..dfbda5299
|
||||
index 000000000..e39fd5d37
|
||||
--- /dev/null
|
||||
+++ b/arch/arm/boot/dts/overlay/Makefile
|
||||
@@ -0,0 +1,23 @@
|
||||
@@ -0,0 +1,24 @@
|
||||
+# SPDX-License-Identifier: GPL-2.0
|
||||
+dtbo-$(CONFIG_ARCH_ROCKCHIP) += \
|
||||
+ rk322x-emmc.dtbo \
|
||||
|
|
@ -12,6 +12,7 @@ index 000000000..dfbda5299
|
|||
+ rk322x-led-conf1.dtbo \
|
||||
+ rk322x-led-conf2.dtbo \
|
||||
+ rk322x-led-conf3.dtbo \
|
||||
+ rk322x-led-conf4.dtbo \
|
||||
+ rk322x-cpu-hs.dtbo \
|
||||
+ rk322x-wlan-alt-wiring.dtbo \
|
||||
+ rk322x-cpu-stability.dtbo
|
||||
|
|
@ -29,10 +30,10 @@ index 000000000..dfbda5299
|
|||
+
|
||||
diff --git a/arch/arm/boot/dts/overlay/README.rk322x-overlays b/arch/arm/boot/dts/overlay/README.rk322x-overlays
|
||||
new file mode 100755
|
||||
index 000000000..1abc378c9
|
||||
index 000000000..e4ea2f573
|
||||
--- /dev/null
|
||||
+++ b/arch/arm/boot/dts/overlay/README.rk322x-overlays
|
||||
@@ -0,0 +1,67 @@
|
||||
@@ -0,0 +1,68 @@
|
||||
+This document describes overlays provided in the kernel packages
|
||||
+For generic Armbian overlays documentation please see
|
||||
+https://docs.armbian.com/User-Guide_Allwinner_overlays/
|
||||
|
|
@ -92,9 +93,10 @@ index 000000000..1abc378c9
|
|||
+(ie: gpio and active low/high) of the onboard leds. Each board manufacturer
|
||||
+usually choose a different GPIO for the auxiliary led, but the main "working"
|
||||
+led is always wired to the same gpio (although it may be active high or low)
|
||||
+led-conf1 is suited for boards usually from chiptrip brand (xt-mx4vr, xt-mx1vr, ...)
|
||||
+led-conf2 is found on boards withs r329q marking
|
||||
+led-conf3 is found on boards with r28-mxq marking
|
||||
+led-conf1 is commonly found in boards made by Chiptrip manufacturer
|
||||
+led-conf2 is found in other boards with R329Q and MXQ_RK3229 marking
|
||||
+led-conf3 is found in boards with R28-MXQ marking
|
||||
+led-conf4 is found on boards with T066 marking
|
||||
+
|
||||
+### rk322x-alt-wiring
|
||||
+
|
||||
|
|
@ -470,6 +472,93 @@ index 000000000..03c99ef8b
|
|||
+ };
|
||||
+
|
||||
+};
|
||||
diff --git a/arch/arm/boot/dts/overlay/rk322x-led-conf4.dts b/arch/arm/boot/dts/overlay/rk322x-led-conf4.dts
|
||||
new file mode 100644
|
||||
index 000000000..0ebd846eb
|
||||
--- /dev/null
|
||||
+++ b/arch/arm/boot/dts/overlay/rk322x-led-conf4.dts
|
||||
@@ -0,0 +1,81 @@
|
||||
+/dts-v1/;
|
||||
+/plugin/;
|
||||
+
|
||||
+#include <dt-bindings/gpio/gpio.h>
|
||||
+#include <dt-bindings/input/input.h>
|
||||
+#include <dt-bindings/pinctrl/rockchip.h>
|
||||
+
|
||||
+/ {
|
||||
+
|
||||
+ fragment@0 {
|
||||
+ target-path = "/gpio-leds";
|
||||
+ __overlay__ {
|
||||
+
|
||||
+ working {
|
||||
+ gpios = <&gpio1 RK_PA2 GPIO_ACTIVE_HIGH>;
|
||||
+ linux,default-trigger = "none";
|
||||
+ };
|
||||
+
|
||||
+ auxiliary {
|
||||
+ gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_HIGH>;
|
||||
+ label = "auxiliary";
|
||||
+ linux,default-trigger = "mmc2";
|
||||
+ default-state = "off";
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&gpio_led_aux>;
|
||||
+ };
|
||||
+
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ fragment@1 {
|
||||
+ target-path = "/pinctrl/gpio";
|
||||
+ __overlay__ {
|
||||
+
|
||||
+ gpio_led_working: gpio-led-working {
|
||||
+ rockchip,pins = <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
+ };
|
||||
+
|
||||
+ gpio_led_aux: gpio-led-aux {
|
||||
+ rockchip,pins = <1 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
+ };
|
||||
+
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ fragment@2 {
|
||||
+ target = <&gpio_keys>;
|
||||
+ __overlay__ {
|
||||
+
|
||||
+ reset {
|
||||
+ gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_LOW>;
|
||||
+ label = "reset";
|
||||
+ linux,code = <KEY_RESTART>;
|
||||
+ debounce-interval = <200>;
|
||||
+ wakeup-source;
|
||||
+ };
|
||||
+
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ fragment@3 {
|
||||
+ target = <&sdio_pwrseq>;
|
||||
+ __overlay__ {
|
||||
+
|
||||
+ reset-gpios = <&gpio2 RK_PD3 GPIO_ACTIVE_LOW>; /* GPIO2_D3 */
|
||||
+
|
||||
+ };
|
||||
+
|
||||
+ };
|
||||
+
|
||||
+ fragment@4 {
|
||||
+ target = <&wifi_enable_h>;
|
||||
+ __overlay__ {
|
||||
+
|
||||
+ rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
+
|
||||
+ };
|
||||
+
|
||||
+ };
|
||||
+
|
||||
+};
|
||||
diff --git a/arch/arm/boot/dts/overlay/rk322x-nand.dts b/arch/arm/boot/dts/overlay/rk322x-nand.dts
|
||||
new file mode 100755
|
||||
index 000000000..2a939ab49
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
diff --git a/arch/arm/boot/dts/rk322x-box.dts b/arch/arm/boot/dts/rk322x-box.dts
|
||||
new file mode 100644
|
||||
index 000000000..6f2c52cf5
|
||||
index 000000000..fc6f41c56
|
||||
--- /dev/null
|
||||
+++ b/arch/arm/boot/dts/rk322x-box.dts
|
||||
@@ -0,0 +1,462 @@
|
||||
@@ -0,0 +1,480 @@
|
||||
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
|
||||
+
|
||||
+/dts-v1/;
|
||||
|
|
@ -466,3 +466,21 @@ index 000000000..6f2c52cf5
|
|||
+ };
|
||||
+
|
||||
+};
|
||||
+
|
||||
+&gpu_opp_table {
|
||||
+
|
||||
+ opp-200000000 {
|
||||
+ opp-hz = /bits/ 64 <200000000>;
|
||||
+ opp-microvolt = <1075000>;
|
||||
+ };
|
||||
+
|
||||
+ opp-300000000 {
|
||||
+ opp-hz = /bits/ 64 <300000000>;
|
||||
+ opp-microvolt = <1075000>;
|
||||
+ };
|
||||
+
|
||||
+ opp-500000000 {
|
||||
+ opp-hz = /bits/ 64 <500000000>;
|
||||
+ opp-microvolt = <1150000>;
|
||||
+ };
|
||||
+};
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
diff --git a/arch/arm/boot/dts/overlay/Makefile b/arch/arm/boot/dts/overlay/Makefile
|
||||
new file mode 100755
|
||||
index 000000000..dfbda5299
|
||||
index 000000000..e39fd5d37
|
||||
--- /dev/null
|
||||
+++ b/arch/arm/boot/dts/overlay/Makefile
|
||||
@@ -0,0 +1,23 @@
|
||||
@@ -0,0 +1,24 @@
|
||||
+# SPDX-License-Identifier: GPL-2.0
|
||||
+dtbo-$(CONFIG_ARCH_ROCKCHIP) += \
|
||||
+ rk322x-emmc.dtbo \
|
||||
|
|
@ -12,6 +12,7 @@ index 000000000..dfbda5299
|
|||
+ rk322x-led-conf1.dtbo \
|
||||
+ rk322x-led-conf2.dtbo \
|
||||
+ rk322x-led-conf3.dtbo \
|
||||
+ rk322x-led-conf4.dtbo \
|
||||
+ rk322x-cpu-hs.dtbo \
|
||||
+ rk322x-wlan-alt-wiring.dtbo \
|
||||
+ rk322x-cpu-stability.dtbo
|
||||
|
|
@ -29,10 +30,10 @@ index 000000000..dfbda5299
|
|||
+
|
||||
diff --git a/arch/arm/boot/dts/overlay/README.rk322x-overlays b/arch/arm/boot/dts/overlay/README.rk322x-overlays
|
||||
new file mode 100755
|
||||
index 000000000..1abc378c9
|
||||
index 000000000..e4ea2f573
|
||||
--- /dev/null
|
||||
+++ b/arch/arm/boot/dts/overlay/README.rk322x-overlays
|
||||
@@ -0,0 +1,67 @@
|
||||
@@ -0,0 +1,68 @@
|
||||
+This document describes overlays provided in the kernel packages
|
||||
+For generic Armbian overlays documentation please see
|
||||
+https://docs.armbian.com/User-Guide_Allwinner_overlays/
|
||||
|
|
@ -92,9 +93,10 @@ index 000000000..1abc378c9
|
|||
+(ie: gpio and active low/high) of the onboard leds. Each board manufacturer
|
||||
+usually choose a different GPIO for the auxiliary led, but the main "working"
|
||||
+led is always wired to the same gpio (although it may be active high or low)
|
||||
+led-conf1 is suited for boards usually from chiptrip brand (xt-mx4vr, xt-mx1vr, ...)
|
||||
+led-conf2 is found on boards withs r329q marking
|
||||
+led-conf3 is found on boards with r28-mxq marking
|
||||
+led-conf1 is commonly found in boards made by Chiptrip manufacturer
|
||||
+led-conf2 is found in other boards with R329Q and MXQ_RK3229 marking
|
||||
+led-conf3 is found in boards with R28-MXQ marking
|
||||
+led-conf4 is found on boards with T066 marking
|
||||
+
|
||||
+### rk322x-alt-wiring
|
||||
+
|
||||
|
|
@ -470,6 +472,93 @@ index 000000000..03c99ef8b
|
|||
+ };
|
||||
+
|
||||
+};
|
||||
diff --git a/arch/arm/boot/dts/overlay/rk322x-led-conf4.dts b/arch/arm/boot/dts/overlay/rk322x-led-conf4.dts
|
||||
new file mode 100644
|
||||
index 000000000..0ebd846eb
|
||||
--- /dev/null
|
||||
+++ b/arch/arm/boot/dts/overlay/rk322x-led-conf4.dts
|
||||
@@ -0,0 +1,81 @@
|
||||
+/dts-v1/;
|
||||
+/plugin/;
|
||||
+
|
||||
+#include <dt-bindings/gpio/gpio.h>
|
||||
+#include <dt-bindings/input/input.h>
|
||||
+#include <dt-bindings/pinctrl/rockchip.h>
|
||||
+
|
||||
+/ {
|
||||
+
|
||||
+ fragment@0 {
|
||||
+ target-path = "/gpio-leds";
|
||||
+ __overlay__ {
|
||||
+
|
||||
+ working {
|
||||
+ gpios = <&gpio1 RK_PA2 GPIO_ACTIVE_HIGH>;
|
||||
+ linux,default-trigger = "none";
|
||||
+ };
|
||||
+
|
||||
+ auxiliary {
|
||||
+ gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_HIGH>;
|
||||
+ label = "auxiliary";
|
||||
+ linux,default-trigger = "mmc2";
|
||||
+ default-state = "off";
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&gpio_led_aux>;
|
||||
+ };
|
||||
+
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ fragment@1 {
|
||||
+ target-path = "/pinctrl/gpio";
|
||||
+ __overlay__ {
|
||||
+
|
||||
+ gpio_led_working: gpio-led-working {
|
||||
+ rockchip,pins = <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
+ };
|
||||
+
|
||||
+ gpio_led_aux: gpio-led-aux {
|
||||
+ rockchip,pins = <1 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
+ };
|
||||
+
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ fragment@2 {
|
||||
+ target = <&gpio_keys>;
|
||||
+ __overlay__ {
|
||||
+
|
||||
+ reset {
|
||||
+ gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_LOW>;
|
||||
+ label = "reset";
|
||||
+ linux,code = <KEY_RESTART>;
|
||||
+ debounce-interval = <200>;
|
||||
+ wakeup-source;
|
||||
+ };
|
||||
+
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ fragment@3 {
|
||||
+ target = <&sdio_pwrseq>;
|
||||
+ __overlay__ {
|
||||
+
|
||||
+ reset-gpios = <&gpio2 RK_PD3 GPIO_ACTIVE_LOW>; /* GPIO2_D3 */
|
||||
+
|
||||
+ };
|
||||
+
|
||||
+ };
|
||||
+
|
||||
+ fragment@4 {
|
||||
+ target = <&wifi_enable_h>;
|
||||
+ __overlay__ {
|
||||
+
|
||||
+ rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
+
|
||||
+ };
|
||||
+
|
||||
+ };
|
||||
+
|
||||
+};
|
||||
diff --git a/arch/arm/boot/dts/overlay/rk322x-nand.dts b/arch/arm/boot/dts/overlay/rk322x-nand.dts
|
||||
new file mode 100755
|
||||
index 000000000..2a939ab49
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
new file mode 100644
|
||||
index 0000000..7b82b78
|
||||
--- /dev/null
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc-plus.dts
|
||||
@@ -0,0 +1,1223 @@
|
||||
+/dts-v1/;
|
||||
+
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue