diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-15 17:04:53 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-15 17:04:53 +0200 |
| commit | ea1244a1bec5a938e032c0a06389b82305651019 (patch) | |
| tree | d707aedb366ea64d1111461bde2e95140d682f76 /package/boot-wrapper-aarch64/patches | |
| parent | 312874bb7f67f4d40fd6f9f22575fdbcc067a9cd (diff) | |
| parent | 786605b21d3996df956bf785b020996cc7df3763 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/boot-wrapper-aarch64/patches')
| -rw-r--r-- | package/boot-wrapper-aarch64/patches/patch-Makefile_am | 13 | ||||
| -rw-r--r-- | package/boot-wrapper-aarch64/patches/patch-configure_ac | 23 |
2 files changed, 36 insertions, 0 deletions
diff --git a/package/boot-wrapper-aarch64/patches/patch-Makefile_am b/package/boot-wrapper-aarch64/patches/patch-Makefile_am new file mode 100644 index 000000000..40eb83f2a --- /dev/null +++ b/package/boot-wrapper-aarch64/patches/patch-Makefile_am @@ -0,0 +1,13 @@ +--- boot-wrapper-aarch64-0.1.orig/Makefile.am 2014-04-13 21:10:47.000000000 +0200 ++++ boot-wrapper-aarch64-0.1/Makefile.am 2014-04-13 21:58:16.848991221 +0200 +@@ -83,8 +83,8 @@ $(IMAGE): boot.o cache.o gic.o mmu.o ns. + model.lds: $(LD_SCRIPT) Makefile + $(CPP) $(CPPFLAGS) -ansi -DPHYS_OFFSET=$(PHYS_OFFSET) -DMBOX_OFFSET=$(MBOX_OFFSET) -DKERNEL_OFFSET=$(KERNEL_OFFSET) -DFDT_OFFSET=$(FDT_OFFSET) -DFS_OFFSET=$(FS_OFFSET) -DKERNEL=$(KERNEL_IMAGE) -DFILESYSTEM=$(FILESYSTEM) -DBOOTMETHOD=$(BOOTMETHOD) -P -C -o $@ $< + +-fdt.dtb: $(KERNEL_DTB) Makefile gen-cpu-nodes.sh +- ( $(DTC) -O dts -I dtb $(KERNEL_DTB) ; echo "/ { $(CHOSEN_NODE) $(PSCI_NODE) $(CPUS_NODE) };" ) | $(DTC) -O dtb -o $@ - ++fdt.dtb: $(KERNEL_DTS) Makefile gen-cpu-nodes.sh ++ ( cat $(KERNEL_DTS) ; echo "/ { $(CHOSEN_NODE) $(PSCI_NODE) $(CPUS_NODE) };" ) | $(DTC) -O dtb -o $@ - + + # The filesystem archive might not exist if INITRD is not being used + .PHONY: all clean $(FILESYSTEM) diff --git a/package/boot-wrapper-aarch64/patches/patch-configure_ac b/package/boot-wrapper-aarch64/patches/patch-configure_ac new file mode 100644 index 000000000..1a016cf2e --- /dev/null +++ b/package/boot-wrapper-aarch64/patches/patch-configure_ac @@ -0,0 +1,23 @@ +--- boot-wrapper-aarch64-0.1.orig/configure.ac 2014-04-13 21:10:47.000000000 +0200 ++++ boot-wrapper-aarch64-0.1/configure.ac 2014-04-13 21:58:39.944973128 +0200 +@@ -22,18 +22,10 @@ AC_ARG_WITH([kernel-dir], + AC_SUBST([KERN_DIR], [$withval]), + AC_MSG_ERROR([No kernel directory specified. Use --with-kernel-dir])) + KERN_IMAGE=/arch/arm64/boot/Image +-KERN_DTB=/arch/arm64/boot/dts/rtsm_ve-aemv8a.dtb +- +-# Ensure that the user has provided us with a sane kernel dir. +-m4_define([CHECKFILES], [KERN_DIR, +- KERN_DIR$KERN_DTB, +- KERN_DIR$KERN_IMAGE]) +- +-m4_foreach([checkfile], [CHECKFILES], +- [AC_CHECK_FILE([$checkfile], [], AC_MSG_ERROR([No such file or directory: $checkfile]))]) ++KERN_DTS=/arch/arm64/boot/dts/foundation-v8.dts + + AC_SUBST([KERNEL_IMAGE], [$KERN_DIR$KERN_IMAGE]) +-AC_SUBST([KERNEL_DTB], [$KERN_DIR$KERN_DTB]) ++AC_SUBST([KERNEL_DTS], [$KERN_DIR$KERN_DTS]) + + # Allow a user to pass --enable-psci + USE_PSCI=no |