Merge the latest build script from ARM's internal repository.

Taken at this SHA ID:
  035649e618f1471413e220ec558a8360b4769d71

  035649e  2016-05-27  build-script refactor      [Sudipto Paul]

This patch squashes down the change history from the series on the
internal tree to this single revision.

Change-Id: I70352fd520aa5206379bb417c6d7e93935b9f101
Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>

Add support for building U-Boot for TC2, however, keep it disabled for
now because there are problems either in U-Boot of the Linux kernel that
mean the board doesn't boot.

Change-Id: I6130ba2bcac697fee430a3512cace057b3759f9b
Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>

Ashutosh Singh authored May 27, 2016 and Ryan Harkin committed Jun 16, 2016

Build script change to build optee in aarch64 bit mode

Change-Id: I67e8d73d76db5cc08ebea76a5ff350ff2032eff5
Signed-off-by: Ashutosh Singh <ashutosh.singh@arm.com>

The TC2 kernel config variables were wrong after a recent update to the
build scripts.

For example, the mobile_bb zImage was used for all variants, such as
Android or OE, leaving the system unbootable.

Change-Id: Ibf40cc0fbb03474e5a606c2256b73eaf1a8df7bc
Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>

Change-Id: If9c74a823864d75f106452f2b235e91b7dc198cb
Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>

Mark Hambleton authored May 16, 2016 and Ryan Harkin committed May 18, 2016

- change build-linux to take an array of configs
- build all linux configs defined for a variant
- update all variants to have a base variant that builds everything
- update all sub variants to turn off the bits other than the sub
  category
- fix a few over complications in using variables

Change-Id: I28f212058f966a0020b4fccfaf54abcbdf188f81
Signed-off-by: Mark Hambleton <mark.hambleton@arm.com>

Conflicts:
	build-devtrees.sh
	variants/armstrong-android
	variants/armstrong-busybox
	variants/ashbrook
	variants/buzz-android
	variants/buzz-busybox
	variants/buzz-oe
	variants/css-mobile
	variants/css-mobile-android
	variants/css-mobile-oe
	variants/fvp-android
	variants/fvp-busybox
	variants/fvp-oe
	variants/fvp-uefi
	variants/juno-android
	variants/juno-busybox
	variants/juno-oe
	variants/tc2-android
	variants/tc2-busybox
	variants/tc2-oe

James King authored May 06, 2016 and Ryan Harkin committed May 11, 2016

Rebase the build scripts to the latest scritps from ARM.

Since starting to use these scripts, they diverged quite a bit, so this
is a squashed commit use to catch up both the ARM tree and the ARMLT
tree.

Change-Id: Ifbaf62fb0168852f7579f82dc87178554c415349
Signed-off-by: James King <james.king@arm.com>

Change-Id: I15449e7bc8d1bd47be7218ea00ff4b0a168fa58b
Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>

Instead of creating a bootmon script in the special case, always copy
the bootmon script from vexpress-firmware/SOFTWARE depending upon which
variant type we are building.

Change-Id: I86dc80ba75270c31cf0a86e16c2df66920f17f67
Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>

The ramdisk.img was taken from $TOP_DIR, but to fall in line with the
ARM version of the build scripts, in advance of moving to them, expect
the ramdisk.img to live in prebuilts/android/$plat/ramdisk.img, where
$plat is fvp/juno/tc2.

Change-Id: Ie225b6011409f0e34c005dba50d752784b879b1f
Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>

The following ARM-TF commit changes the params needed for cert_create:

96103d5  2016-01-22  cert_create: add non-volatile counter support [Juan Castillo]

New params are needed to continue to be able to use cert_create as
before.  However, it has been pointed out that we shouldn't use
cert_create directly, but instead, we should invoke it via the makefile
which deals with the default params.

Change-Id: I6f66b3faa5386b3c91cb60950efd25dbf1b5af67
Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>

Mirror the upstream ARM build scripts by placing the various build tools
into the tools sub-dir instead of the uefi dir.

Change-Id: I9eb3299460012313bbc0df1d7fee5a8517d34a18
Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>

The Linaro kernels for 16.03 onwards have been updated to host GICv3
.dts files rather than the old GICv2 Legacy .dts files.

Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>

The ACPI tables are dependent on specific versions of the iasl tool as
the UEFI code progresses, so we build our own tools to make sure the
user had the correct version.

Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>

We don't want or need a bootmon config for the uefi variant.

Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>

LAN9118 networking doesn't work in DEBUG mode, so build as RELEASE
instead at least until the problems are fixed.

Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>

The script was mistakenly using DEBUG for all builds instead of the
UEFI_BUILD_MODE variable.

Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>

uefi-tools has changed to build fvp instead of fvp_minimal.

