From 6e4cf46d5a2e6d86235d1044b1f8184be7f028a6 Mon Sep 17 00:00:00 2001 From: leeboby Date: Thu, 26 Nov 2020 09:32:04 +0800 Subject: [PATCH] Update sun50iw6.conf for legacy branch --- external/config/sources/families/sun50iw6.conf | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/external/config/sources/families/sun50iw6.conf b/external/config/sources/families/sun50iw6.conf index de97926..407809c 100644 --- a/external/config/sources/families/sun50iw6.conf +++ b/external/config/sources/families/sun50iw6.conf @@ -8,22 +8,25 @@ ASOUND_STATE='asound.state.sun50iw2-dev' case $BRANCH in legacy) + LINUXFAMILY=sun50iw6 KERNELBRANCH="branch:orange-pi-4.9-sun50iw6" KERNELPATCHDIR=${BOARDFAMILY}-${BRANCH} BOOTCONFIG="sun50iw6p1_config" BOOTBRANCH='branch:v2014.07-sun50iw6-linux4.9' - UBOOT_TARGET_MAP='u-boot.bin;; - spl;;' + UBOOT_TARGET_MAP=';;u-boot.bin:u-boot.fex + spl;;boot0_sdcard.bin:boot0_sdcard.fex' UBOOT_COMPILER="arm-linux-gnueabi-" UBOOT_USE_GCC='> 4.0' BOOTENV_FILE=sun50iw6-default.txt - BOOTSCRIPT='boot-sun50iw6.cmd:boot.cmd' + BOOTSCRIPT='boot-sun50iw6-legacy.cmd:boot.cmd' PACK_UBOOT="yes" + OFFSET=20 ATFSOURCE="" ATF_COMPILE="no" INITRD_ARCH=arm + ASOUND_STATE='asound.state.sun50iw6-legacy' ;; esac @@ -35,6 +38,7 @@ family_tweaks_s() # install and enable Bluetooth chroot $SDCARD /bin/bash -c "apt-get -y -qq install rfkill bluetooth bluez bluez-tools >/dev/null 2>&1" chroot $SDCARD /bin/bash -c "systemctl --no-reload enable ap6256-bluetooth.service >/dev/null 2>&1" + [[ $BRANCH == legacy ]] && chroot $SDCARD /bin/bash -c "systemctl --no-reload enable ap6256-wifi.service >/dev/null 2>&1" fi if [[ -f $SDCARD/lib/systemd/system/ap6255-bluetooth.service ]]; then @@ -42,6 +46,7 @@ family_tweaks_s() # install and enable Bluetooth chroot $SDCARD /bin/bash -c "apt-get -y -qq install rfkill bluetooth bluez bluez-tools >/dev/null 2>&1" chroot $SDCARD /bin/bash -c "systemctl --no-reload enable ap6255-bluetooth.service >/dev/null 2>&1" + [[ $BRANCH == legacy ]] && chroot $SDCARD /bin/bash -c "systemctl --no-reload enable ap6255-wifi.service >/dev/null 2>&1" fi } @@ -52,11 +57,13 @@ family_tweaks_bsp() install -m 755 $EXTER/packages/blobs/bt/brcm_patchram_plus/brcm_patchram_plus_$ARCH $destination/usr/bin/brcm_patchram_plus cp $EXTER/packages/bsp/sunxi/ap6256-bluetooth.service $destination/lib/systemd/system/ + [[ $BRANCH == legacy ]] && cp $EXTER/packages/bsp/sunxi/ap6256-wifi.service $destination/lib/systemd/system/ fi if [[ $BOARD == orangepilite2 ]]; then install -m 755 $EXTER/packages/blobs/bt/brcm_patchram_plus/brcm_patchram_plus_$ARCH $destination/usr/bin/brcm_patchram_plus cp $EXTER/packages/bsp/sunxi/ap6255-bluetooth.service $destination/lib/systemd/system/ + [[ $BRANCH == legacy ]] && cp $EXTER/packages/bsp/sunxi/ap6255-wifi.service $destination/lib/systemd/system/ fi }