enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ nanopi-r2s ] Enable ipupdown networking configuration

Browse Source 
- change ZBUD in kernel config that ZRAM enableds without warnings in log
- blacklist not needed kernel modules (HDMI related features)
This commit is contained in:
Igor Pecovnik 2020-03-10 20:03:05 +01:00
parent ac6b75115f
commit ce350fb03f
No known key found for this signature in database
GPG Key ID: 93D6889F9F0E78D5
4 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/boards/nanopi-r2s.wip
View File

@ -5,6 +5,7 @@ BOOTCONFIG="rock64-rk3328_defconfig"
KERNEL_TARGET="current,dev"
DEFAULT_CONSOLE="serial"
MODULES_CURRENT="g_serial"
MODULES_BLACKLIST="rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima"
SERIALCON="ttyS2:1500000,ttyGS0"
BUILD_DESKTOP="no"
BOOT_FDT_FILE="rockchip/rk3328-nanopi-r2-rev00.dtb"

4
config/kernel/linux-rockchip64-current.config
View File

@ -803,8 +803,8 @@ CONFIG_CMA=y
CONFIG_CMA_AREAS=7
CONFIG_ZSWAP=y
CONFIG_ZPOOL=y
CONFIG_ZBUD=m
CONFIG_Z3FOLD=m
CONFIG_ZBUD=y
CONFIG_Z3FOLD=y
CONFIG_ZSMALLOC=y
# CONFIG_PGTABLE_MAPPING is not set
# CONFIG_ZSMALLOC_STAT is not set

4
config/kernel/linux-rockchip64-dev.config
View File

@ -808,8 +808,8 @@ CONFIG_CMA=y
CONFIG_CMA_AREAS=7
CONFIG_ZSWAP=y
CONFIG_ZPOOL=y
CONFIG_ZBUD=m
CONFIG_Z3FOLD=m
CONFIG_ZBUD=y
CONFIG_Z3FOLD=y
CONFIG_ZSMALLOC=y
# CONFIG_PGTABLE_MAPPING is not set
# CONFIG_ZSMALLOC_STAT is not set

22
config/sources/families/include/rockchip64_common.inc
View File

@ -109,6 +109,18 @@ family_tweaks()
chroot $SDCARD /bin/bash -c "systemctl --no-reload enable z28pro-bluetooth.service >/dev/null 2>&1"
elif [[ $BOARD == nanopi-r2s ]]; then
# rename USB based network to lan0
mkdir -p $SDCARD/etc/udev/rules.d/
echo 'SUBSYSTEM=="net", ACTION=="add", DRIVERS=="r8152", KERNEL=="eth1", NAME="lan0"' > $SDCARD/etc/udev/rules.d/70-rename-lan.rules
# workaround - create old school initial network config since network manager have issues
echo "auto eth0" >> $SDCARD/etc/network/interfaces
echo " iface eth0 inet dhcp" >> $SDCARD/etc/network/interfaces
echo "auto lan0" >> $SDCARD/etc/network/interfaces
echo " iface lan0 inet dhcp" >> $SDCARD/etc/network/interfaces
elif [[ -f $SDCARD/lib/systemd/system/rk3399-bluetooth.service ]]; then
# install and enable Bluetooth
@ -146,16 +158,6 @@ family_tweaks_bsp()
fi
if [[ $BOARD == nanopi-r2s ]]; then
# rename USB based network to lan0
mkdir -p $destination/etc/udev/rules.d/
echo 'SUBSYSTEM=="net", ACTION=="add", DRIVERS=="r8152", KERNEL=="eth1", NAME="lan0"' > $destination/etc/udev/rules.d/70-rename-lan.rules
# this board is without BT
rm $destination/lib/systemd/system/rk3399-bluetooth.service
fi
if [[ $BOARD == pinebook-pro ]]; then
cp $SRC/packages/bsp/pinebook-pro/xorg.conf $destination/etc/X11/