summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2018-09-11 12:42:11 +0200
committerJonas Smedegaard <dr@jones.dk>2018-09-11 12:42:11 +0200
commitd35da585da3ccf6e6a31e256fe0ece42407bd488 (patch)
tree9a0e3a76a3588a46601f8b17d2ce880a736a5aef
parentabbf04d7110f3b54f9ab2c187cc18470b4ecd4cb (diff)
Fix device-tree name and boot.scr for Teres-I.
-rw-r--r--Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index fed896a..7913e52 100644
--- a/Makefile
+++ b/Makefile
@@ -94,8 +94,9 @@ itb-arm64-teres1 = sun50iw1p1/bl31.bin
dtb-armhf-lime = sun7i-a20-olinuxino-lime.dtb
dtb-armhf-lime2 = sun7i-a20-olinuxino-lime2.dtb
dtb-armhf-micro = sun7i-a20-olinuxino-micro.dtb
-dtb-arm64-teres1 = allwinner/sun50i-a64-olinuxino.dtb
+dtb-arm64-teres1 = allwinner/sun50i-a64-teres-i.dtb
scr-armhf = bootscr.sunxi
+scr-arm64 = bootscr.uboot-generic
vendor-files = $(foreach suite,$(suites),\
$(foreach arch,$(archs),\
@@ -283,7 +284,7 @@ partition/$(1)/$(2)/$(4)/$(3)/boot.img: \
$$</boot/*-$$(kernelbuild)
$(or $(SUDO),$(call this-fakeroot,partition/$(1)/$(2)/$(4)/rootfs.state)) \
install -D \
- -t $$@.mnt/dtbs/$$(kernelbuild) \
+ -t $$@.mnt/dtbs/$$(kernelbuild)/$(dir $(dtb-$(2)-$(3))) \
$$</usr/lib/linux-image-$$(kernelbuild)/$(dtb-$(2)-$(3))
$(MKIMAGE) -d partition/$(1)/$(2)/$(4)/$(3)/boot.cmd $$(dir $$@)/boot.scr
$(or $(SUDO),$(call this-fakeroot,partition/$(1)/$(2)/$(4)/rootfs.state)) \
@@ -301,6 +302,7 @@ partition/$(1)/$(2)/$(4)/$(3)/boot.cmd: \
-e 's/^(?=[^#])/setenv console $(console)\n/m;') \
-e "s'@@LINUX_KERNEL_CMDLINE_DEFAULTS@@''g;" \
-e "s'@@LINUX_KERNEL_CMDLINE@@'$(strip $(if $(noquiet),,quiet) $(bootargs))'g;" \
+ -e "s'@@UBOOT_PREBOOT_EXTRA@@''g;" \
-e "s'@@UBOOT_ENV_EXTRA@@''g;" \
-e "s'@@KERNEL_VERSION@@'$$(kernelbuild)'g;" \
< $$</etc/flash-kernel/bootscript/$(scr-$(2)) \