implement flasher type
This commit is contained in:
Shaun Mulligan
parent
c558842224
commit
175b923f41
6 changed files with 84 additions and 81 deletions
|
|
@ -6,7 +6,6 @@
|
|||
setenv load_addr "0x44000000"
|
||||
setenv overlay_error "false"
|
||||
# default values
|
||||
setenv rootdev "/dev/mmcblk0p2"
|
||||
setenv verbosity "1"
|
||||
setenv console "both"
|
||||
setenv disp_mem_reserves "off"
|
||||
|
|
@ -15,8 +14,8 @@ setenv rootfstype "ext4"
|
|||
setenv docker_optimizations "on"
|
||||
|
||||
# Print boot source
|
||||
itest.b *0x28 == 0x00 && echo "U-boot loaded from SD"
|
||||
itest.b *0x28 == 0x02 && echo "U-boot loaded from eMMC or secondary SD"
|
||||
itest.b *0x28 == 0x00 && echo "U-boot loaded from SD" && setenv rootdev "/dev/mmcblk0p2"
|
||||
itest.b *0x28 == 0x02 && echo "U-boot loaded from eMMC or secondary SD" && setenv rootdev "/dev/mmcblk2p2"
|
||||
itest.b *0x28 == 0x03 && echo "U-boot loaded from SPI"
|
||||
|
||||
echo "Boot script loaded from ${devtype}"
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
include resin-image.inc
|
||||
|
|
@ -1,77 +1 @@
|
|||
#
|
||||
# orange-pi-lite
|
||||
#
|
||||
|
||||
IMAGE_FSTYPES_append_orange-pi-lite = " resinos-img"
|
||||
|
||||
# Customize resinos-img
|
||||
RESIN_IMAGE_BOOTLOADER_orange-pi-lite = "u-boot"
|
||||
RESIN_BOOT_PARTITION_FILES_orange-pi-lite = " \
|
||||
${KERNEL_IMAGETYPE}${KERNEL_INITRAMFS}-${MACHINE}.bin:/${KERNEL_IMAGETYPE} \
|
||||
uImage-sun8i-h3-orangepi-lite.dtb:/dtb/sun8i-h3-orangepi-lite.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:/ \
|
||||
"
|
||||
|
||||
IMAGE_CMD_resinos-img_append_orange-pi-lite () {
|
||||
# orange-pi-lite needs uboot written at a specific location
|
||||
dd if=${DEPLOY_DIR_IMAGE}/u-boot-sunxi-with-spl.bin of=${RESIN_RAW_IMG} conv=notrunc seek=8 bs=1024
|
||||
}
|
||||
|
||||
#
|
||||
# nanopi-neo-air
|
||||
#
|
||||
|
||||
IMAGE_FSTYPES_append_nanopi-neo-air = " resinos-img"
|
||||
|
||||
# Customize resinos-img
|
||||
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:/ \
|
||||
"
|
||||
|
||||
IMAGE_CMD_resinos-img_append_nanopi-neo-air () {
|
||||
# nanopi-neo-air needs uboot written at a specific location
|
||||
dd if=${DEPLOY_DIR_IMAGE}/u-boot-sunxi-with-spl.bin of=${RESIN_RAW_IMG} conv=notrunc seek=8 bs=1024
|
||||
}
|
||||
include resin-image.inc
|
||||
|
|
@ -0,0 +1,77 @@
|
|||
#
|
||||
# orange-pi-lite
|
||||
#
|
||||
|
||||
IMAGE_FSTYPES_append_orange-pi-lite = " resinos-img"
|
||||
|
||||
# Customize resinos-img
|
||||
RESIN_IMAGE_BOOTLOADER_orange-pi-lite = "u-boot"
|
||||
RESIN_BOOT_PARTITION_FILES_orange-pi-lite = " \
|
||||
${KERNEL_IMAGETYPE}${KERNEL_INITRAMFS}-${MACHINE}.bin:/${KERNEL_IMAGETYPE} \
|
||||
uImage-sun8i-h3-orangepi-lite.dtb:/dtb/sun8i-h3-orangepi-lite.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:/ \
|
||||
"
|
||||
|
||||
IMAGE_CMD_resinos-img_append_orange-pi-lite () {
|
||||
# orange-pi-lite needs uboot written at a specific location
|
||||
dd if=${DEPLOY_DIR_IMAGE}/u-boot-sunxi-with-spl.bin of=${RESIN_RAW_IMG} conv=notrunc seek=8 bs=1024
|
||||
}
|
||||
|
||||
#
|
||||
# nanopi-neo-air
|
||||
#
|
||||
|
||||
IMAGE_FSTYPES_append_nanopi-neo-air = " resinos-img"
|
||||
|
||||
# Customize resinos-img
|
||||
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:/ \
|
||||
"
|
||||
|
||||
IMAGE_CMD_resinos-img_append_nanopi-neo-air () {
|
||||
# nanopi-neo-air needs uboot written at a specific location
|
||||
dd if=${DEPLOY_DIR_IMAGE}/u-boot-sunxi-with-spl.bin of=${RESIN_RAW_IMG} conv=notrunc seek=8 bs=1024
|
||||
}
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
# Flash to internal eMMC - kernel always enumerates emmc as mmcblk2
|
||||
INTERNAL_DEVICE_KERNEL_nanopi-neo-air = "mmcblk2"
|
||||
|
|
@ -20,7 +20,7 @@ module.exports =
|
|||
|
||||
yocto:
|
||||
machine: 'nanopi-neo-air'
|
||||
image: 'resin-image'
|
||||
image: 'resin-image-flasher'
|
||||
fstype: 'resinos-img'
|
||||
version: 'yocto-morty'
|
||||
deployArtifact: 'resin-image-nanopi-neo-air.resinos-img'
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue