Skip to content
Snippets Groups Projects

Add all the parts for the Emcraft SOM image

Merged Add all the parts for the Emcraft SOM image
angus.ainslie/image-builder:ec_build into master
3 unresolved threads
Merged Angus Ainslie requested to merge angus.ainslie/image-builder:ec_build into master
3 unresolved threads

Merge request reports

Merged by Angus AinslieAngus Ainslie 6 years ago (Jun 4, 2018 11:47am UTC)

Merge details

  • Changes merged into with fecdcf8b.
  • Did not delete the source branch.

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
build/build_kernel_deb.sh
57 57 DOT_CONFIG=imx8_dot_config
58 58 ARCH=arm64
59 59 COMPILER_ARCH=arm64
60 GIT_OPTS=
60 GIT_OPTS="--depth 1"
61 61 DTS_FILE=""
62 62 ;;
63 63 ec-som)
64 KERNEL_BRANCH=linux-imx8m-2.6.0
65 KERNEL_REPO=https://github.com/EmcraftSystems/linux-upstream.git
64 KERNEL_BRANCH=pureos-patches
65 KERNEL_REPO=git@source.puri.sm:Librem5/linux-emcraft.git
  • Guido Gunther
    Guido Gunther @guido.gunther started a thread on an old version of the diff
    • root.sh
    54 54 cp "${basedir}/boot/${link}" "${basedir}/boot/Image.gz"
    55 55 gunzip "${basedir}/boot/Image.gz"
    56 56 ;;
    57 ec-som)
    58 fdt_source="${basedir}"/usr/lib/linux-image-*/freescale/"${fdt_file}"
    59 cp "${basedir}/boot/${link}" "${basedir}/boot/Image.gz"
  • Guido Gunther
    Guido Gunther @guido.gunther started a thread on commit 5e917206
    • build/build_kernel_deb.sh
    67 67 DOT_CONFIG=emcraft-imx8-som_dot_config
    68 68 ARCH=arm64
    69 69 COMPILER_ARCH=arm64
    70 GIT_OPTS=
    71 DTS_FILE=emcraft-imx8-som.dts
    70 GIT_OPTS="--depth 1"
    71 DTS_FILE=""
  • Guido Gunther
    Guido Gunther @guido.gunther ·
    Owner

    Most of this looks good! Could you respin with the comments adressed?

  • Angus Ainslie added 4 commits

    added 4 commits

    • 33e9e7df - build_kernel_deb.sh: use the Purism kernel for the SOM
    • bcb3dbf1 - build-image: use the same path as the build scripts
    • 02571aa6 - root.sh : config the ec-som kernel
    • f58d0a3b - build_kernel_deb.sh: fix the imx6 kernel build and don't break the imx8 build

    Compare with previous version

    Toggle commit list
  • Angus Ainslie merged

    merged

  • Angus Ainslie mentioned in commit fecdcf8b

    mentioned in commit fecdcf8b

  • Guido Gunther
    Guido Gunther @guido.gunther ·
    Owner

    Sorry for being a bit slow reviewing things today!

    • Please register or sign in to reply