Skip to contentSkip to conversation

orange-pi-zero-plus2: BSP update and WiFi support

PATCH New Sergey Matyukevich 2 participants 4 messages Feb 11, 2018 – Feb 14, 2018

lore
Share & tools
lore
#0 lore raw

cover orange-pi-zero-plus2: BSP update and WiFi support

Hi all,

Here are two patches for Orange Pi Zero Plus2 board. The first patch updates mainline kernel and U-Boot versions. The second patch enables wireless networking by default on that board.

Regards,
Sergey

Sergey Matyukevich (2):
orange-pi-zero-plus2: bump kernel and u-boot versions
orange-pi-zero-plus2: enable WiFi support

 board/orangepi/orangepi-zero-plus2/linux-extras.config                                                           |   10 +
 board/orangepi/orangepi-zero-plus2/patches/linux/linux-0001-arm64-dts-orange-pi-zero-plus2-enable-ap6212.patch   |   73 ++++++++++
 board/orangepi/orangepi-zero-plus2/rootfs_overlay/lib/firmware/brcm/brcmfmac43430-sdio.txt                       |   54 +++++++
 configs/orangepi_zero_plus2_defconfig                                                                            |   24 ++-
 board/orangepi/orangepi-zero-plus2/patches/linux/linux-0001-arm64-dts-orange-pi-zero-plus2-fix-sdcard-detect.patch |   30 ----
 5 files changed, 155 insertions(+), 36 deletions(-)
#1 lore raw

PATCH 1/2 orange-pi-zero-plus2: bump kernel and u-boot versions

Bump versions:
- use U-Boot 2008.01
- use Linux kernel v4.15.2

Drop patch with dts sdcard fix since it has been
merged to Linux v4.15.

---
 ...ts-orange-pi-zero-plus2-fix-sdcard-detect.patch | 30 ----------------------
 configs/orangepi_zero_plus2_defconfig              | 11 +++-----
 2 files changed, 4 insertions(+), 37 deletions(-)
 delete mode 100644 board/orangepi/orangepi-zero-plus2/patches/linux/linux-0001-arm64-dts-orange-pi-zero-plus2-fix-sdcard-detect.patch
board/orangepi/orangepi-zero-plus2/patches/linux/linux-0001-arm64-dts-orange-pi-zero-plus2-fix-sdcard-detect.patch deleted +0 -30
deleted file mode 100644
index 203402932b..0000000000
@@ -1,30 +0,0 @@
-From f88e9301948173dd35afad4a6939092c7f269aed Mon Sep 17 00:00:00 2001
-From: Sergey Matyukevich <[email protected]>
-Date: Fri, 3 Nov 2017 22:58:54 +0300
-Subject: [PATCH] arm64: dts: orange-pi-zero-plus2: fix sdcard detect
-
-The sdcard detect pin on orange-pi-zero-plus2 is pulled up.
-Fix cd-gpio description to enable sdcard detect.
-
-Signed-off-by: Sergey Matyukevich <[email protected]>
-Signed-off-by: Maxime Ripard <[email protected]>
----
- arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts
-index b6b7a56..a42fd79 100644
---- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts
-+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts
-@@ -71,7 +71,7 @@
- 	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
- 	vmmc-supply = <&reg_vcc3v3>;
- 	bus-width = <4>;
--	cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>;
-+	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;
- 	status = "okay";
- };
- 
--- 
-1.9.1
-
configs/orangepi_zero_plus2_defconfig +4 -7
index 5b1ff3500c..7906dba5c7 100644
@@ -2,11 +2,8 @@ BR2_aarch64=y
 BR2_cortex_a53=y
 BR2_ARM_FPU_VFPV4=y
 
-# Linux headers same as kernel, a 4.14 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
-
-# Patch dir
-BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero-plus2/patches"
+# Linux headers same as kernel, a 4.15 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y
 
 # Firmware
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
@@ -20,7 +17,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.01"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero_plus2"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
@@ -34,7 +31,7 @@ BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero-plus2/boot.cmd
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15.2"
 BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-zero-plus2"
