diff options
author | Tom Rini <trini@konsulko.com> | 2020-01-21 08:36:50 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-01-21 08:36:50 -0500 |
commit | ad647690b1346f57847d4c9251293293af8928a8 (patch) | |
tree | fc1e5e42f6e5869e950ecc394635b12e2b7d9f66 /board/freescale | |
parent | 07add22cab3be86067c227a30ad5d0feab541316 (diff) | |
parent | 419603ca2d7a8065029a838cb0227ad7bfc5e1d3 (diff) |
Merge tag 'u-boot-imx-20200121' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
---------------------------------
imx8: cleanup, fix warnings
imx6ull: add VisionSOM SoM and EVK
mx7ulp: fix warning due network, cleanup
mx7dsabre: Fix dm probe pmic
imx6: fixed for vining2000
Travis: https://travis-ci.org/sbabic/u-boot-imx/builds/639512296
Diffstat (limited to 'board/freescale')
-rw-r--r-- | board/freescale/imx8mm_evk/README | 4 | ||||
-rw-r--r-- | board/freescale/imx8mm_evk/imx8mm_evk.c | 1 | ||||
-rw-r--r-- | board/freescale/imx8mm_evk/spl.c | 4 | ||||
-rw-r--r-- | board/freescale/imx8qm_mek/imx8qm_mek.c | 6 | ||||
-rw-r--r-- | board/freescale/imx8qxp_mek/imx8qxp_mek.c | 6 | ||||
-rw-r--r-- | board/freescale/mx7dsabresd/mx7dsabresd.c | 2 |
6 files changed, 8 insertions, 15 deletions
diff --git a/board/freescale/imx8mm_evk/README b/board/freescale/imx8mm_evk/README index c908c0adc4d..9921b359892 100644 --- a/board/freescale/imx8mm_evk/README +++ b/board/freescale/imx8mm_evk/README @@ -15,12 +15,12 @@ branch: imx_4.19.35_1.0.0 $ make PLAT=imx8mm bl31 $ cp build/imx8mm/release/bl31.bin $(builddir) -Get the ddr and hdmi firmware +Get the ddr firmware ============================= $ wget https://www.nxp.com/lgfiles/NMG/MAD/YOCTO/firmware-imx-8.0.bin $ chmod +x firmware-imx-8.0.bin $ ./firmware-imx-8.0 -$ cp firmware-imx-7.9/firmware/ddr/synopsys/lpddr4*.bin $(builddir) +$ cp firmware-imx-8.0/firmware/ddr/synopsys/lpddr4*.bin $(builddir) Build U-Boot ============ diff --git a/board/freescale/imx8mm_evk/imx8mm_evk.c b/board/freescale/imx8mm_evk/imx8mm_evk.c index a0af550f5e2..c5fd940eeb7 100644 --- a/board/freescale/imx8mm_evk/imx8mm_evk.c +++ b/board/freescale/imx8mm_evk/imx8mm_evk.c @@ -8,6 +8,7 @@ #include <netdev.h> #include <asm/arch/clock.h> +#include <asm/arch/sys_proto.h> #include <asm/io.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/board/freescale/imx8mm_evk/spl.c b/board/freescale/imx8mm_evk/spl.c index a26fc96b91d..5d17f397cb6 100644 --- a/board/freescale/imx8mm_evk/spl.c +++ b/board/freescale/imx8mm_evk/spl.c @@ -39,7 +39,7 @@ int spl_board_boot_device(enum boot_device boot_dev_spl) } } -void spl_dram_init(void) +static void spl_dram_init(void) { ddr_init(&dram_timing); } @@ -84,7 +84,7 @@ int board_early_init_f(void) return 0; } -int power_init_board(void) +static int power_init_board(void) { struct udevice *dev; int ret; diff --git a/board/freescale/imx8qm_mek/imx8qm_mek.c b/board/freescale/imx8qm_mek/imx8qm_mek.c index bf296a6eb59..c9b9b2547ea 100644 --- a/board/freescale/imx8qm_mek/imx8qm_mek.c +++ b/board/freescale/imx8qm_mek/imx8qm_mek.c @@ -9,6 +9,7 @@ #include <errno.h> #include <init.h> #include <linux/libfdt.h> +#include <fdt_support.h> #include <asm/io.h> #include <asm/gpio.h> #include <asm/arch/clock.h> @@ -100,11 +101,6 @@ int board_init(void) return 0; } -void detail_board_ddr_info(void) -{ - puts("\nDDR "); -} - /* * Board specific reset that is system reset. */ diff --git a/board/freescale/imx8qxp_mek/imx8qxp_mek.c b/board/freescale/imx8qxp_mek/imx8qxp_mek.c index 1577cd6ba76..b96f0da21ef 100644 --- a/board/freescale/imx8qxp_mek/imx8qxp_mek.c +++ b/board/freescale/imx8qxp_mek/imx8qxp_mek.c @@ -10,6 +10,7 @@ #include <init.h> #include <linux/libfdt.h> #include <fsl_esdhc_imx.h> +#include <fdt_support.h> #include <asm/io.h> #include <asm/gpio.h> #include <asm/arch/clock.h> @@ -113,11 +114,6 @@ int board_init(void) return 0; } -void detail_board_ddr_info(void) -{ - puts("\nDDR "); -} - /* * Board specific reset that is system reset. */ diff --git a/board/freescale/mx7dsabresd/mx7dsabresd.c b/board/freescale/mx7dsabresd/mx7dsabresd.c index 835eed33164..41c620795cb 100644 --- a/board/freescale/mx7dsabresd/mx7dsabresd.c +++ b/board/freescale/mx7dsabresd/mx7dsabresd.c @@ -264,7 +264,7 @@ int power_init_board(void) struct udevice *dev; int ret, dev_id, rev_id; - ret = pmic_get("pfuze3000@08", &dev); + ret = pmic_get("pfuze3000@8", &dev); if (ret == -ENODEV) return 0; if (ret != 0) |