Merge git://git.denx.de/u-boot-marvell
- Enable network interface on clearfog_gt_8k (Baruch) - Fix dreamplug boot by adding an spi0 alias to the DT (Chris) - Fix / enhance Marvell ddr3 setup / parameters (Chris) - Change CONFIG_SYS_MALLOC_F_LEN to 0x2000 on db-88f6820-amc (Chris) - Enable SPL_FLASH_BAR on db-88f6820-amc (Chris) - Use correct pcie controller name in Armada-38x dts files (Chris) - Disable d-cache on Kirkwood platforms as currently needed (Chris) - Add a more descriptive comment to pci_mvebu.c (Stefan) - Update Marvell maintainers entry (Stefan)
This commit is contained in:
@@ -133,7 +133,7 @@
|
||||
};
|
||||
};
|
||||
|
||||
pcie-controller {
|
||||
pcie {
|
||||
status = "okay";
|
||||
pcie@1,0 {
|
||||
/* Port 0, Lane 0 */
|
||||
|
||||
@@ -96,7 +96,7 @@
|
||||
};
|
||||
};
|
||||
|
||||
pcie-controller {
|
||||
pcie {
|
||||
status = "okay";
|
||||
|
||||
pcie@1,0 {
|
||||
|
||||
@@ -124,7 +124,7 @@
|
||||
};
|
||||
};
|
||||
|
||||
pcie-controller {
|
||||
pcie {
|
||||
status = "okay";
|
||||
/*
|
||||
* The two PCIe units are accessible through
|
||||
|
||||
@@ -234,7 +234,7 @@
|
||||
};
|
||||
};
|
||||
|
||||
pcie-controller {
|
||||
pcie {
|
||||
status = "okay";
|
||||
/*
|
||||
* One PCIe units is accessible through
|
||||
|
||||
@@ -243,7 +243,7 @@
|
||||
};
|
||||
};
|
||||
|
||||
pcie-controller {
|
||||
pcie {
|
||||
status = "okay";
|
||||
/*
|
||||
* The two PCIe units are accessible through
|
||||
|
||||
@@ -18,6 +18,10 @@
|
||||
stdout-path = &uart0;
|
||||
};
|
||||
|
||||
aliases {
|
||||
spi0 = &spi0;
|
||||
};
|
||||
|
||||
ocp@f1000000 {
|
||||
pinctrl: pin-controller@10000 {
|
||||
pmx_led_bluetooth: pmx-led-bluetooth {
|
||||
|
||||
@@ -26,6 +26,12 @@
|
||||
#define CONFIG_KIRKWOOD_EGIGA_INIT /* Enable GbePort0/1 for kernel */
|
||||
#define CONFIG_KIRKWOOD_RGMII_PAD_1V8 /* Set RGMII Pad voltage to 1.8V */
|
||||
#define CONFIG_KIRKWOOD_PCIE_INIT /* Enable PCIE Port0 for kernel */
|
||||
/*
|
||||
* Disable the dcache. Currently the network driver (mvgbe.c) and USB
|
||||
* EHCI driver (ehci-marvell.c) and possibly others rely on the data
|
||||
* cache being disabled.
|
||||
*/
|
||||
#define CONFIG_SYS_DCACHE_OFF
|
||||
|
||||
/*
|
||||
* By default kwbimage.cfg from board specific folder is used
|
||||
|
||||
Reference in New Issue
Block a user