mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-08-31 03:21:27 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge tag 'u-boot-imx-master-20240304' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

Browse Source 
CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/19817

- Fix i.MX93 OP-TEE support.
- Use the container image for i.MX93 revision A1.
- Fix display regression on opos6uldev.
This commit is contained in:
Tom Rini 2024-03-04 15:41:38 -05:00
commit 773cb2bca7
13 changed files with 59 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
arch/arm/dts/imx6ul-opos6uldev-u-boot.dtsi
View File

@ -7,12 +7,6 @@
#include "imx6ul-opos6ul-u-boot.dtsi" #include "imx6ul-opos6ul-u-boot.dtsi"
/ {
aliases {
display0 = &lcdif;
};
};
&aips1 { &aips1 {
bootph-pre-ram; bootph-pre-ram;
@ -22,7 +16,29 @@
}; };
&lcdif { &lcdif {
display = <&display0>;
bootph-some-ram; bootph-some-ram;
display0: display0 {
bits-per-pixel = <18>;
bus-width = <18>;
display-timings {
timing0 {
clock-frequency = <33300000>;
hactive = <800>;
vactive = <480>;
hback-porch = <36>;
hfront-porch = <210>;
vback-porch = <13>;
vfront-porch = <22>;
hsync-len = <10>;
vsync-len = <10>;
de-active = <1>;
pixelclk-active = <0>;
};
};
};
}; };
&pinctrl_uart1 { &pinctrl_uart1 {

1
arch/arm/mach-imx/imx9/container.cfg
View File

@ -8,3 +8,4 @@ SOC_TYPE IMX9
CONTAINER CONTAINER
IMAGE A55 bl31.bin 0x204E0000 IMAGE A55 bl31.bin 0x204E0000
IMAGE A55 u-boot.bin CONFIG_TEXT_BASE IMAGE A55 u-boot.bin CONFIG_TEXT_BASE
IMAGE A55 tee.bin 0x96000000

2
arch/arm/mach-imx/imx9/imximage.cfg
View File

@ -5,6 +5,6 @@
BOOT_FROM SD 0x400 BOOT_FROM SD 0x400
SOC_TYPE IMX9 SOC_TYPE IMX9
APPEND mx93a0-ahab-container.img APPEND mx93a1-ahab-container.img
CONTAINER CONTAINER
IMAGE A55 u-boot-spl-ddr.bin 0x2049A000 IMAGE A55 u-boot-spl-ddr.bin 0x2049A000

1
board/armadeus/opos6uldev/opos6uldev.env
View File

@ -24,7 +24,6 @@ mmcrootfstype=ext4 rootwait
kernelimg=opos6ul-linux.bin kernelimg=opos6ul-linux.bin
splashpos=0,0 splashpos=0,0
splashimage=CONFIG_SYS_LOAD_ADDR splashimage=CONFIG_SYS_LOAD_ADDR
videomode=video=ctfb:x:800,y:480,depth:18,pclk:33033,le:96,ri:96,up:20,lo:21,hs:64,vs:4,sync:0,vmode:0
check_env=if test -n ${flash_env_version}; check_env=if test -n ${flash_env_version};
then env default env_version; then env default env_version;
else env set flash_env_version ${env_version}; env save; else env set flash_env_version ${env_version}; env save;

7
board/freescale/imx93_evk/spl.c
View File

@ -20,6 +20,7 @@
#include <asm/mach-imx/boot_mode.h> #include <asm/mach-imx/boot_mode.h>
#include <asm/mach-imx/mxc_i2c.h> #include <asm/mach-imx/mxc_i2c.h>
#include <asm/arch-mx7ulp/gpio.h> #include <asm/arch-mx7ulp/gpio.h>
#include <asm/mach-imx/ele_api.h>
#include <asm/mach-imx/syscounter.h> #include <asm/mach-imx/syscounter.h>
#include <asm/sections.h> #include <asm/sections.h>
#include <dm/uclass.h> #include <dm/uclass.h>
@ -43,6 +44,12 @@ int spl_board_boot_device(enum boot_device boot_dev_spl)
void spl_board_init(void) void spl_board_init(void)
{ {
int ret;
ret = ele_start_rng();
if (ret)
printf("Fail to start RNG: %d\n", ret);
puts("Normal Boot\n"); puts("Normal Boot\n");
} }

7
board/phytec/phycore_imx93/spl.c
View File

@ -11,6 +11,7 @@
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>
#include <asm/arch/trdc.h> #include <asm/arch/trdc.h>
#include <asm/mach-imx/boot_mode.h> #include <asm/mach-imx/boot_mode.h>
#include <asm/mach-imx/ele_api.h>
#include <asm/sections.h> #include <asm/sections.h>
#include <hang.h> #include <hang.h>
#include <init.h> #include <init.h>
@ -34,6 +35,12 @@ int spl_board_boot_device(enum boot_device boot_dev_spl)
void spl_board_init(void) void spl_board_init(void)
{ {
int ret;
ret = ele_start_rng();
if (ret)
printf("Fail to start RNG: %d\n", ret);
puts("Normal Boot\n"); puts("Normal Boot\n");
} }

6
board/variscite/imx93_var_som/spl.c
View File

@ -20,6 +20,7 @@
#include <asm/mach-imx/mxc_i2c.h> #include <asm/mach-imx/mxc_i2c.h>
#include <asm/arch-mx7ulp/gpio.h> #include <asm/arch-mx7ulp/gpio.h>
#include <asm/sections.h> #include <asm/sections.h>
#include <asm/mach-imx/ele_api.h>
#include <asm/mach-imx/syscounter.h> #include <asm/mach-imx/syscounter.h>
#include <dm/uclass.h> #include <dm/uclass.h>
#include <dm/device.h> #include <dm/device.h>
@ -47,9 +48,14 @@ int spl_board_boot_device(enum boot_device boot_dev_spl)
void spl_board_init(void) void spl_board_init(void)
{ {
struct var_eeprom *ep = VAR_EEPROM_DATA; struct var_eeprom *ep = VAR_EEPROM_DATA;
int ret;
puts("Normal Boot\n"); puts("Normal Boot\n");
ret = ele_start_rng();
if (ret)
printf("Fail to start RNG: %d\n", ret);
/* Copy EEPROM contents to DRAM */ /* Copy EEPROM contents to DRAM */
memcpy(ep, &eeprom, sizeof(*ep)); memcpy(ep, &eeprom, sizeof(*ep));
} }

3
configs/opos6uldev_defconfig
View File

@ -115,13 +115,10 @@ CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_VIDEO=y CONFIG_VIDEO=y
CONFIG_VIDEO_LOGO=y CONFIG_VIDEO_LOGO=y
# CONFIG_VIDEO_BPP8 is not set
# CONFIG_VIDEO_BPP32 is not set
CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_VIDEO_MXS=y CONFIG_VIDEO_MXS=y
CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN=y
CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_SPLASH_SCREEN_ALIGN=y
CONFIG_SPLASH_SOURCE=y
CONFIG_BMP_16BPP=y CONFIG_BMP_16BPP=y
CONFIG_BMP_24BPP=y CONFIG_BMP_24BPP=y
CONFIG_BMP_32BPP=y CONFIG_BMP_32BPP=y

8
doc/board/nxp/imx93_11x11_evk.rst
View File

@ -42,10 +42,10 @@ Get ahab-container.img
.. code-block:: bash .. code-block:: bash
$ wget https://www.nxp.com/lgfiles/NMG/MAD/YOCTO/firmware-sentinel-0.10.bin $ wget https://www.nxp.com/lgfiles/NMG/MAD/YOCTO/firmware-sentinel-0.11.bin
$ chmod +x firmware-sentinel-0.10.bin $ chmod +x firmware-sentinel-0.11.bin
$ ./firmware-sentinel-0.10.bin $ ./firmware-sentinel-0.11.bin
$ cp firmware-sentinel-0.10/mx93a0-ahab-container.img $(srctree) $ cp firmware-sentinel-0.11/mx93a1-ahab-container.img $(srctree)
Build U-Boot Build U-Boot
------------ ------------

8
doc/board/phytec/imx93-phyboard-segin.rst
View File

@ -41,10 +41,10 @@ Get ahab-container.img
.. code-block:: bash .. code-block:: bash
$ wget https://www.nxp.com/lgfiles/NMG/MAD/YOCTO/firmware-sentinel-0.10.bin $ wget https://www.nxp.com/lgfiles/NMG/MAD/YOCTO/firmware-sentinel-0.11.bin
$ chmod +x firmware-sentinel-0.10.bin $ chmod +x firmware-sentinel-0.11.bin
$ ./firmware-sentinel-0.10.bin $ ./firmware-sentinel-0.11.bin
$ cp firmware-sentinel-0.10/mx93a0-ahab-container.img $(srctree) $ cp firmware-sentinel-0.11/mx93a1-ahab-container.img $(srctree)
Build U-Boot Build U-Boot
------------ ------------

8
doc/board/variscite/imx93_var_som.rst
View File

@ -42,10 +42,10 @@ Get ahab-container.img
.. code-block:: bash .. code-block:: bash
$ wget https://www.nxp.com/lgfiles/NMG/MAD/YOCTO/firmware-sentinel-0.10.bin $ wget https://www.nxp.com/lgfiles/NMG/MAD/YOCTO/firmware-sentinel-0.11.bin
$ chmod +x firmware-sentinel-0.10.bin $ chmod +x firmware-sentinel-0.11.bin
$ ./firmware-sentinel-0.10.bin $ ./firmware-sentinel-0.11.bin
$ cp firmware-sentinel-0.10/mx93a0-ahab-container.img $(srctree) $ cp firmware-sentinel-0.11/mx93a1-ahab-container.img $(srctree)
Build U-Boot Build U-Boot
------------ ------------

1
drivers/video/mxsfb.c
View File

@ -387,6 +387,7 @@ static int mxs_video_remove(struct udevice *dev)
static const struct udevice_id mxs_video_ids[] = { static const struct udevice_id mxs_video_ids[] = {
{ .compatible = "fsl,imx23-lcdif" }, { .compatible = "fsl,imx23-lcdif" },
{ .compatible = "fsl,imx28-lcdif" }, { .compatible = "fsl,imx28-lcdif" },
{ .compatible = "fsl,imx6sx-lcdif" },
{ .compatible = "fsl,imx7ulp-lcdif" }, { .compatible = "fsl,imx7ulp-lcdif" },
{ .compatible = "fsl,imxrt-lcdif" }, { .compatible = "fsl,imxrt-lcdif" },
{ /* sentinel */ } { /* sentinel */ }

2
tools/imx9_image.sh
View File

@ -19,7 +19,7 @@ for f in $blobs; do
fi fi
if [ ! -f $tmp ]; then if [ ! -f $tmp ]; then
echo "WARNING '$tmp' not found, resulting binary is not-functional" >&2 echo "WARNING '$tmp' not found, resulting binary may be not-functional" >&2
# Comment-out the lines for un-existing files. This way, # Comment-out the lines for un-existing files. This way,
# mkimage can keep working. This allows CI tests to pass even # mkimage can keep working. This allows CI tests to pass even