Merge pull request #3046 from antonlacon/housekeeping

projects/rpi: move device settings to device options
This commit is contained in:
MilhouseVH 2018-10-23 10:57:59 +01:00 committed by GitHub
commit dd85d2817d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 50 additions and 26 deletions

View File

@ -0,0 +1,9 @@
################################################################################
# Device defaults
################################################################################
# NOOBS supported hex versions (legacy)
NOOBS_HEX="2,3,4,5,6,7,8,9,d,e,f,10,11,12,14,19,0092,0093"
# NOOBS supported model versions
NOOBS_SUPPORTED_MODELS='"Pi Model","Pi Compute Module","Pi Zero"'

View File

@ -0,0 +1,9 @@
################################################################################
# Device defaults
################################################################################
# NOOBS supported hex versions (legacy)
NOOBS_HEX="1040,1041,2082"
# NOOBS supported model versions
NOOBS_SUPPORTED_MODELS='"Pi 2","Pi 3"'

View File

@ -1,2 +1,18 @@
################################################################################
# Device defaults
################################################################################
# Additional kernel make parameters
KERNEL_MAKE_EXTRACMD+=" overlays/slice.dtbo overlays/ws2812.dtbo"
# NOOBS supported hex versions (legacy)
NOOBS_HEX="2,3,4,5,6,7,8,9,d,e,f,10,11,12,14,19,0092,0093"
# NOOBS supported model versions
NOOBS_SUPPORTED_MODELS='"Pi Model","Pi Compute Module","Pi Zero"'
# Additional Firmware
FIRMWARE="${FIRMWARE} slice-firmware"
# Additional drivers
ADDITIONAL_DRIVERS="${ADDITIONAL_DRIVERS} slice-drivers"

View File

@ -1,2 +1,18 @@
################################################################################
# Device defaults
################################################################################
# Additional kernel make parameters
KERNEL_MAKE_EXTRACMD+=" overlays/slice.dtbo overlays/ws2812.dtbo"
# NOOBS supported hex versions (legacy)
NOOBS_HEX="1040,1041,2082"
# NOOBS supported model versions
NOOBS_SUPPORTED_MODELS='"Pi 2","Pi 3"'
# Additional Firmware
FIRMWARE="${FIRMWARE} slice-firmware"
# Additional drivers
ADDITIONAL_DRIVERS="${ADDITIONAL_DRIVERS} slice-drivers"

View File

@ -60,24 +60,6 @@
# default: default mainline kernel
LINUX="raspberrypi"
if [ "$DEVICE" = "RPi" -o "$DEVICE" = "Slice" ]; then
# NOOBS supported hex versions (legacy)
NOOBS_HEX="2,3,4,5,6,7,8,9,d,e,f,10,11,12,14,19,0092,0093"
# NOOBS supported model versions
NOOBS_SUPPORTED_MODELS='"Pi Model","Pi Compute Module","Pi Zero"'
elif [ "$DEVICE" = "RPi2" -o "$DEVICE" = "Slice3" ]; then
# NOOBS supported hex versions (legacy)
NOOBS_HEX="1040,1041,2082"
# NOOBS supported model versions
NOOBS_SUPPORTED_MODELS='"Pi 2","Pi 3"'
fi
################################################################################
# setup build defaults
################################################################################
@ -129,10 +111,6 @@ fi
# e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware"
FIRMWARE="misc-firmware wlan-firmware dvb-firmware brcmfmac_sdio-firmware-rpi"
if [ "$DEVICE" = "Slice" -o "$DEVICE" = "Slice3" ]; then
FIRMWARE="$FIRMWARE slice-firmware"
fi
# build and install ATV IR remote support (yes / no)
ATVCLIENT_SUPPORT="no"
@ -152,10 +130,6 @@ fi
# e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2"
ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS rpi-cirrus-config"
if [ "$DEVICE" = "Slice" -o "$DEVICE" = "Slice3" ]; then
ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS slice-drivers"
fi
# build and install driver addons (yes / no)
DRIVER_ADDONS_SUPPORT="yes"