MFC r355424: release: chase ports r519089 (rpi-firmware update)

Update the stable/11 arm SoC IMAGE_SIZE to 3072M as build
failures were encountered due to the target filesystem
running out of space during the installkernel target.

The 3072M size is used as it is consistent with head and
stable/12 image sizes, and build failures due to a full
filesystem have been common enough to justify making the
default size the same across all supported branches in
order to avoid such surprises.

This is a direct commit to stable/11, as there are several
changes between several size bumps that are unrelated or
unnecessary in this branch.

Sponsored by: The FreeBSD Foundation

Fix the BEAGLEBONE image build on stable/11.

r336726 merges r336598, r336599, r336600, and r336721, however
there was a mismerge in the BEAGLEBONE.conf where two references
to UFSMOUNT remained.

This is a direct commit to stable/11, as svn:mergeinfo had already
been recorded.

Sponsored by: The FreeBSD Foundation

MFC r336997:

release: Restore copy of boot.scr for some board

This is not a problem for 12-CURRENT as EFI boot works but it doesn't
for 11.
While here some board arm_install_uboot also copy ubldr.bin et create
firstboot files but it's already done in arm_install_boot

Reviewed by: gjb
Differential Revision: https://reviews.freebsd.org/D16481

MFC r336721, r336750 [1]:

r336721 (manu):
Add OL_DIR forgot in r336600.

r336750:
Fix OL_DIR definition following r336721.

[1] These commits were stated to have been merged in
r336726, however are not present in context nor
svn:mergeinfo.

Sponsored by: The FreeBSD Foundation

MFC r336598-r336600, r336721

r336598:
release: Uniform release arm image size

Create a 50m fat16 for all boards.

Reviewed by: gjb
Differential Revision: https://reviews.freebsd.org/D16238

r336599:
release: Add arm_install_boot to install the commit boot bits

This reduce the per-board arm_install_uboot to just install u-boot.
While here remove the installation of rpi.dtb and rpi2.dtb as we load
them from the UFS partition via ubldr.

Reviewed by: gjb, imp (older version)
Differential Revision: https://reviews.freebsd.org/D16239

r336600:
release: Add rpi firmware dtb and mmc overlays for RPI-B and RPI2

This is needed with new u-boot that uses the rpi-firmware dtbs.

Reviewed by: gjb
Differential Revision: https://reviews.freebsd.org/D16240

r336721:
release: Add OL_DIR forgot in r336600

Reviewed by: gjb
Differential Revision: https://reviews.freebsd.org/D16439

Approved by: gjb (for insta-mfc of r336721)

MFC r333737:

release: arm: Format FAT partition as FAT16

r332674 raised the size of the FAT partition from 2MB to 41MB for some
boards. But we format them in FAT12 and this size appears to be to big
for FAT12 and some SoC bootrom cannot cope with that.
Format the msdosfs partition as FAT16,

PR: 228285
Approved by: re (marius)

Create a sun7i-a20-bananapi.dtb hard link to bananapi.dtb to fix
a boot failure on the Banana Pi SoC.

This is a direct commit to stable/11, as the sun7i-a20-bananapi.dtb
file exists in head, but appears to have been part of a larger
rework of dtb-related files that may have larger consequences than
hard link creation. Note: creating a hard link to dtb files was
an original fix in 12-CURRENT beforehand, introduced in r319603.

Approved by: re (marius)
Sponsored by: The FreeBSD Foundation

MFC r332674:
Increase the msdosfs partition size on arm SoC images where the
current size may not be sufficiently large for development and/or
testing.

PR: 227548
Sponsored by: The FreeBSD Foundation

MFC r331562 (manu):
release: arm: Copy boot.scr from ports

Latest u-boot update need u-boot script to load and start ubldr.
(See D14230 for more details)
Copy this file for our arm release on the fat partition.

Correct a mismerge of r325861, committed as r326017, to fix the
RPI2 SoC image build.

This is a direct commit to stable/11.

Sponsored by: The FreeBSD Foundation

MFC r325373, r325861:
r325373 (manu):
release/arm: Do not install ubldr

r325861 (manu):
release: Update u-boot and firmware file for RPI-B target.

Sponsored by: The FreeBSD Foundation

MFC r325950, r325953:
r325950:
Sort variables for consistency.

r325953:
Add general configuration files used by release/release.sh for
big-iron installation images.

Sponsored by: The FreeBSD Foundation

