diff options
-rw-r--r-- | conf/machine/include/imx-base.inc | 9 | ||||
-rw-r--r-- | recipes-bsp/imx-atf/imx-atf_2.6.bb | 9 |
2 files changed, 17 insertions, 1 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 297637af..2962c9e9 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc | |||
@@ -113,6 +113,15 @@ UBOOT_PROVIDES_BOOT_CONTAINER:imx-boot-container = "1" | |||
113 | # Default TF-A provider to NXP downstream fork | 113 | # Default TF-A provider to NXP downstream fork |
114 | IMX_DEFAULT_ATF_PROVIDER ??= "imx-atf" | 114 | IMX_DEFAULT_ATF_PROVIDER ??= "imx-atf" |
115 | 115 | ||
116 | # Allow setting the UART used during the boot by ATF. | ||
117 | |||
118 | # FIXME: We should return INVALID here but currently only i.MX8M has support to override the UART | ||
119 | # base address in source code. | ||
120 | SOC_ATF_BOOT_UART_BASE = "" | ||
121 | |||
122 | SOC_ATF_BOOT_UART_BASE:mx8m-generic-bsp = "0x30890000" | ||
123 | ATF_BOOT_UART_BASE ?= "${SOC_ATF_BOOT_UART_BASE}" | ||
124 | |||
116 | PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" | 125 | PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" |
117 | XSERVER_DRIVER = "xf86-video-fbdev" | 126 | XSERVER_DRIVER = "xf86-video-fbdev" |
118 | XSERVER_DRIVER:vf-generic-bsp = "xf86-video-modesetting" | 127 | XSERVER_DRIVER:vf-generic-bsp = "xf86-video-modesetting" |
diff --git a/recipes-bsp/imx-atf/imx-atf_2.6.bb b/recipes-bsp/imx-atf/imx-atf_2.6.bb index 95258247..194ef935 100644 --- a/recipes-bsp/imx-atf/imx-atf_2.6.bb +++ b/recipes-bsp/imx-atf/imx-atf_2.6.bb | |||
@@ -18,7 +18,11 @@ S = "${WORKDIR}/git" | |||
18 | 18 | ||
19 | inherit deploy | 19 | inherit deploy |
20 | 20 | ||
21 | ATF_PLATFORM ??= "INVALID" | 21 | ATF_PLATFORM ??= "INVALID" |
22 | |||
23 | # FIXME: We should return INVALID here but currently only i.MX8M has support to override the UART | ||
24 | # base address in source code. | ||
25 | ATF_BOOT_UART_BASE ?= "" | ||
22 | 26 | ||
23 | EXTRA_OEMAKE += " \ | 27 | EXTRA_OEMAKE += " \ |
24 | CROSS_COMPILE="${TARGET_PREFIX}" \ | 28 | CROSS_COMPILE="${TARGET_PREFIX}" \ |
@@ -48,6 +52,9 @@ EXTRA_OEMAKE += 'LD="${@remove_options_tail(d.getVar('LD'))}"' | |||
48 | 52 | ||
49 | EXTRA_OEMAKE += 'CC="${@remove_options_tail(d.getVar('CC'))}"' | 53 | EXTRA_OEMAKE += 'CC="${@remove_options_tail(d.getVar('CC'))}"' |
50 | 54 | ||
55 | # Set the UART to use during the boot. | ||
56 | EXTRA_OEMAKE += 'IMX_BOOT_UART_BASE=${ATF_BOOT_UART_BASE}' | ||
57 | |||
51 | do_configure[noexec] = "1" | 58 | do_configure[noexec] = "1" |
52 | 59 | ||
53 | do_compile() { | 60 | do_compile() { |