pomfi/balena-allwinner
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #59 from resin-os/release_v2.19.0+rev1

Browse source 
Release v2.19.0+rev1
This commit is contained in:
Florin Sarbu 2018-10-09 17:49:30 +03:00 • committed by GitHub
commit 78edc1db96
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 129 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
layers/meta-resin

@ -1 +1 @@
Subproject commit 6936d4603e71eb162edbb5d65c6027b80cf10a11
Subproject commit 47a185d60ca0af6ff4bd156f1abc31df59e71f40

2
layers/meta-resin-allwinner/conf/layer.conf
View file

@ -8,3 +8,5 @@ BBFILE_PATTERN_resin-allwinner := "^${LAYERDIR}/"
BBFILE_PRIORITY_resin-allwinner = "1337"
LAYERSERIES_COMPAT_resin-allwinner = "sumo"
PREFERRED_VERSION_linux-mainline_nanopi-neo-air = "4.16.13"

34
layers/meta-resin-allwinner/recipes-bsp/u-boot/files/0001-Add-Resin-specific-boot-command.patch Normal file
View file

@ -0,0 +1,34 @@
From 38cf0c1e4a9c1e0f73740f6ba8dc7c39964a0288 Mon Sep 17 00:00:00 2001
From: Sebastian Panceac <sebastian@resin.io>
Date: Fri, 16 Mar 2018 15:35:32 +0100
Subject: [PATCH] Add Resin specific boot command
Upstream-Status: Inappropriate [Resin specific]
Signed-off-by: Sebastian Panceac <sebastian@resin.io>
---
include/configs/sunxi-common.h | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 4391a8c..2c82dda 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -454,6 +454,14 @@ extern int soft_i2c_gpio_scl;
#endif
#include <config_distro_bootcmd.h>
+#undef CONFIG_BOOTCOMMAND
+#define CONFIG_BOOTCOMMAND \
+ "setenv resin_kernel_load_addr ${kernel_addr_r};" \
+ "run resin_set_kernel_root;" \
+ "setenv bootargs ${resin_kernel_root} rootfstype=ext4 rootwait console=$console;" \
+ "fatload ${resin_dev_type} ${resin_dev_index}:${resin_boot_part} ${resin_kernel_load_addr} uimage;" \
+ "fatload ${resin_dev_type} ${resin_dev_index}:${resin_boot_part} ${fdt_addr_r} dtb/${fdtfile};" \
+ "bootm ${resin_kernel_load_addr} - ${fdt_addr_r}"
#ifdef CONFIG_USB_KEYBOARD
#define CONSOLE_STDIN_SETTINGS \
--
2.7.4

6
layers/meta-resin-allwinner/recipes-bsp/u-boot/u-boot_2018.03.bbappend Normal file
View file

@ -0,0 +1,6 @@
UBOOT_KCONFIG_SUPPORT = "1"
inherit resin-u-boot
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
SRC_URI += "file://0001-Add-Resin-specific-boot-command.patch"

21
layers/meta-resin-allwinner/recipes-core/images/resin-image.inc
View file

