From: Baikal Electronics Date: Thu, 6 Apr 2023 08:59:20 +0000 (+0300) Subject: Merge branch 'upstream_testing' into baikal_mips_legacy_upstream X-Git-Tag: baikal/mips/sdk5.8.2~5 X-Git-Url: https://git.baikalelectronics.ru/?a=commitdiff_plain;h=6289a729f417a2c9a88a085d491c8cd9fde41080;p=uboot.git Merge branch 'upstream_testing' into baikal_mips_legacy_upstream --- 6289a729f417a2c9a88a085d491c8cd9fde41080 diff --cc drivers/clk/Makefile index 2cb6d23bf7,c274cda77c..b3f1c15a08 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile @@@ -53,5 -53,3 +53,4 @@@ obj-$(CONFIG_MACH_PIC32) += clk_pic32. obj-$(CONFIG_SANDBOX_CLK_CCF) += clk_sandbox_ccf.o obj-$(CONFIG_SANDBOX) += clk_sandbox.o obj-$(CONFIG_SANDBOX) += clk_sandbox_test.o - obj-$(CONFIG_STM32H7) += clk_stm32h7.o - obj-$(CONFIG_CLK_BAIKAL) += clk_baikal.o ++obj-$(CONFIG_CLK_BAIKAL) += clk_baikal.o diff --cc drivers/cpu/Kconfig index 9e3067ff74,3bf04105e5..fa83d71354 --- a/drivers/cpu/Kconfig +++ b/drivers/cpu/Kconfig @@@ -20,8 -20,10 +20,18 @@@ config CPU_RISC help Support CPU cores for RISC-V architecture. ++<<<<<<< HEAD +config CPU_BAIKAL + bool "Enable Baikal-T1 CPU driver" + depends on CPU + help + Support CPU cores for Baikal mips chips. ++======= + config CPU_MICROBLAZE + bool "Enable Microblaze CPU driver" + depends on CPU && MICROBLAZE + select DM_EVENT + select XILINX_MICROBLAZE0_PVR + help + Support CPU cores for Microblaze architecture. ++>>>>>>> upstream_testing diff --cc drivers/cpu/Makefile index 03a97aff49,3b38ba9c58..c91df34a9c --- a/drivers/cpu/Makefile +++ b/drivers/cpu/Makefile @@@ -9,7 -9,8 +9,9 @@@ obj-$(CONFIG_CPU) += cpu-uclass. obj-$(CONFIG_ARCH_BMIPS) += bmips_cpu.o obj-$(CONFIG_ARCH_IMX8) += imx8_cpu.o obj-$(CONFIG_ARCH_AT91) += at91_cpu.o + obj-$(CONFIG_ARCH_MEDIATEK) += mtk_cpu.o obj-$(CONFIG_CPU_MPC83XX) += mpc83xx_cpu.o obj-$(CONFIG_CPU_RISCV) += riscv_cpu.o +obj-$(CONFIG_CPU_BAIKAL) += baikal_cpu.o + obj-$(CONFIG_CPU_MICROBLAZE) += microblaze_cpu.o obj-$(CONFIG_SANDBOX) += cpu_sandbox.o diff --cc drivers/net/designware.c index 7e0b7bfb63,e09ca3313d..29024cccc2 --- a/drivers/net/designware.c +++ b/drivers/net/designware.c @@@ -237,10 -229,10 +229,10 @@@ static void tx_descs_init(struct dw_eth struct dmamacdescr *desc_p; u32 idx; - for (idx = 0; idx < CONFIG_TX_DESCR_NUM; idx++) { + for (idx = 0; idx < CFG_TX_DESCR_NUM; idx++) { desc_p = &desc_table_p[idx]; - desc_p->dmamac_addr = virt_to_phys(&txbuffs[idx * CONFIG_ETH_BUFSIZE]); - desc_p->dmamac_addr = (ulong)&txbuffs[idx * CFG_ETH_BUFSIZE]; - desc_p->dmamac_next = (ulong)&desc_table_p[idx + 1]; ++ desc_p->dmamac_addr = virt_to_phys(&txbuffs[idx * CFG_ETH_BUFSIZE]); + desc_p->dmamac_next = virt_to_phys(&desc_table_p[idx + 1]); #if defined(CONFIG_DW_ALTDESCRIPTOR) desc_p->txrx_status &= ~(DESC_TXSTS_TXINT | DESC_TXSTS_TXLAST | @@@ -285,11 -277,11 +277,10 @@@ static void rx_descs_init(struct dw_eth * GMAC data will be corrupted. */ flush_dcache_range((ulong)rxbuffs, (ulong)rxbuffs + RX_TOTAL_BUFSIZE); - for (idx = 0; idx < CONFIG_RX_DESCR_NUM; idx++) { + for (idx = 0; idx < CFG_RX_DESCR_NUM; idx++) { desc_p = &desc_table_p[idx]; - desc_p->dmamac_addr = virt_to_phys(&rxbuffs[idx * CONFIG_ETH_BUFSIZE]); - desc_p->dmamac_addr = (ulong)&rxbuffs[idx * CFG_ETH_BUFSIZE]; - desc_p->dmamac_next = (ulong)&desc_table_p[idx + 1]; - ++ desc_p->dmamac_addr = virt_to_phys(&rxbuffs[idx * CFG_ETH_BUFSIZE]); + desc_p->dmamac_next = virt_to_phys(&desc_table_p[idx + 1]); - desc_p->dmamac_cntl = (MAC_MAX_FRAME_SZ & DESC_RXCTRL_SIZE1MASK) | DESC_RXCTRL_RXCHAIN; diff --cc drivers/net/designware.h index 14cb81f768,9da4e902cb..78513cd255 --- a/drivers/net/designware.h +++ b/drivers/net/designware.h @@@ -248,12 -243,8 +243,11 @@@ struct dw_eth_dev struct phy_device *phydev; struct mii_dev *bus; + u32 flags; +#define DWMAC_PHY_RESET 1 +#define DWMAC_PHY_RECONFIG 2 }; - #ifdef CONFIG_DM_ETH int designware_eth_of_to_plat(struct udevice *dev); int designware_eth_probe(struct udevice *dev); extern const struct eth_ops designware_eth_ops; diff --cc drivers/pci/Kconfig index 43c88b68ba,ef328d2652..e2924eb977 --- a/drivers/pci/Kconfig +++ b/drivers/pci/Kconfig @@@ -121,14 -142,12 +142,18 @@@ config PCIE_DW_SIFIV Say Y here if you want to enable PCIe controller support on FU740. +config PCIE_DW_GENERIC + bool "Enable generic DesignWare PCIe driver" + help + Say Y here if you want to enable PCIe controller support on + DesignWare hardware. + + config SYS_FSL_PCI_VER_3_X + bool + config PCIE_FSL bool "FSL PowerPC PCIe support" + select SYS_FSL_PCI_VER_3_X if ARCH_T2080 || ARCH_T4240 help Say Y here if you want to enable PCIe controller support on FSL PowerPC MPC85xx, MPC86xx, B series, P series and T series SoCs. diff --cc tools/image-host.c index e3ea82a1e2,4a24dee815..b695c8be03 --- a/tools/image-host.c +++ b/tools/image-host.c @@@ -14,13 -14,9 +14,11 @@@ #include #include +/* #include #include +*/ - #define IMAGE_PRE_LOAD_PATH "/image/pre-load/sig" - /** * fit_set_hash_value - set hash value in requested has node * @fit: pointer to the FIT format image header