MFC r320252, r320686, r325769:
r320252:
In release/release.sh:
- Rename chroot_arm_armv6_build_release() to chroot_arm_build_release()
and make it hardware agnostic (such as armv6 -vs- armv7 -vs- arm64).
- Evaluate EMBEDDED_TARGET differently so release/tools/arm.subr can
be used for arm/armv6 and arm64/aarch64.
- Update comments and copyright.

In release/tools/arm.subr:
- In arm_create_disk(), change the default alignment from 63 to 512k,
fixing a boot issue on arm64 and EFI. [1]
- Update comments and copyright.

r320686:
Fix the ftp-stage target for RPI3 images by loosening the
constraints on the TARGET and TARGET_ARCH variables.

r325769:
Update the GUMSTIX image build to use arm/arm TARGET/TARGET_ARCH.
Update the TARGET/TARGET_ARCH matching in release/release.sh and
release/Makefile.mirrors for simplification.

Note: The RPI3.conf addition from r320252 is not included, as the
11-STABLE image fails to boot in my testing.

Sponsored by: The FreeBSD Foundation

Currently stable/11 is using custom DTS for beaglebone(-black) while CURRENT
is using the upstream ones from Linux.
U-Boot ports have been changed to use the upstream names so 11.1-PRERELEASE
doesn't boot.
Since we cannot MFC the DTS easily (a lot of drivers would have to be modified)
add links on the dts with upstream names.

This is a direct commit to stable/11

Approved by: re (marius)

MFC r319603, r319608, r319609:

Create a hard link for sun7i-a20-cubieboard2.dtb to allow the
cubieboard2 to find the correct dtb file.

Note: r319608 and r319609 are included, but are no-op changes to
the original change, and only included to prevent these commits
from showing up on the MFC tracking page.

Approved by: re (marius)
Sponsored by: The FreeBSD Foundation

MFC r316617:
- Increase the image size for RPI2 and IMX6-based boards from 1G
to 1.5G.
- Use the 'conv=sync' dd(1) option to fix writing the u-boot.imx
file to the md(4) device for IMX6-based boards.

Sponsored by: The FreeBSD Foundation

MFC r305739-r305740

r305739:
Use "generic" ALLWINNER_UP kernel config for Cubieboard release.

Reviewed by: gjb
MFC after: 2 week

r305740:
Remove CUBIEBOARD kernel config file.
Every Allwinner board should either use ALLWINNER (SMP) or ALLWINER_UP kernel
config files.

MFC after: 2 week

Copy head@r302406 to stable/11 as part of the 11.0-RELEASE cycle.
Prune svn:mergeinfo from the new branch, as nothing has been merged
here.

Additional commits post-branch will follow.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Replace the A20 kernel config with a generic ALLWINNER kernel config that
supports A20, A31, and A31S. Adds support for the BananaPi M2 (A31S) board.

Submitted by: Emmanuel Vadot <manu@bidouilliste.com>
Reviewed by: jmcneill
Differential Revision: https://reviews.freebsd.org/D5580

Use UBOOT_FILES in the dd(1) input file, as intended.

Sponsored by: The FreeBSD Foundation

Fix the path to the correct u-boot.bin file to write to
the disk image, which fixes boot issues.

Tested on: BananaPi
Sponsored by: The FreeBSD Foundation

Partially revert r288433, with a minor change:

Spell 'k' correctly.

Spotted by: loos (thank you!)
Sponsored by: The FreeBSD Foundation

Fix FAT_SIZE by removing '-b' argument passing, which was
a result of my misunderstanding on what Crochet was doing
in this case for these boards.

Sponsored by: The FreeBSD Foundation

Initial attempt to add support for building images for
BANANAPI, CUBIEBOARD, and CUBIEBOARD2 SoCs.

Obtained from: Crochet, FreeBSD/arm/Allwinner Wiki page
Sponsored by: The FreeBSD Foundation

In addition to the ubldr file, also copy ubldr.bin to the
MS-DOS partition. This will help with transitioning to
a single arm/armv6 userland build which could be used for
all FreeBSD/armv6 images without UBLDR_LOADADDR being set
for each board (ultimately requiring a separate buildworld
for each currently).

Requested by: ian
MFC after: 3 days
Sponsored by: The FreeBSD Foundation

Increase the FreeBSD/arm image sizes back to 1G for 11-CURRENT.
While 480M is sufficient for 10-STABLE, 11-CURRENT images at
this size fail due to insufficient space.

This commit is solely for the sake of getting updated snapshot
builds out, after which I'll analyze the resulting images to
figure out what a more sane value is, even if the image size
for 11-CURRENT needs to differ from 10-STABLE.

Sponsored by: The FreeBSD Foundation

Reduce the arm/armv6 image size from 1G to 480M.