@ -85,27 +85,8 @@ RESIN_IMAGE_BOOTLOADER_nanopi-neo-air = "u-boot"
RESIN_BOOT_PARTITION_FILES_nanopi-neo-air = " \
${KERNEL_IMAGETYPE}${KERNEL_INITRAMFS}-${MACHINE}.bin:/${KERNEL_IMAGETYPE} \
uImage-sun8i-h3-nanopi-neo-air.dtb:/dtb/sun8i-h3-nanopi-neo-air.dtb \
uImage-sun8i-h3-fixup.scr:/dtb/overlay/sun8i-h3-fixup.scr \
uImage-sun8i-h3-analog-codec.dtbo:/dtb/overlay/sun8i-h3-analog-codec.dtbo \
uImage-sun8i-h3-cir.dtbo:/dtb/overlay/sun8i-h3-cir.dtbo \
uImage-sun8i-h3-i2c0.dtbo:/dtb/overlay/sun8i-h3-i2c0.dtbo \
uImage-sun8i-h3-i2c1.dtbo:/dtb/overlay/sun8i-h3-i2c1.dtbo \
uImage-sun8i-h3-i2c2.dtbo:/dtb/overlay/sun8i-h3-i2c2.dtbo \
uImage-sun8i-h3-pps-gpio.dtbo:/dtb/overlay/sun8i-h3-pps-gpio.dtbo \
uImage-sun8i-h3-pwm.dtbo:/dtb/overlay/sun8i-h3-pwm.dtbo \
uImage-sun8i-h3-spdif-out.dtbo:/dtb/overlay/sun8i-h3-spdif-out.dtbo \
uImage-sun8i-h3-spi-add-cs1.dtbo:/dtb/overlay/sun8i-h3-spi-add-cs1.dtbo \
uImage-sun8i-h3-spi-jedec-nor.dtbo:/dtb/overlay/sun8i-h3-spi-jedec-nor.dtbo \
uImage-sun8i-h3-spi-spidev.dtbo:/dtb/overlay/sun8i-h3-spi-spidev.dtbo \
uImage-sun8i-h3-uart1.dtbo:/dtb/overlay/sun8i-h3-uart1.dtbo \
uImage-sun8i-h3-uart2.dtbo:/dtb/overlay/sun8i-h3-uart2.dtbo \
uImage-sun8i-h3-uart3.dtbo:/dtb/overlay/sun8i-h3-uart3.dtbo \
uImage-sun8i-h3-usbhost0.dtbo:/dtb/overlay/sun8i-h3-usbhost0.dtbo \
uImage-sun8i-h3-usbhost2.dtbo:/dtb/overlay/sun8i-h3-usbhost1.dtbo \
uImage-sun8i-h3-usbhost3.dtbo:/dtb/overlay/sun8i-h3-usbhost2.dtbo \
uImage-sun8i-h3-w1-gpio.dtbo:/dtb/overlay/sun8i-h3-w1-gpio.dtbo \
boot.scr:/boot.scr \
armbianEnv.txt:/ \
u-boot-sunxi-with-spl.bin: \
"
IMAGE_CMD_resinos-img_append_nanopi-neo-air () {

2
layers/meta-resin-allwinner/recipes-core/packagegroups/packagegroup-resin-connectivity.bbappend
View file

@ -1,2 +1,4 @@
CONNECTIVITY_FIRMWARES_append = " linux-firmware-ap6212 linux-firmware-brcm43362"
CONNECTIVITY_MODULES_append = " rtl8189"
CONNECTIVITY_FIRMWARES_append_nanopi-neo-air = " linux-firmware-bcm43430"

54
layers/meta-resin-allwinner/recipes-kernel/linux-firmware/files/brcmfmac43430-sdio.txt Normal file
View file

@ -0,0 +1,54 @@
#AP6212_NVRAM_V1.0_20140603
# 2.4 GHz, 20 MHz BW mode
# The following parameter values are just placeholders, need to be updated.
manfid=0x2d0
prodid=0x0726
vendid=0x14e4
devid=0x43e2
boardtype=0x0726
boardrev=0x1101
boardnum=22
macaddr=00:90:4c:c5:12:38
sromrev=11
boardflags=0x00404201
xtalfreq=26000
nocrc=1
ag0=255
aa2g=1
ccode=ALL
pa0itssit=0x20
extpagain2g=0
#PA parameters for 2.4GHz, measured at CHIP OUTPUT
pa2ga0=-168,7161,-820
AvVmid_c0=0x0,0xc8
cckpwroffset0=5
# PPR params
maxp2ga0=90
txpwrbckof=6
cckbw202gpo=0x5555
legofdmbw202gpo=0x77777777
mcsbw202gpo=0xaaaaaaaa
# OFDM IIR :
ofdmdigfilttype=7
# PAPD mode:
papdmode=2
il0macaddr=00:90:4c:c5:12:38
wl0id=0x431b
#OOB parameters
hostwake=0x40
hostrdy=0x41
usbrdy=0x03
usbrdydelay=100
deadman_to=0xffffffff
# muxenab: 0x1 for UART enable, 0x10 for Host awake
muxenab=0x10
# CLDO PWM voltage settings - 0x4 - 1.1 volt
#cldo_pwm=0x4

10
layers/meta-resin-allwinner/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
View file

@ -9,6 +9,7 @@ SRC_URI_append = " \
file://brcmfmac43430a0-sdio.txt \
file://config.txt \
file://brcmfmac43362-sdio.txt \
file://brcmfmac43430-sdio.txt \
"
do_install_append() {
@ -22,6 +23,11 @@ do_install_append() {
cp ${WORKDIR}/brcmfmac43362-sdio.txt ${D}/lib/firmware/brcm/
}
do_install_append_nanopi-neo-air() {
mkdir -p ${D}/${nonarch_base_libdir}/firmware/brcm
install -m 0644 ${WORKDIR}/brcmfmac43430-sdio.txt ${D}${nonarch_base_libdir}/firmware/brcm
}
PACKAGES =+ "${PN}-ap6212 ${PN}-brcm43362"
FILES_${PN}-ap6212 = " \
@ -37,3 +43,7 @@ FILES_${PN}-brcm43362 = " \
/lib/firmware/brcm/brcmfmac43362-sdio.bin \
/lib/firmware/brcm/brcmfmac43362-sdio.txt \
"
FILES_${PN}-bcm43430_append_nanopi-neo-air = " \
${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt \
"

2
layers/meta-sunxi

@ -1 +1 @@
Subproject commit df468d72d74b6af224060b78e4d5daf66c536cb6
Subproject commit 29b20da5e8cdea846c26d47a930d16114d71e0ca

21
nanopi-neo-air.coffee
View file

@ -2,6 +2,12 @@
deviceTypesCommon = require '@resin.io/device-types/common'
{ networkOptions, commonImg, instructions } = deviceTypesCommon
postProvisioningInstructions = [
instructions.BOARD_SHUTDOWN
instructions.REMOVE_INSTALL_MEDIA
instructions.BOARD_REPOWER
]
module.exports =
version: 1
slug: 'nanopi-neo-air'
@ -9,7 +15,16 @@ module.exports =
arch: 'armv7hf'
state: 'experimental'
instructions: commonImg.instructions
stateInstructions:
postProvisioning: postProvisioningInstructions
instructions: [
instructions.ETCHER_SD
instructions.EJECT_SD
instructions.FLASHER_WARNING
instructions.CONNECT_AND_BOOT
].concat(postProvisioningInstructions)
gettingStartedLink:
windows: 'https://docs.resin.io/nanopi-neo-air/nodejs/getting-started/#adding-your-first-device'
osx: 'https://docs.resin.io/nanopi-neo-air/nodejs/getting-started/#adding-your-first-device'
@ -20,10 +35,10 @@ module.exports =
yocto:
machine: 'nanopi-neo-air'
image: 'resin-image'
image: 'resin-image-flasher'
fstype: 'resinos-img'
version: 'yocto-sumo'
deployArtifact: 'resin-image-nanopi-neo-air.resinos-img'
deployArtifact: 'resin-image-flasher-nanopi-neo-air.resinos-img'
compressed: true
configuration: