Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 15:14:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge https://gitlab.denx.de/u-boot/custodians/u-boot-mpc85xx

Browse source 
- powerpc: Fix DM_MMC related build warnings by adding eSDHC device
  module support for T4240RDB, T2080RDB, T1042D4RDB, T1024RDB, P5040DS,
  P4080DS, P3041DS, P2041RDB, P2020RDB, P1020RDB platforms
This commit is contained in:
Tom Rini 2019-11-28 07:32:44 -05:00
commit 4b39568cfd
59 changed files with 109 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
arch/powerpc/dts/p1020-post.dtsi
View file

@ -24,6 +24,13 @@
single-cpu-affinity; single-cpu-affinity;
last-interrupt-source = <255>; last-interrupt-source = <255>;
}; };
esdhc: esdhc@2e000 {
compatible = "fsl,esdhc";
reg = <0x2e000 0x1000>;
/* Filled in by U-Boot */
clock-frequency = <0>;
};
}; };
/* PCIe controller base address 0x9000 */ /* PCIe controller base address 0x9000 */

7
arch/powerpc/dts/p2020-post.dtsi
View file

@ -24,6 +24,13 @@
single-cpu-affinity; single-cpu-affinity;
last-interrupt-source = <255>; last-interrupt-source = <255>;
}; };
esdhc: esdhc@2e000 {
compatible = "fsl,esdhc";
reg = <0x2e000 0x1000>;
/* Filled in by U-Boot */
clock-frequency = <0>;
};
}; };
/* PCIe controller base address 0x8000 */ /* PCIe controller base address 0x8000 */

6
arch/powerpc/dts/p2041.dtsi
View file

