pine64: add required boot files

board/common/mkimage.sh

@@ -23,6 +23,8 @@ function cleanup {
 
 trap cleanup EXIT
 
+PART_START=${PART_START:-2048} # 2048 sectors = 1MB
+
 BOOT_SRC=$IMG_DIR/boot
 BOOT=$IMG_DIR/.boot
 BOOT_IMG=$IMG_DIR/boot.img
@@ -109,18 +111,19 @@ loop_dev=$(losetup -f)
 losetup -f $DISK_IMG
 
 msg "partitioning disk"
+root_part_start=$(($PART_START + $BOOT_SIZE * 2048))
 set +e
 fdisk -u=sectors $loop_dev <<END
 o
 n
 p
 1
-
+${PART_START}
 +${BOOT_SIZE}M
 n
 p
 2
-
+${root_part_start}
 +${ROOT_SIZE}M
 
 t

board/pine64/mkimage.sh

@@ -5,9 +5,10 @@ COMMON_DIR=$BOARD_DIR/../common
 
 export BOARD=$(basename $BOARD_DIR)
 export IMG_DIR=$BOARD_DIR/../../output/$BOARD/images/
-export UBOOT_BIN=$IMG_DIR/u-boot.bin
+export UBOOT_BIN=$BOARD_DIR/u-boot-with-dtb.bin
 export UBOOT_SEEK=38192
-BOOT0=$IMG_DIR/boot0.bin
+export PART_START=40960
+BOOT0=$BOARD_DIR/boot0.bin
 
 source $COMMON_DIR/mkimage.sh
 

board/pine64/postscript.sh

@@ -3,11 +3,8 @@
 # boot directory
 mkdir -p $BOOT_DIR/pine64
 
-cp $IMG_DIR/Image $BOOT_DIR/pine64
-cp $IMG_DIR/pine64.dtb $BOOT_DIR
-cp $IMG_DIR/pine64plus.dtb $BOOT_DIR
-cp $BOARD_DIR/boot0.bin $IMG_DIR
-cp $BOARD_DIR/u-boot.bin $IMG_DIR
-cp $BOARD_DIR/boot.ini $BOOT_DIR
+cp $IMG_DIR/Image $BOOT_DIR/kernel.img
+cp $BOARD_DIR/uEnv.txt $BOOT_DIR
+cp $BOARD_DIR/dtb/* $BOOT_DIR/pine64
 #cp $BOARD_DIR/uInitrd $BOOT_DIR
 

board/pine64/uEnv.txt

@@ -0,0 +1,63 @@
+console=ttyS0,115200n8
+selinux=permissive
+enforcing=0
+optargs=no_console_suspend
+kernel_filename=kernel.img
+#initrd_filename=ramdisk.img
+#recovery_initrd_filename=ramdisk-recovery.img
+hardware=sun50iw1p1
+
+# INFO:
+# To enable one of below options,
+# uncomment them by removing # in front of name
+
+# To use android recovery:
+# Create empty file recovery.txt in root of this partition
+
+# To enable LCD or HDMI, if not changed it will use default (experimental)
+# disp_screen0=lcd or hdmi
+# disp_screen1=lcd or hdmi
+# disp_mode=screen0 or screen1 or dualhead or xinerama or clone
+
+# USB OTG port mode (experimental)
+# otg_mode=device or host or otg
+otg_mode=host
+
+# Configure contiguous memory allocation
+# This maybe required to be enlarged for 4K displays
+cma=384M
+
+# To change HDMI display mode:
+# hdmi_mode=480i
+# hdmi_mode=576i
+# hdmi_mode=480p
+# hdmi_mode=576p
+# hdmi_mode=720p50
+# hdmi_mode=720p60
+# hdmi_mode=1080i50
+# hdmi_mode=1080i60
+# hdmi_mode=1080p24
+# hdmi_mode=1080p50
+# hdmi_mode=1080p60
+# hdmi_mode=2160p30
+# hdmi_mode=2160p25
+# hdmi_mode=2160p24
+
+# To enable DVI compatibilty:
+# disp_dvi_compat=on
+
+# To enable CSI camera, if not enabled it will use default:
+# camera_type=s5k4ec
+# camera_type=ov5640
+
+# Configure ethernet speed
+eth0_speed=auto
+# eth0_speed=1000
+# eth0_speed=100
+# eth0_speed=10
+
+# Disable HDMI CEC
+hdmi_cec=0
+
+# Enable experimental HDMI CEC driver
+# hdmi_cec=2

configs/pine64_defconfig

@@ -79,7 +79,3 @@ BR2_PACKAGE_TAR=y
 BR2_PACKAGE_UTIL_LINUX_BINARIES=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y
 BR2_PACKAGE_NANO=y
-BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="sun50iw1p1"
-BR2_TARGET_UBOOT_CUSTOM_GIT=y
-BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/longsleep/u-boot-pine64.git"