mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 09:12:39 +00:00
4d49ce1bde
Booting from non-MMC devices on Rockchip targets without this change results in a boot failure: Model: FriendlyElec NanoPi R5S Net: eth0: ethernet@fe2a0000 Hit any key to stop autoboot: 0 ** Booting bootflow 'nvme#0.blk#1.bootdev.part_1' with script ** No partition table - mmc 0 ** ** No partition table - mmc 0 ** Couldn't find partition mmc 0:1 Can't set block device Wrong Image Type for bootm command ERROR -91: Protocol wrong type for socket: can't get kernel image! Boot failed (err=1) This change fixes the default boot script for Rockchip targets to support booting from non-MMC devices such as NVMe or USB drives. Some targets with only a boot rom (e.g. NanoPi R5S) may require u-boot to be installed on the eMMC or a MicroSD card in order to boot from non-MMC devices. Fixes: #14420 Reviewed-by: Tianling Shen <cnsztl@immortalwrt.org> Signed-off-by: Justin Klaassen <justin@tidylabs.app>
61 lines
1.9 KiB
Makefile
61 lines
1.9 KiB
Makefile
# SPDX-License-Identifier: GPL-2.0-only
|
|
|
|
include $(TOPDIR)/rules.mk
|
|
include $(INCLUDE_DIR)/image.mk
|
|
|
|
DEVICE_VARS += UBOOT_DEVICE_NAME
|
|
|
|
define Build/Compile
|
|
$(CP) $(LINUX_DIR)/COPYING $(KDIR)/COPYING.linux
|
|
endef
|
|
|
|
### Image scripts ###
|
|
define Build/boot-common
|
|
# This creates a new folder copies the dtb (as rockchip.dtb)
|
|
# and the kernel image (as kernel.img)
|
|
rm -fR $@.boot
|
|
mkdir -p $@.boot
|
|
|
|
$(CP) $(IMAGE_KERNEL) $@.boot/kernel.img
|
|
endef
|
|
|
|
define Build/boot-script
|
|
# Make an U-boot image and copy it to the boot partition
|
|
mkimage -A arm -O linux -T script -C none -a 0 -e 0 -d $(if $(1),$(1),default).bootscript $@.boot/boot.scr
|
|
endef
|
|
|
|
define Build/pine64-img
|
|
# Creates the final SD/eMMC images,
|
|
# combining boot partition, root partition as well as the u-boot bootloader
|
|
|
|
# Generate a new partition table in $@ with 32 MiB of
|
|
# alignment padding for the idbloader and u-boot to fit:
|
|
# http://opensource.rock-chips.com/wiki_Boot_option#Boot_flow
|
|
#
|
|
# U-Boot SPL expects the U-Boot ITB to be located at sector 0x4000 (8 MiB) on the MMC storage
|
|
PADDING=1 $(SCRIPT_DIR)/gen_image_generic.sh \
|
|
$@ \
|
|
$(CONFIG_TARGET_KERNEL_PARTSIZE) $@.boot \
|
|
$(CONFIG_TARGET_ROOTFS_PARTSIZE) $(IMAGE_ROOTFS) \
|
|
32768
|
|
|
|
# Copy the idbloader and the u-boot image to the image at sector 0x40 and 0x4000
|
|
dd if="$(STAGING_DIR_IMAGE)"/$(UBOOT_DEVICE_NAME)-idbloader.img of="$@" seek=64 conv=notrunc
|
|
dd if="$(STAGING_DIR_IMAGE)"/$(UBOOT_DEVICE_NAME)-u-boot.itb of="$@" seek=16384 conv=notrunc
|
|
endef
|
|
|
|
### Devices ###
|
|
define Device/Default
|
|
PROFILES := Default
|
|
KERNEL = kernel-bin | lzma | fit lzma $$(DTS_DIR)/$$(DEVICE_DTS).dtb
|
|
BOOT_SCRIPT :=
|
|
IMAGES := sysupgrade.img.gz
|
|
IMAGE/sysupgrade.img.gz = boot-common | boot-script $$(BOOT_SCRIPT) | pine64-img | gzip | append-metadata
|
|
DEVICE_DTS = rockchip/$$(SOC)-$(lastword $(subst _, ,$(1)))
|
|
UBOOT_DEVICE_NAME = $(lastword $(subst _, ,$(1)))-$$(SOC)
|
|
endef
|
|
|
|
include $(SUBTARGET).mk
|
|
|
|
$(eval $(call BuildImage))
|