From 60ebfd79726ac797d3e3b0211bec548b6ade0614 2018-11-05 12:45:05 From: Unknown Date: 2018-11-05 12:45:05 Subject: [PATCH] DTB and devices with no wlan --- diff --git a/rpi23-gen-image.sh b/rpi23-gen-image.sh index 5f0cd85..54f67d6 100755 --- a/rpi23-gen-image.sh +++ b/rpi23-gen-image.sh @@ -255,32 +255,31 @@ set +x # Set Raspberry Pi model specific configuration if [ "$RPI_MODEL" = 0 ] ; then - DTB_FILE=${RPI2_DTB_FILE} - UBOOT_CONFIG=${RPI2_UBOOT_CONFIG} + DTB_FILE=${RPI0_DTB_FILE} + UBOOT_CONFIG=${RPI0_UBOOT_CONFIG} elif [ "$RPI_MODEL" = 1 ] ; then - DTB_FILE=${RPI2_DTB_FILE} - UBOOT_CONFIG=${RPI2_UBOOT_CONFIG} + DTB_FILE=${RPI1_DTB_FILE} + UBOOT_CONFIG=${RPI1_UBOOT_CONFIG} elif [ "$RPI_MODEL" = 1P ] ; then - DTB_FILE=${RPI2_DTB_FILE} - UBOOT_CONFIG=${RPI2_UBOOT_CONFIG} + DTB_FILE=${RPI1P_DTB_FILE} + UBOOT_CONFIG=${RPI1P_UBOOT_CONFIG} elif [ "$RPI_MODEL" = 2 ] ; then DTB_FILE=${RPI2_DTB_FILE} UBOOT_CONFIG=${RPI2_UBOOT_CONFIG} elif [ "$RPI_MODEL" = 3 ] ; then DTB_FILE=${RPI3_DTB_FILE} UBOOT_CONFIG=${RPI3_UBOOT_CONFIG} - BUILD_KERNEL=true elif [ "$RPI_MODEL" = 3P ] ; then DTB_FILE=${RPI3P_DTB_FILE} UBOOT_CONFIG=${RPI3P_UBOOT_CONFIG} - BUILD_KERNEL=true else echo "error: Raspberry Pi model ${RPI_MODEL} is not supported!" exit 1 fi # Check if the internal wireless interface is supported by the RPi model -if [ "$ENABLE_WIRELESS" = true ] && [ "$RPI_MODEL" = 2 ]; then +if [ "$ENABLE_WIRELESS" = true ] && ([ "$RPI_MODEL" = 1 ] || [ "$RPI_MODEL" = 1P ] || [ "$RPI_MODEL" = 2 ]); then + echo "error: The selected Raspberry Pi model has no internal wireless interface" exit 1 fi