Merge branch 'thingos' into thingos-next

This commit is contained in:
Calin Crisan 2018-01-01 16:52:38 +02:00
commit 91c62277fa
7 changed files with 1419 additions and 209 deletions

View File

@ -0,0 +1,7 @@
bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1 ipv6.disable=1
fatload mmc 0 0x46000000 Image
fatload mmc 0 0x47000000 rootfs.cpio.uboot
fatload mmc 0 0x48000000 sun50i-h5-nanopi-neo2.dtb
booti 0x46000000 0x47000000 0x48000000

View File

@ -0,0 +1,6 @@
bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1 ipv6.disable=1
fatload mmc 0 0x46000000 Image
fatload mmc 0 0x48000000 sun50i-h5-nanopi-neo2.dtb
booti 0x46000000 - 0x48000000

View File

@ -1,8 +1,9 @@
#!/bin/sh
$HOST_DIR/bin/mkimage -C none -A arm -T script -d $BOARD_DIR/boot.cmd $BOOT_DIR/boot.scr
$HOST_DIR/bin/mkimage -C none -A arm -T script -d $BOARD_DIR/boot-fwupdater.cmd $BOOT_DIR/boot-fwupdater.scr
cp $IMG_DIR/Image $BOOT_DIR
cp $BOARD_DIR/boot.scr $BOOT_DIR
cp $BOARD_DIR/boot-fwupdater.scr $BOOT_DIR
cp $BOARD_DIR/sun50i-h5-nanopi-neo2.dtb $BOOT_DIR
cp $BOARD_DIR/rootfs.cpio.uboot $BOOT_DIR

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +1,8 @@
#!/bin/sh
$HOST_DIR/bin/mkimage -C none -A arm -T script -d $BOARD_DIR/boot.cmd $BOOT_DIR/boot.scr
$HOST_DIR/bin/mkimage -C none -A arm -T script -d $BOARD_DIR/boot-fwupdater.cmd $BOOT_DIR/boot-fwupdater.scr
cp $IMG_DIR/zImage $BOOT_DIR
cp $IMG_DIR/sun8i-h3-orangepi-one.dtb $BOOT_DIR
cp $BOARD_DIR/boot.scr $BOOT_DIR
cp $BOARD_DIR/boot-fwupdater.scr $BOOT_DIR
cp $BOARD_DIR/rootfs.cpio.uboot $BOOT_DIR

View File

@ -99,3 +99,4 @@ BR2_PACKAGE_UTIL_LINUX_PARTX=y
BR2_PACKAGE_NANO=y
BR2_PACKAGE_HOST_DTC=y
BR2_PACKAGE_HOST_E2FSPROGS=y
BR2_PACKAGE_HOST_UBOOT_TOOLS=y

View File

@ -111,3 +111,4 @@ BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin"
BR2_PACKAGE_HOST_E2FSPROGS=y
BR2_PACKAGE_HOST_UBOOT_TOOLS=y