Signature · 1 line
2.16.1
#2 lore raw

PATCH 2/2 orange-pi-zero-plus2: enable WiFi support

In reply to Sergey Matyukevich

Orange-Pi Zero Plus2 board has AP6212 WiFi/BT combo, but does not have ethernet port. So it makes sense to enable wireless networking by default:

- add DTS patch enabling AP6212 WiFi/BT combo support
-- this patch is on its way to mainline Linux v4.16
- enable WiFi support in kernel config
- enable Broadcom brcmfmac kernel driver in kernel config
- add Broadcom wireless firmware package to image
- add basic wireless tools to image
- add mdev to image to enable module autoloading
- add rootfs overlay with proper NVRAM file for on-board AP6212 chip

---
 .../orangepi-zero-plus2/linux-extras.config        | 10 +++
 ...64-dts-orange-pi-zero-plus2-enable-ap6212.patch | 73 ++++++++++++++++++++++
 .../lib/firmware/brcm/brcmfmac43430-sdio.txt       | 54 ++++++++++++++++
 configs/orangepi_zero_plus2_defconfig              | 17 ++++-
 4 files changed, 153 insertions(+), 1 deletion(-)
 create mode 100644 board/orangepi/orangepi-zero-plus2/linux-extras.config
 create mode 100644 board/orangepi/orangepi-zero-plus2/patches/linux/linux-0001-arm64-dts-orange-pi-zero-plus2-enable-ap6212.patch
 create mode 100644 board/orangepi/orangepi-zero-plus2/rootfs_overlay/lib/firmware/brcm/brcmfmac43430-sdio.txt
board/orangepi/orangepi-zero-plus2/linux-extras.config new file +10 -0
new file mode 100644
index 0000000000..52b4b4b29e
@@ -0,0 +1,10 @@
+# wireless core
+CONFIG_WIRELESS=y
+CONFIG_CFG80211=y
+CONFIG_MAC80211=y
+CONFIG_CFG80211_WEXT=y
+
+# wireless drivers
+CONFIG_WLAN=y
+CONFIG_WLAN_VENDOR_BROADCOM=y
+CONFIG_BRCMFMAC=m
board/orangepi/orangepi-zero-plus2/patches/linux/linux-0001-arm64-dts-orange-pi-zero-plus2-enable-ap6212.patch new file +73 -0

73 lines not on this page · raw message

board/orangepi/orangepi-zero-plus2/rootfs_overlay/lib/firmware/brcm/brcmfmac43430-sdio.txt new file +54 -0

54 lines not on this page · raw message

configs/orangepi_zero_plus2_defconfig +16 -1
index 7906dba5c7..5ca6cf0fe2 100644
@@ -2,8 +2,10 @@ BR2_aarch64=y
 BR2_cortex_a53=y
 BR2_ARM_FPU_VFPV4=y
 
-# Linux headers same as kernel, a 4.15 series
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
+BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero-plus2/patches"
+BR2_ROOTFS_OVERLAY="board/orangepi/orangepi-zero-plus2/rootfs_overlay"
 
 # Firmware
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
@@ -35,6 +37,19 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15.2"
 BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-zero-plus2"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero-plus2/linux-extras.config"
+
+# wireless firmware
+BR2_PACKAGE_LINUX_FIRMWARE=y
+BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX=y
+
+# wireless tools
+BR2_PACKAGE_IW=y
+BR2_PACKAGE_WIRELESS_TOOLS=y
+BR2_PACKAGE_WIRELESS_TOOLS_LIB=y
+BR2_PACKAGE_WPA_SUPPLICANT=y
+BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y
+BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
 
 # Filesystem
 BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Zero Plus2"
Signature · 1 line
2.16.1
#3 lore raw

cover orange-pi-zero-plus2: BSP update and WiFi support

In reply to Sergey Matyukevich

Hello,

Quoted 3 lines · Sergey Matyukevich

Sergey Matyukevich (2):
orange-pi-zero-plus2: bump kernel and u-boot versions
orange-pi-zero-plus2: enable WiFi support

Both patches applied to next. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
http://bootlin.com