Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-25 14:56:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes for 2020.04

Browse source 
-----------------
 
 - mx7dsabre: Fix ramdisk_addr* for distro boot
 - Toradex boards
 
 Travis: https://travis-ci.org/github/sbabic/u-boot-imx/builds/671988124
 -----BEGIN PGP SIGNATURE-----
 
 iG0EABECAC0WIQS2TmnA27QKhpKSZe309WXkmmjvpgUCXo2IDQ8cc2JhYmljQGRl
 bnguZGUACgkQ9PVl5Jpo76ZaKQCePCYu5biYZZK+LfCdfyzlkwLwvpQAmwaMpj/P
 IxbFRRvzox2qtJEk4dN3
 =788e
 -----END PGP SIGNATURE-----

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

Fixes for 2020.04
-----------------

- mx7dsabre: Fix ramdisk_addr* for distro boot
- Toradex boards

Travis: https://travis-ci.org/github/sbabic/u-boot-imx/builds/671988124
This commit is contained in:
Tom Rini 2020-04-08 12:06:39 -04:00
commit dfd5321bec
4 changed files with 84 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
arch/arm/dts/fsl-imx8qm-apalis-u-boot.dtsi
View file

@ -4,125 +4,133 @@
*/ */
&mu { &mu {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&clk { &clk {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&iomuxc { &iomuxc {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&pd_lsio { &pd_lsio {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&pd_lsio_gpio0 { &pd_lsio_gpio0 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&pd_lsio_gpio1 { &pd_lsio_gpio1 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&pd_lsio_gpio2 { &pd_lsio_gpio2 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&pd_lsio_gpio3 { &pd_lsio_gpio3 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&pd_lsio_gpio4 { &pd_lsio_gpio4 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&pd_lsio_gpio5 { &pd_lsio_gpio5 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&pd_lsio_gpio6 { &pd_lsio_gpio6 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&pd_lsio_gpio7 { &pd_lsio_gpio7 {
u-boot,dm-spl; u-boot,dm-pre-proper;
};
&pd_dma {
u-boot,dm-pre-proper;
};
&pd_dma_lpuart1 {
u-boot,dm-pre-proper;
}; };
&pd_conn { &pd_conn {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&pd_conn_sdch0 { &pd_conn_sdch0 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&pd_conn_sdch1 { &pd_conn_sdch1 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&pd_conn_sdch2 { &pd_conn_sdch2 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&gpio0 { &gpio0 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&gpio1 { &gpio1 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&gpio2 { &gpio2 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&gpio3 { &gpio3 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&gpio4 { &gpio4 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&gpio5 { &gpio5 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&gpio6 { &gpio6 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&gpio7 { &gpio7 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&lpuart0 { &lpuart0 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&lpuart1 { &lpuart1 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&lpuart2 { &lpuart2 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&lpuart3 { &lpuart3 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&usdhc1 { &usdhc1 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&usdhc2 { &usdhc2 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&usdhc3 { &usdhc3 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };

68
arch/arm/dts/fsl-imx8qxp-colibri-u-boot.dtsi
View file

@ -5,113 +5,125 @@
&{/imx8qx-pm} { &{/imx8qx-pm} {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&mu { &mu {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&clk { &clk {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&iomuxc { &iomuxc {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&pd_lsio { &pd_lsio {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&pd_lsio_gpio0 { &pd_lsio_gpio0 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&pd_lsio_gpio1 { &pd_lsio_gpio1 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&pd_lsio_gpio2 { &pd_lsio_gpio2 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&pd_lsio_gpio3 { &pd_lsio_gpio3 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&pd_lsio_gpio4 { &pd_lsio_gpio4 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&pd_lsio_gpio5 { &pd_lsio_gpio5 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&pd_lsio_gpio6 { &pd_lsio_gpio6 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&pd_lsio_gpio7 { &pd_lsio_gpio7 {
u-boot,dm-spl; u-boot,dm-pre-proper;
};
&pd_dma {
u-boot,dm-pre-proper;
};
&pd_dma_lpuart0 {
u-boot,dm-pre-proper;
};
&pd_dma_lpuart3 {
u-boot,dm-pre-proper;
}; };
&pd_conn { &pd_conn {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&pd_conn_sdch0 { &pd_conn_sdch0 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&pd_conn_sdch1 { &pd_conn_sdch1 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&pd_conn_sdch2 { &pd_conn_sdch2 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&gpio0 { &gpio0 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&gpio1 { &gpio1 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&gpio2 { &gpio2 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&gpio3 { &gpio3 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&gpio4 { &gpio4 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&gpio5 { &gpio5 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&gpio6 { &gpio6 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&gpio7 { &gpio7 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&lpuart3 { &lpuart3 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&usdhc1 { &usdhc1 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };
&usdhc2 { &usdhc2 {
u-boot,dm-spl; u-boot,dm-pre-proper;
}; };

3
board/toradex/colibri_imx6/colibri_imx6.c
View file

@ -354,12 +354,15 @@ int board_phy_config(struct phy_device *phydev)
int setup_fec(void) int setup_fec(void)
{ {
int ret; int ret;
struct iomuxc *iomuxc_regs = (struct iomuxc *)IOMUXC_BASE_ADDR;
/* provide the PHY clock from the i.MX 6 */ /* provide the PHY clock from the i.MX 6 */
ret = enable_fec_anatop_clock(0, ENET_50MHZ); ret = enable_fec_anatop_clock(0, ENET_50MHZ);
if (ret) if (ret)
return ret; return ret;
setbits_le32(&iomuxc_regs->gpr[1], IOMUXC_GPR1_ENET_CLK_SEL_MASK);
return 0; return 0;
} }

4
include/configs/mx7dsabresd.h
View file

@ -81,8 +81,8 @@
"fdt_addr_r=0x83000000\0" \ "fdt_addr_r=0x83000000\0" \
"kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
"pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ "pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
"ramdisk_addr_r=0x83000000\0" \ "ramdisk_addr_r=0x83100000\0" \
"ramdiskaddr=0x83000000\0" \ "ramdiskaddr=0x83100000\0" \
"scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \ "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \
"videomode=video=ctfb:x:480,y:272,depth:24,pclk:108695,le:8,ri:4,up:2,lo:4,hs:41,vs:10,sync:0,vmode:0\0" \ "videomode=video=ctfb:x:480,y:272,depth:24,pclk:108695,le:8,ri:4,up:2,lo:4,hs:41,vs:10,sync:0,vmode:0\0" \
BOOTENV BOOTENV