Rework for AGL UCB integration

Changes include:
- The provided kernel patches have been reworked to not modify the
  salvator-x(s) devicetree source, but to introduce new files for the
  reference hardware instead.  There is some possibility that the
  reference hardware devicetree could be based off the the salvator-x
  with some work and perhaps splitting of the salvator-x source, but
  for now the aim is to avoid breaking the salvator-x(s) with the
  reference hardware changes.
- The modifications to the r8a7795 pinctrl driver have been replaced
  with a splitting of the USB interface OVC pins into their own pin
  groups, which has previously been done for other older Renesas
  hardware.  This allows booting the reference hardware off of the
  same kernel as other H3 boards, at the expense of minor devicetree
  modifications for them (e.g. h3ulcb).  There is likely some more
  work required if this needs to be upstreamed, as the ulcb.dtsi
  changes would mean that the pinctrl drivers for M3 would also need
  the new pin groups.
- All changes for the ST asm330lhh driver addtion have been moved to
  that patch to the kernel.
- A machine conf file has been added for "agl-refhw-h3", and the
  firmware documentation updated to document how to set up a build of
  the firmware using it.  This is required due to the firmware options
  from this layer's arm-trusted-firmware bbappend not being compatible
  with other H3 boards (eMMC versus Hyperflash boot).  A definition
  of the COMPATIBLE_MACHINE variable has been added to that bbappend
  to make sure that attempting to use it with another H3 machine will
  trigger an error.  In AGL, the bbappend will need to be masked out
  with BBMASK for now.
- The top-level README file has been updated to reflect the expected
  integration in AGL.

Bug-AGL: SPEC-3658

Signed-off-by: Scott Murray <scott.murray@konsulko.com>

1 files changed, 7 insertions, 4 deletions

diff --git a/meta-agl-refhw-gen3/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_%.bbappend b/meta-agl-refhw-gen3/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_%.bbappend
index 1fccf80..951a34f 100644
--- a/meta-agl-refhw-gen3/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_%.bbappend
+++ b/meta-agl-refhw-gen3/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_%.bbappend
@@ -1,4 +1,7 @@
-#FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/:"
+# It is believed the eMMC configuration below makes the result AGL
+# reference hardware specific, mark it as such to try to prevent
+# unintended usage on other boards.
+COMPATIBLE_MACHINE = "agl-refhw-h3"
 
 # There are hardware issues in using hyperflash. arm-trusted-firmware, optee and
 # u-boot have to be stored into eMMC by using serial donwload.
@@ -6,20 +9,20 @@ EMMC_BOOT_OPTION = "RCAR_SA6_TYPE=1"
 
 DDR_8G_OPTION= "RCAR_DRAM_LPDDR4_MEMCONF=1"
 
-ATFW_OPT_append_refhw = " ${EMMC_BOOT_OPTION} "
+ATFW_OPT_append_agl-refhw-h3 = " ${EMMC_BOOT_OPTION}"
 
 # In arm-trusted-firmware-control.inc, a "extra_ipl_opt" task is appended to
 # create firmware for 4x2g or 2x2g variation. it is supposed to use
 # EXTRA_ATFW_OPT to customize the compiler opton.
 #
-#EXTRA_ATFW_OPT_append_refhw = " ${EMMC_BOOT_OPTION} ${DDR_8G_OPTION} "
+#EXTRA_ATFW_OPT_append_agl-refhw-h3 = " ${EMMC_BOOT_OPTION} ${DDR_8G_OPTION}"
 #
 # Unfortunately in do_extra_ipl_opt() it use d.setVar() instead of d.appendVar()
 # to setup EXTRA_ATFW_OPT variable which makes it impossible to customize it properly
 # by others... Override it.
 # 
 #
-do_ipl_opt_compile_refhw () {
+do_ipl_opt_compile_agl-refhw-h3 () {
     oe_runmake distclean
     oe_runmake bl2 bl31 dummytool PLAT=${PLATFORM} ${EXTRA_ATFW_OPT} ${ATFW_OPT_LOSSY} ${EMMC_BOOT_OPTION} ${DDR_8G_OPTION}
 }