Recent changes in the UEFI code mean that both configs ended up the
same, except the output directory was different.

Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>

The upstream UEFI code is no longer able to boot the kernel directly, so
change TC2 to boot BusyBox, OE and Android with BootMon.

Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>

Instead of duplicating the effort of building UEFI code, use the
uefi-tools, specifically uefi-build.sh, to build the code.

Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>

Add a new variant that only builds ARM Trusted Firmware and UEFI.

This variant will be used by people who want to use their platform with
pure upstream EDK2 and OpenPlatformPkg to test things like OS Installers
or to develop UEFI itself.

Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>

Add a new variant that only builds ARM Trusted Firmware and UEFI.

This variant will be used by people who want to use their platform with
pure upstream EDK2 and OpenPlatformPkg to test things like OS Installers
or to develop UEFI itself.

Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>

Add a new variant that only builds ARM Trusted Firmware and UEFI.

This variant will be used by people who want to use their platform with
pure upstream EDK2 and OpenPlatformPkg to test things like OS Installers
or to develop UEFI itself.

Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>

16.02 onwards will not boot BusyBox, OE or Android with UEFI, only with
U-Boot.

So don't build UEFI for these variants.

Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>

16.02 onwards will not boot BusyBox, OE or Android with UEFI, only with
U-Boot.

So don't build UEFI for these variants.

Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>

For example, if we aren't building the kernel, don't try to package the
kernel Image file.

The same applies for U-Boot and UEFI.

There are probably other packaging steps that need to be makde
conditional, but they haven't caused problems yet.

Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>

The BL_SUPPORT variable is set to the config fragment the build uses for
the kernel.

Move this variable to the end of the list so it over-rides all other
fragments.

Currently, Android or OE choices could revert configs we request in
EAS.conf of big-LITTLE-MP.conf and that should not happen.

We also specifically want it to sit after the platform config.

Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>

Chris Redpath authored Jan 18, 2016 and Ryan Harkin committed Jan 19, 2016

If the linux kernel config fragments for EAS are present, use them.
Also let the user provide BL_SUPPORT=EAS or BL_SUPPORT=big-LITTLE-MP
variable to the build scripts if desired.

Will warn and try to provide help if your chosen config does not exist
in the kernel source.

Signed-off-by: Chris Redpath <chris.redpath@arm.com>

Several variables named *fip_param are shared with the cert_create tool.
Renaming the variables reflects their usage for more than fip_create.

Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>

While ARM-TF v1.2 changed the params of fip_create and cert_create as
per commit "Fix for ARM-TF v1.2" (b7d86b98), pull request #479 [1]
updates fip_create to use the same params as cert_create.

This commit updated the script to match the new fip_create params.

[1] https://github.com/ARM-software/arm-trusted-firmware/pull/479


Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>

This reverts commit b7d86b98.

Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>

As of ARM Trusted Firmware v1.2, fip_create and cert_create have renamed
some of their parameters using differing naming schemes.  They no longer
take the same parameters.

fip_create renames --bl30 to --scp_bl2.  Note, this uses an underscore,
where the other fip_create parameters use dash/minus.

cert_create has the following parameter renames:

  bl2      ->  tb-fw
  bl30     ->  scp-fw
  bl31     ->  soc-fw
  bl32     ->  tos-fw
  bl33     ->  nt-fw
  bl2u     ->  ap-fwu-cfg
  scp_bl2u ->  scp-fwu-cfg
  ns-bl2u  ->  fwu

Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>

OPTEE needs CONFIG_MODULES enabled on all builds.

Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>

The kernel configs should be merged in a specific order:

1) the base configs
2) the distribution specific config
3) the platform specific config

It's getting quite complex to manage the various configs with variables,
so I thought it was simpler to just specify them verbatim on the variant
config.

Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>

Ashutosh Singh authored Dec 01, 2015 and Ryan Harkin committed Dec 03, 2015

Enable TBBR by default on fvp

Reviewed-by: James King <james.king@arm.com>
Signed-off-by: Ashutosh Singh <ashutosh.singh@arm.com>

Adding juno-r2 to the list of DTBs ensures that it's built and copied
over to the board.

Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>

Since commit 66f79d4b, the kernel is built into variant specific out
directories using the "O=dir" parameter to make.  We mirror that here.

Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>

Ashutosh Singh authored Nov 02, 2015 and Ryan Harkin committed Nov 27, 2015

Building of individual optee packages and
required defintions in variant file added.

Change-Id: Id367f3c4b3b5ad5b9e04d2ba8f2d766ba79745b6
Signed-off-by: Ashutosh Singh <ashutosh.singh@arm.com>

MAKEALL is deprecated.  Rather than switch to buildman, we simple use
make to build the platform we want because buildman is a bit OTT for
simply building one platform.

Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>

Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>