Tweak the arm-trusted-firmware bbappend to build the extra 1rank
firmware when building standalone with MACHINE=agl-refhw-h3, and
also add an anonymous python snippet to disable the default
firmware configurations from the base recipe in that situation
as well, as they are not useful.
Bug-AGL: SPEC-4115
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I4697476b08c9dfc722cc8e97c837786874869262
(cherry picked from commit
c79268a6d2d2a5445e8fdfd4bb7af536cdab7115)
files under the build directory in `tmp/deploy/images/h3ulcb`.
If you use the reference hardware numbered 100 or above,
files under the build directory in `tmp/deploy/images/h3ulcb`.
If you use the reference hardware numbered 100 or above,
- please flash the firmware with the suffix "-agl-refhw-4x2g-1rank".
+ please flash the firmware with the suffix "-4x2g-1rank".
The firmware should be stored on the eMMC as follows:
The firmware should be stored on the eMMC as follows:
H3ULCB[agl-refhw-4x2g] = "LSI=H3 RCAR_DRAM_SPLIT=1 ${EMMC_BOOT_OPTION} ${DDR_8G_OPTION}"
H3ULCB[agl-refhw-4x2g-1rank] = "LSI=H3 RCAR_DRAM_SPLIT=1 ${EMMC_BOOT_OPTION} ${DDR_8G_1RANK_OPTION}"
H3ULCB[agl-refhw-4x2g] = "LSI=H3 RCAR_DRAM_SPLIT=1 ${EMMC_BOOT_OPTION} ${DDR_8G_OPTION}"
H3ULCB[agl-refhw-4x2g-1rank] = "LSI=H3 RCAR_DRAM_SPLIT=1 ${EMMC_BOOT_OPTION} ${DDR_8G_1RANK_OPTION}"
+python __anonymous() {
+ # If building for MACHINE=agl-refhw-h3, the predefined default
+ # extra configurations in the base recipe are not interesting
+ # to us, as there is no compatible hardware.
+ if d.getVar("MACHINE") == "agl-refhw-h3":
+ d.delVarFlag("H3", "2x2g")
+ d.delVarFlag("H3", "4x2g")
+}
+
+# Also build the extra 1rank firmware when MACHINE=agl-refhw-h3
+H3[4x2g-1rank] = "LSI=H3 RCAR_DRAM_SPLIT=1 ${EMMC_BOOT_OPTION} ${DDR_8G_1RANK_OPTION}"
+
#
# Need to prepend the compile tasks with a distclean that actually cleans
# out all the platform specific files like the new rcar_layout_tool output,
#
# Need to prepend the compile tasks with a distclean that actually cleans
# out all the platform specific files like the new rcar_layout_tool output,