Since the images are effectively mostly zeros at 1G,
reduce the size to allow installation on smaller SD
cards, such as 512Mb.

While here, stop writing the /boot.txt file on the
WANDBOARD, which isn't used anyway.

Discussed with: imp
MFC after: 3 days
Sponsored by: The FreeBSD Foundation

Set the correct UBLDR_LOADADDR for the Wandboard and
Cubox/Hummingboard images.

Submitted by: ian
MFC after: 3 days
Sponsored by: The FreeBSD Foundation

Fix a whitespace nit.

Sponsored by: The FreeBSD Foundation

Add initial support for building images for the Duovero Gumstix
board.

Sponsored by: The FreeBSD Foundation

Add a configuration file to support the Cubox/Hummingboard SoC.

Sponsored by: The FreeBSD Foundation

Export 'BOARDNAME' when differs from the KERNCONF.

MFC after: 3 days
Sponsored by: The FreeBSD Foundation

Sort configuration options for consistency with other boards.

MFC after: 3 days
Sponsored by: The FreeBSD Foundation

Merge ^/projects/release-arm-redux into ^/head.

Of note:

- This commit adds native FreeBSD/arm release build support without
requiring out-of-tree utilities.

- Part of this merge removes the WANDBOARD-{SOLO,DUAL,QUAD} kernel
configuration files, for which the IMX6 kernel configuration file
should be used instead.

- The resulting images have a 'freebsd' user (password 'freebsd'),
to allow ssh(1) access when console access is not available (VGA
or serial). The default 'root' user password is set to 'root'.

- The /etc/ttys file for arm images now enable both ttyv0 and ttyu0
by default.

Help from: many (boot testing, feedback, etc.)
Sponsored by: The FreeBSD Foundation

Fix building BEAGLEBONE images with Crochet using the
sysutils/u-boot-beaglebone port:

- In arm/BEAGLEBONE.conf, set EMBEDDEDPORTS to the
sysutils/u-boot-beaglebone port.
- In arm/release.sh, remove BEAGLEBONE from setting WANT_UBOOT
- In tools/arm/crochet-BEAGLEBONE.conf, override the
beaglebone_check_uboot(), and set BEAGLEBONE_UBOOT to
/tmp/external/u-boot-beaglebone, and create symlinks to the
u-boot files in /usr/local/share/u-boot-beaglebone and the
uEnv.txt file in crochet/board/Beaglebone/files.

Sponsored by: The FreeBSD Foundation

Remove buildenv_setup(), and set EMBEDDEDPORTS to the
sysutils/u-boot-rpi2 port, since these cases are already
handled by arm/release.sh.

Sponsored by: The FreeBSD Foundation

Add initial support for building RPI2 images.

In release.sh, allow overriding buildenv_setup() before
the handoff to arm/release.sh.

Copy arm/RPI-B.conf -> arm/RPI2.conf, set UBOOT_PORT and
the correct KERNEL, and add the buildenv_setup() override
to install the sysutils/u-boot-rpi2 port/package.

Copy tools/arm/crochet-RPI-B.conf -> tools/arm/crochet-RPI2.conf,
and set the correct entries for the RaspberryPi2 board.

Thanks to: loos@
Sponsored by: The FreeBSD Foundation

Fix CROCHETBRANCH, forgotten in r280640.

Submitted by: ruben.kerkhof@gmail.com
PR: 199760
MFC after: 3 days
Sponsored by: The FreeBSD Foundation

Crochet sources moved to a new home; update accordingly.

MFC after: 3 days
Sponsored by: The FreeBSD Foundation

Properly evaluate XZ_CMD from the chroot.

Sponsored by: The FreeBSD Foundation

Use xz(1) to compress FreeBSD/arm images.

Sponsored by: The FreeBSD Foundation

Build gperf before gcc

The ARM image builds build the in-tree gcc in order to build u-boot
and gperf is needed to build gcc, but is no longer installed on archs
that use clang.

Invoking the make targets as separate steps is done to work around
a build failure which is not yet fully understood.

Reviewed by: gjb, imp
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D1317

Set a static revision of the Crochet checkout to avoid
surprise build failures.

MFC after: 3 days
X-10.1-MFC: yes
X-MFC-With: r271676, r271677
Sponsored by: The FreeBSD Foundation

Catch up with Crochet changes to fix the WANDBOARD-QUAD
build.

Tested on: stable/10@r271618
MFC after: 3 days
X-10.1-MFC: yes
X-MFC-With: r271676
Sponsored by: The FreeBSD Foundation

Catch up with Crochet changes to fix the BEAGLEBONE
build.

Tested on: stable/10@r271618
MFC after: 3 days
X-10.1-MFC: yes
Sponsored by: The FreeBSD Foundation

Also export UNAME_r to fix arm builds.

MFC after: 3 days
X-MFC-with: r270417
Sponsored by: The FreeBSD Foundation

Fix arm build breakage when building stable/10 on
head/.

MFC after: 3 days
Sponsored by: The FreeBSD Foundation

In arm/release.sh, continue if 'xdev-links' target fails
where the target is not valid (stable/10), instead of doing
per-branch evaluation on if xdev-links needs to be invoked.

Sponsored by: The FreeBSD Foundation

Merge the following from ^/projects/release-noxdev:
r269549, r269551, r269552, r269553, r269554, r269555, r269558, r269559,
r269560, r269561, r269628, r269629, r269630, r269635, r269637:

r269549:
Create a new project branch, release-noxdev, for
a sandbox workspace outside of head/ to update the
release bits for arm builds since the deprecation of
the XDEV and XDEV_ARCH make(1) variables.

r269551:
Define load_chroot_env() and load_target_env()
prototypes.

r269552:
Call load_chroot_env() and load_target_env() where
they can be mutually conflicting with regard to
TARGET, TARGET_ARCH, XDEV, and XDEV_ARCH.

r269553:
Add shebang line to arm/*.conf files since these
should be considered to be executable (albeit not
on their own) shell scripts.

r269554:
Redefine load_chroot_env() and load_target_env() in
the arm/*.conf files, and reindent.

r269555:
Simplify where load_chroot_env() and load_target_env() are
called.

r269558:
Provide example in release.conf.sample for overriding the
load_chroot_env() and load_target_env() prototypes.

r269559:
Remove a gratuitous newline.

r269560:
Unset potentially conflicting variables in load_chroot_env()
and load_target_env().

r269561:
Make global variables global, and accessible outside of
the functions within which they were once defined.

r269628:
Remove XDEV/XDEV_ARCH evaluation if EMBEDDEDBUILD is set.

r269629:
In arm/release.sh, switch TARGET/TARGET_ARCH back to the
original XDEV/XDEV_ARCH make(1) variables.

In theory, this should have been a no-op, but the TARGET and
TARGET_ARCH are now unset in load_target_env() to avoid
collision with the chroot userland.

r269630:
Export variables in the arm/*.conf files because they
need to be passed through release.sh to arm/release.sh.

Set MK_TESTS=no for the xdev target.

r269635:
As part of the XDEV/XDEV_ARCH deprecation, the
'xdev-links' target was intentionally no longer
invoked automatically.

Invoke the xdev-links target after xdev, which
creates, for example, /usr/bin/armv6-freebsd-cc
symlink to /usr/armv6-freebsd/usr/bin/cc.

r269637:
Set TARGET and TARGET_ARCH to the XDEV and XDEV_ARCH
counterparts for the xdev and xdev-links make(1)
targets.

Sponsored by: The FreeBSD Foundation

Fake out the deprecation of XDEV and XDEV_ARCH by
continuing to use the variables in the configuration
file, but switch XDEV= and XDEV_ARCH= to TARGET= and
TARGET_ARCH= appropriately.

Sponsored by: The FreeBSD Foundation

The u-boot tarball needed for some boards, BEAGLEBONE for
example, explicitly hard-code gcc(1) as the compiler.

Partially revert r264703, which did a post-chroot install
of gcc(1). This was initially removed because gcc(1) fails
to build usr.bin/dtc/ causing the xdev target to fail. So
this time, move the gcc(1) installation after xdev is built.

This change is likely applicable to stable/10 arm build
failures, as well.

MFC after: 3 days
Sponsored by: The FreeBSD Foundation

Move xdev knobs from release/arm/release.sh and into an
XDEV_FLAGS variable in ${KERNCONF}.conf file.

MFC after: 3 days
X-MFC-Note: fix stable/10 XDEV_FLAGS local for branch
Sponsored by: The FreeBSD Foundation

Play musical-KNOBS a bit more with release/arm/release.sh.

For stable/10, r264703 sets the correct WITH/WITHOUT
knobs to get xdev built with the arm-freebsd-gcc binary
installed. Unfortunately, the same fix does not work on
head/.

Also, quite to my amazement, WITH_GCC=1 and WITH_GNUCXX=1
causes xdev to fail spectactularly at least on r264791.

The situation as it stands is:

- gcc(1) is needed for the u-boot build.
- cc(1) *cannot* be clang(1)

To shoe-horn the toolchain to make 'xdev' give what is
needed, remove WITH_GNUCXX=1 and add WITH_GCC_BOOTSTRAP=1.

MFC After: 1 week
X-MFC-To: stable/10 only
X-MFC-Note: after stable/10 is broken in this way...
Sponsored by: The FreeBSD Foundation

Apply a slightly different color hammer to arm/release.sh:

- gcc(1) fails to build usr.bin/dtc
- lack of WITH_GNUCXX=1 causes cc1plus(1) calls to fail
- u-boot fails to build with clang (hard-coded gcc(1) calls)

Implement the proper incantation of WITH_/WITHOUT_ knobs
to get arm snapshot builds working again.

Since the cc(1) binary is no longer expected to be clang(1),
remove the chroot(8) post-install cc(1) overwrite.

MFC After: 3 days
X-MFC-With: r264518,r264697,r264698
Tested on: stable/10@r264677 RPI-B
Sponsored by: The FreeBSD Foundation

Fix EOL escape.

MFC after: 3 days
X-MFC-With: r264697
Sponsored by: The FreeBSD Foundation

When building the 'xdev' target when WITH_GCC=1 and
WITHOUT_CLANG_IS_CC=1, it appears WITHOUT_CLANG=1 must
also be set.

While here, reorder the lines to put the WITH_* and
WITHOUT_* entries on the same line.

MFC After: 3 days
X-MFC-With: r264518
Tested on: stable/10@r264677
Sponsored by: The FreeBSD Foundation

Fix armv6 build failure: "armv6-freebsd-gcc: not found"

Help from: imp
Sponsored by: The FreeBSD Foundation

Merge r262906 from ^/projects/release-embedded:
Remove only-works-on-amd64 restriction.

Sponsored by: The FreeBSD Foundation

Merge r262907 from ^/projects/release-embedded:
Add ZEDBOARD support for release builds.

Sponsored by: The FreeBSD Foundation

Merge ^/projects/release-embedded into ^/head.

After several months of testing and fixing (and breaking)
various parts of release/release.sh changes, it is now
possible to build FreeBSD/arm images as part of the release
process.

When EMBEDDEDBUILD is set in the release.conf file, release.sh
will create the build environment, then run a separate script
in release/${XDEV}/release.sh [1]. Currently, only arm is
supported.

The release/${XDEV}/release.sh configures the build environment
specific for the target image, such as installing gcc(1),
installing additional third-party software from the ports tree,
and fetching external sources.

Once the build environment is set up, release/${XDEV}/release.sh
runs Crochet, written by Tim Kientzle, which builds the userland
and kernel, and creates an image that can be written to an SD
card with dd(1). Many thanks to Tim for his work on Crochet.

Sample configurations for FreeBSD/arm boards are in the
release/arm/ directory, and Crochet configuration files for each
board are located in release/tools/arm/. Supported boards at this
time are: BEAGLEBONE, PANDABOARD, RPI-B, and WANDBOARD-QUAD.

Adding support for additional boards will continue in the
projects/release-embedded/ branch, and incrementally merged back
to head/.

Many thanks to the FreeBSD Foundation for the support and
sponsorship of this project.

[1] XDEV is used in order to keep the various configurations
organized by architecture, but since TARGET and TARGET_ARCH
are used to build the chroot, the values of those variables
cannot be used.

MFC after: 1 month
Sponsored by: The FreeBSD Foundation

Merge the following:
^/user/gjb/hacking/release-embedded:
259994,260000,260895-260896,261139,261152,
261174,261176,261210,261221,261237,261239,
261448,261489
^/user/gjb/release-embedded:
262305,262307

svn:mergeinfo is intentionally not included in the commit, so it does
not propagate to head/.

Sponsored by: The FreeBSD Foundation

Implement cross build support for embedded devices into
release.sh:

- Modify release/release.sh to recognize an 'EMBEDDEDBUILD'
variable. When set, release/release.sh will build the chroot
userland as is done for big-iron builds.

- Instead of running the 'buildworld', 'buildkernel', and
'release' targets in the chroot, a separate script is run.
The script tools/release/${XDEV}/release.sh sets up the rest
of the chroot workspace, such as installing ports that will
be needed, and building the 'xdev' target.

- crochet (by kientzle@) is checked out from the upstream
repository (and if needed, u-boot, in the case of Raspberry
Pi).

- tools/release/${XDEV}/release.sh then runs crochet with
a configuration file specific to the ${KERNCONF} being built.

Note that this is effectively a first-pass attempt to integrate
this into the release process.

Tested against: head@r259961
Sponsored by: The FreeBSD Foundation