Added new parameter per board: BLACKLIST[next|dev] Creating module blacklist $BOARD.conf if defined. Currently needed for Orange Pi Zero since we don't have beter sollution yet.

This commit is contained in:
Igor Pecovnik 2016-11-14 06:59:35 +01:00
parent b2c2d7265e
commit 62b0b92fdb
3 changed files with 12 additions and 1 deletions

View File

@ -108,7 +108,7 @@ for line in "${buildlist[@]}"; do
unset LINUXFAMILY LINUXCONFIG KERNELDIR KERNELSOURCE KERNELBRANCH BOOTDIR BOOTSOURCE BOOTBRANCH ARCH UBOOT_NEEDS_GCC KERNEL_NEEDS_GCC \
CPUMIN CPUMAX UBOOT_VER KERNEL_VER GOVERNOR BOOTSIZE UBOOT_TOOLCHAIN KERNEL_TOOLCHAIN PACKAGE_LIST_EXCLUDE KERNEL_IMAGE_TYPE \
write_uboot_platform family_tweaks setup_write_uboot_platform BOOTSCRIPT UBOOT_FILES LOCALVERSION UBOOT_COMPILER KERNEL_COMPILER \
UBOOT_TARGET MODULES MODULES_NEXT MODULES_DEV INITRD_ARCH HAS_UUID_SUPPORT BOOTENV_FILE BOOTDELAY
UBOOT_TARGET MODULES MODULES_NEXT MODULES_DEV INITRD_ARCH HAS_UUID_SUPPORT BOOTENV_FILE BOOTDELAY BLACKLIST BLACKLIST_NEXT
read BOARD BRANCH RELEASE BUILD_DESKTOP <<< $line
n=$[$n+1]

View File

@ -4,6 +4,8 @@ LINUXFAMILY=sun8i
BOOTCONFIG=orangepi_zero_defconfig
MODULES="#gpio_sunxi #w1-sunxi #w1-gpio #w1-therm #sunxi-cir xradio_wlan xradio_wlan"
MODULES_NEXT=""
BLACKLIST="dhd"
BLACKLIST_NEXT=""
CPUMIN=240000
CPUMAX=1200000
CLI_TARGET="jessie,xenial:default"

View File

@ -28,6 +28,15 @@ install_common()
tr ' ' '\n' <<< "$MODULES" > $CACHEDIR/sdcard/etc/modules
fi
# create blacklist files
if [[ $BRANCH == dev && -n $BLACKLIST_DEV ]]; then
tr ' ' '\n' <<< "$BLACKLIST_DEV" | sed -e 's/^/blacklist /' > $CACHEDIR/sdcard/etc/modprobe.d/${BOARD}.conf
elif [[ ($BRANCH == next || $BRANCH == dev) && (-n $BLACKLIST_NEXT || -n $BLACKLIST_DEV)]]; then
tr ' ' '\n' <<< "$BLACKLIST_NEXT" | sed -e 's/^/blacklist /' > $CACHEDIR/sdcard/etc/modprobe.d/${BOARD}.conf
elif [[ -n $BLACKLIST && $BRANCH != next && $BRANCH != dev ]]; then
tr ' ' '\n' <<< "$BLACKLIST" | sed -e 's/^/blacklist /' > $CACHEDIR/sdcard/etc/modprobe.d/${BOARD}.conf
fi
# remove default interfaces file if present
# before installing board support package
rm $CACHEDIR/sdcard/etc/network/interfaces