@ -68,6 +68,12 @@
sata-number = <2>; sata-number = <2>;
sata-fpdma = <0>; sata-fpdma = <0>;
}; };
esdhc: esdhc@114000 {
compatible = "fsl,esdhc";
reg = <0x114000 0x1000>;
clock-frequency = <0>;
};
}; };
pcie@ffe200000 { pcie@ffe200000 {

6
arch/powerpc/dts/p3041.dtsi
View file

@ -68,6 +68,12 @@
sata-number = <2>; sata-number = <2>;
sata-fpdma = <0>; sata-fpdma = <0>;
}; };
esdhc: esdhc@114000 {
compatible = "fsl,esdhc";
reg = <0x114000 0x1000>;
clock-frequency = <0>;
};
}; };
pcie@ffe200000 { pcie@ffe200000 {

6
arch/powerpc/dts/p4080.dtsi
View file

@ -79,6 +79,12 @@
device_type = "open-pic"; device_type = "open-pic";
clock-frequency = <0x0>; clock-frequency = <0x0>;
}; };
esdhc: esdhc@114000 {
compatible = "fsl,esdhc";
reg = <0x114000 0x1000>;
clock-frequency = <0>;
};
}; };
pcie@ffe200000 { pcie@ffe200000 {

6
arch/powerpc/dts/p5040.dtsi
View file

@ -67,6 +67,12 @@
sata-number = <2>; sata-number = <2>;
sata-fpdma = <0>; sata-fpdma = <0>;
}; };
esdhc: esdhc@114000 {
compatible = "fsl,esdhc";
reg = <0x114000 0x1000>;
clock-frequency = <0>;
};
}; };
pcie@ffe200000 { pcie@ffe200000 {

6
arch/powerpc/dts/t102x.dtsi
View file

@ -57,6 +57,12 @@
sata-number = <2>; sata-number = <2>;
sata-fpdma = <0>; sata-fpdma = <0>;
}; };
esdhc: esdhc@114000 {
compatible = "fsl,esdhc";
reg = <0x114000 0x1000>;
clock-frequency = <0>;
};
}; };
pcie@ffe240000 { pcie@ffe240000 {

6
arch/powerpc/dts/t104x.dtsi
View file

@ -67,6 +67,12 @@
sata-number = <2>; sata-number = <2>;
sata-fpdma = <0>; sata-fpdma = <0>;
}; };
esdhc: esdhc@114000 {
compatible = "fsl,esdhc";
reg = <0x114000 0x1000>;
clock-frequency = <0>;
};
}; };
pcie@ffe240000 { pcie@ffe240000 {

6
arch/powerpc/dts/t4240.dtsi
View file

@ -107,6 +107,12 @@
sata-number = <2>; sata-number = <2>;
sata-fpdma = <0>; sata-fpdma = <0>;
}; };
esdhc: esdhc@114000 {
compatible = "fsl,esdhc";
reg = <0x114000 0x1000>;
clock-frequency = <0>;
};
}; };
pcie@ffe240000 { pcie@ffe240000 {

4
board/freescale/common/sdhc_boot.c
View file

@ -28,7 +28,11 @@ int mmc_get_env_addr(struct mmc *mmc, int copy, u32 *env_addr)
return 1; return 1;
/* read out the first block, get the config data information */ /* read out the first block, get the config data information */
#ifdef CONFIG_BLK
n = blk_dread(mmc_get_blk_desc(mmc), 0, 1, tmp_buf);
#else
n = mmc->block_dev.block_read(&mmc->block_dev, 0, 1, tmp_buf); n = mmc->block_dev.block_read(&mmc->block_dev, 0, 1, tmp_buf);
#endif
if (!n) { if (!n) {
free(tmp_buf); free(tmp_buf);
return 1; return 1;

1
configs/P1020RDB-PC_36BIT_NAND_defconfig
View file

@ -72,3 +72,4 @@ CONFIG_SPI=y
CONFIG_FSL_ESPI=y CONFIG_FSL_ESPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_DM_MMC=y

1
configs/P1020RDB-PC_36BIT_SDCARD_defconfig
View file

@ -67,3 +67,4 @@ CONFIG_SPI=y
CONFIG_FSL_ESPI=y CONFIG_FSL_ESPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_DM_MMC=y

1
configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig
View file

@ -69,3 +69,4 @@ CONFIG_SPI=y
CONFIG_FSL_ESPI=y CONFIG_FSL_ESPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_DM_MMC=y

1
configs/P1020RDB-PC_36BIT_defconfig
View file

@ -56,3 +56,4 @@ CONFIG_SPI=y
CONFIG_FSL_ESPI=y CONFIG_FSL_ESPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_DM_MMC=y

1
configs/P1020RDB-PC_NAND_defconfig
View file

@ -71,3 +71,4 @@ CONFIG_SPI=y
CONFIG_FSL_ESPI=y CONFIG_FSL_ESPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_DM_MMC=y

1
configs/P1020RDB-PC_SDCARD_defconfig
View file

@ -66,3 +66,4 @@ CONFIG_SPI=y
CONFIG_FSL_ESPI=y CONFIG_FSL_ESPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_DM_MMC=y

1
configs/P1020RDB-PC_SPIFLASH_defconfig
View file

@ -68,3 +68,4 @@ CONFIG_SPI=y
CONFIG_FSL_ESPI=y CONFIG_FSL_ESPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_DM_MMC=y

1
configs/P1020RDB-PC_defconfig
View file

@ -55,3 +55,4 @@ CONFIG_SPI=y
CONFIG_FSL_ESPI=y CONFIG_FSL_ESPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_DM_MMC=y

1
configs/P1020RDB-PD_NAND_defconfig
View file

@ -75,3 +75,4 @@ CONFIG_SPI=y
CONFIG_FSL_ESPI=y CONFIG_FSL_ESPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_DM_MMC=y

1
configs/P1020RDB-PD_SDCARD_defconfig
View file

@ -70,3 +70,4 @@ CONFIG_SPI=y
CONFIG_FSL_ESPI=y CONFIG_FSL_ESPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_DM_MMC=y

1
configs/P1020RDB-PD_SPIFLASH_defconfig
View file

@ -72,3 +72,4 @@ CONFIG_SPI=y
CONFIG_FSL_ESPI=y CONFIG_FSL_ESPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_DM_MMC=y

1
configs/P1020RDB-PD_defconfig
View file

@ -59,3 +59,4 @@ CONFIG_SPI=y
CONFIG_FSL_ESPI=y CONFIG_FSL_ESPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_DM_MMC=y

1
configs/P2020RDB-PC_36BIT_NAND_defconfig
View file

@ -77,3 +77,4 @@ CONFIG_SPI=y
CONFIG_FSL_ESPI=y CONFIG_FSL_ESPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_DM_MMC=y

1
configs/P2020RDB-PC_36BIT_SDCARD_defconfig
View file

@ -72,3 +72,4 @@ CONFIG_SPI=y
CONFIG_FSL_ESPI=y CONFIG_FSL_ESPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_DM_MMC=y

1
configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig
View file

@ -74,3 +74,4 @@ CONFIG_SPI=y
CONFIG_FSL_ESPI=y CONFIG_FSL_ESPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_DM_MMC=y

1
configs/P2020RDB-PC_36BIT_defconfig
View file

@ -61,3 +61,4 @@ CONFIG_SPI=y
CONFIG_FSL_ESPI=y CONFIG_FSL_ESPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_DM_MMC=y

1
configs/P2020RDB-PC_NAND_defconfig
View file

@ -76,3 +76,4 @@ CONFIG_SPI=y
CONFIG_FSL_ESPI=y CONFIG_FSL_ESPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_DM_MMC=y

1
configs/P2020RDB-PC_SDCARD_defconfig
View file

@ -71,3 +71,4 @@ CONFIG_SPI=y
CONFIG_FSL_ESPI=y CONFIG_FSL_ESPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_DM_MMC=y

1
configs/P2020RDB-PC_SPIFLASH_defconfig
View file

@ -73,3 +73,4 @@ CONFIG_SPI=y
CONFIG_FSL_ESPI=y CONFIG_FSL_ESPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_DM_MMC=y

1
configs/P2020RDB-PC_defconfig
View file

@ -60,3 +60,4 @@ CONFIG_SPI=y
CONFIG_FSL_ESPI=y CONFIG_FSL_ESPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_DM_MMC=y

1
configs/P2041RDB_NAND_defconfig
View file

@ -56,3 +56,4 @@ CONFIG_SPI=y
CONFIG_FSL_ESPI=y CONFIG_FSL_ESPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_DM_MMC=y

1
configs/P2041RDB_SDCARD_defconfig
View file

@ -55,3 +55,4 @@ CONFIG_SPI=y
CONFIG_FSL_ESPI=y CONFIG_FSL_ESPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_DM_MMC=y

1
configs/P2041RDB_SPIFLASH_defconfig
View file

@ -56,3 +56,4 @@ CONFIG_SPI=y
CONFIG_FSL_ESPI=y CONFIG_FSL_ESPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_DM_MMC=y

1
configs/P2041RDB_defconfig
View file

@ -54,3 +54,4 @@ CONFIG_SPI=y
CONFIG_FSL_ESPI=y CONFIG_FSL_ESPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_DM_MMC=y

1
configs/P3041DS_NAND_defconfig
View file

@ -56,3 +56,4 @@ CONFIG_SPI=y
CONFIG_FSL_ESPI=y CONFIG_FSL_ESPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_DM_MMC=y

1
configs/P3041DS_SDCARD_defconfig
View file

@ -55,3 +55,4 @@ CONFIG_SPI=y
CONFIG_FSL_ESPI=y CONFIG_FSL_ESPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_DM_MMC=y

1
configs/P3041DS_SPIFLASH_defconfig
View file

@ -56,3 +56,4 @@ CONFIG_SPI=y
CONFIG_FSL_ESPI=y CONFIG_FSL_ESPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_DM_MMC=y

1
configs/P3041DS_defconfig
View file

@ -54,3 +54,4 @@ CONFIG_SPI=y
CONFIG_FSL_ESPI=y CONFIG_FSL_ESPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_DM_MMC=y

1
configs/P4080DS_SDCARD_defconfig
View file

@ -55,3 +55,4 @@ CONFIG_SPI=y
CONFIG_FSL_ESPI=y CONFIG_FSL_ESPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_DM_MMC=y

1
configs/P4080DS_SPIFLASH_defconfig
View file

@ -56,3 +56,4 @@ CONFIG_SPI=y
CONFIG_FSL_ESPI=y CONFIG_FSL_ESPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_DM_MMC=y

1
configs/P4080DS_defconfig
View file

@ -54,3 +54,4 @@ CONFIG_SPI=y
CONFIG_FSL_ESPI=y CONFIG_FSL_ESPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_DM_MMC=y

1
configs/P5040DS_NAND_defconfig
View file

@ -57,3 +57,4 @@ CONFIG_SPI=y
CONFIG_FSL_ESPI=y CONFIG_FSL_ESPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_DM_MMC=y

1
configs/P5040DS_SDCARD_defconfig
View file

@ -56,3 +56,4 @@ CONFIG_SPI=y
CONFIG_FSL_ESPI=y CONFIG_FSL_ESPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_DM_MMC=y

1
configs/P5040DS_SPIFLASH_defconfig
View file

@ -57,3 +57,4 @@ CONFIG_SPI=y
CONFIG_FSL_ESPI=y CONFIG_FSL_ESPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_DM_MMC=y

1
configs/P5040DS_defconfig
View file

@ -55,3 +55,4 @@ CONFIG_SPI=y
CONFIG_FSL_ESPI=y CONFIG_FSL_ESPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_DM_MMC=y

1
configs/T1024RDB_NAND_defconfig
View file

@ -78,3 +78,4 @@ CONFIG_SPI=y
CONFIG_FSL_ESPI=y CONFIG_FSL_ESPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_DM_MMC=y

1
configs/T1024RDB_SDCARD_defconfig
View file

@ -75,3 +75,4 @@ CONFIG_SPI=y
CONFIG_FSL_ESPI=y CONFIG_FSL_ESPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_DM_MMC=y

1
configs/T1024RDB_SPIFLASH_defconfig
View file

@ -78,3 +78,4 @@ CONFIG_SPI=y
CONFIG_FSL_ESPI=y CONFIG_FSL_ESPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_DM_MMC=y

1
configs/T1024RDB_defconfig
View file

@ -63,3 +63,4 @@ CONFIG_SPI=y
CONFIG_FSL_ESPI=y CONFIG_FSL_ESPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_DM_MMC=y

1
configs/T1042D4RDB_NAND_defconfig
View file

@ -78,3 +78,4 @@ CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_VIDEO=y CONFIG_VIDEO=y
CONFIG_CFB_CONSOLE_ANSI=y CONFIG_CFB_CONSOLE_ANSI=y
CONFIG_DM_MMC=y

1
configs/T1042D4RDB_SDCARD_defconfig
View file

@ -75,3 +75,4 @@ CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_VIDEO=y CONFIG_VIDEO=y
CONFIG_CFB_CONSOLE_ANSI=y CONFIG_CFB_CONSOLE_ANSI=y
CONFIG_DM_MMC=y

1
configs/T1042D4RDB_SPIFLASH_defconfig
View file

@ -78,3 +78,4 @@ CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_VIDEO=y CONFIG_VIDEO=y
CONFIG_CFB_CONSOLE_ANSI=y CONFIG_CFB_CONSOLE_ANSI=y
CONFIG_DM_MMC=y

1
configs/T1042D4RDB_defconfig
View file

@ -63,3 +63,4 @@ CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_VIDEO=y CONFIG_VIDEO=y
CONFIG_CFB_CONSOLE_ANSI=y CONFIG_CFB_CONSOLE_ANSI=y
CONFIG_DM_MMC=y

1
configs/T2080RDB_NAND_defconfig
View file

@ -74,3 +74,4 @@ CONFIG_SPI=y
CONFIG_FSL_ESPI=y CONFIG_FSL_ESPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_DM_MMC=y

1
configs/T2080RDB_SDCARD_defconfig
View file

@ -71,3 +71,4 @@ CONFIG_SPI=y
CONFIG_FSL_ESPI=y CONFIG_FSL_ESPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_DM_MMC=y

1
configs/T2080RDB_SPIFLASH_defconfig
View file

@ -74,3 +74,4 @@ CONFIG_SPI=y
CONFIG_FSL_ESPI=y CONFIG_FSL_ESPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_DM_MMC=y

1
configs/T2080RDB_defconfig
View file

@ -59,3 +59,4 @@ CONFIG_SPI=y
CONFIG_FSL_ESPI=y CONFIG_FSL_ESPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_DM_MMC=y

1
configs/T4240RDB_SDCARD_defconfig
View file

@ -65,3 +65,4 @@ CONFIG_SPI=y
CONFIG_FSL_ESPI=y CONFIG_FSL_ESPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_DM_MMC=y

1
configs/T4240RDB_defconfig
View file

@ -53,3 +53,4 @@ CONFIG_SPI=y
CONFIG_FSL_ESPI=y CONFIG_FSL_ESPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_DM_MMC=y