Merge patch series "MIPS: Boston: Various enhancements"
authorTom Rini <trini@konsulko.com>
Tue, 22 Apr 2025 21:13:21 +0000 (15:13 -0600)
committerTom Rini <trini@konsulko.com>
Tue, 22 Apr 2025 21:13:21 +0000 (15:13 -0600)
Jiaxun Yang <jiaxun.yang@flygoat.com> says:

This is a huge series which promoted MIPS/Boston target into a
usable state, with fixes to drivers and general framework issues
I found in this process.

I also converted the target to OF_UPSTREAM.

This target is covered by QEMU, to test on QEMU:
```
make boston64r6el_defconfig
make
qemu-system-mips64el -M boston -cpu I6500 -bios ./u-boot.bin -nographic
```

Link: https://lore.kernel.org/r/20240517-boston-v3-0-1ea7d23f4a1d@flygoat.com
15 files changed:
1  2 
.mailmap
arch/mips/Kconfig
arch/mips/dts/Makefile
configs/boston32r2_defconfig
configs/boston32r2el_defconfig
configs/boston32r6_defconfig
configs/boston32r6el_defconfig
configs/boston64r2_defconfig
configs/boston64r2el_defconfig
configs/boston64r6_defconfig
configs/boston64r6el_defconfig
drivers/ata/ahci.c
drivers/ata/dwc_ahsata.c
drivers/pci/Kconfig
drivers/pci/pci_auto.c

diff --cc .mailmap
+++ b/.mailmap
@@@ -93,11 -85,10 +93,12 @@@ Neil Armstrong <neil.armstrong@linaro.o
  Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.de>
  This contributor prefers not to receive mails <noreply@example.com> <pali@kernel.org>
  This contributor prefers not to receive mails <noreply@example.com> <pali.rohar@gmail.com>
 +Padmarao Begari <padmarao.begari@amd.com> <padmarao.begari@microchip.com>
  Patrice Chotard <patrice.chotard@foss.st.com> <patrice.chotard@st.com>
  Patrick Delaunay <patrick.delaunay@foss.st.com> <patrick.delaunay@st.com>
- Paul Burton <paul.burton@mips.com> <paul.burton@imgtec.com>
+ Paul Burton <paulburton@kernel.org> <paul.burton@imgtec.com>
+ Paul Burton <paulburton@kernel.org> <paul.burton@mips.com>
 +Philipp Tomsich <philipp.tomsich@vrull.eu> <philipp.tomsich@theobroma-systems.com>
  Piyush Mehta <piyush.mehta@amd.com> <piyush.mehta@xilinx.com>
  Prabhakar Kushwaha <prabhakar@freescale.com>
  Punnaiah Choudary Kalluri <punnaiah.choudary.kalluri@amd.com> <punnaiah.choudary.kalluri@xilinx.com>
@@@ -144,9 -145,36 +144,37 @@@ config TARGET_BOSTO
        select SUPPORTS_CPU_MIPS64_R1
        select SUPPORTS_CPU_MIPS64_R2
        select SUPPORTS_CPU_MIPS64_R6
 -      select SUPPORTS_LITTLE_ENDIAN
 +      select SUPPORT_BIG_ENDIAN
 +      select SUPPORT_LITTLE_ENDIAN
+       imply OF_UPSTREAM
+       imply BOOTSTD_FULL
+       imply CLK
+       imply CLK_BOSTON
        imply CMD_DM
+       imply AHCI
+       imply AHCI_PCI
+       imply CFI_FLASH
+       imply MTD_NOR_FLASH
+       imply MMC
+       imply MMC_PCI
+       imply MMC_SDHCI
+       imply MMC_SDHCI_SDMA
+       imply PCH_GBE
+       imply PCI
+       imply PCI_XILINX
+       imply PCI_INIT_R
+       imply SCSI
+       imply SCSI_AHCI
+       imply SYS_NS16550
+       imply SYSRESET
+       imply SYSRESET_CMD_POWEROFF
+       imply SYSRESET_SYSCON
+       imply USB
+       imply USB_EHCI_HCD
+       imply USB_EHCI_PCI
+       imply USB_XHCI_HCD
+       imply USB_XHCI_PCI
+       imply CMD_USB
  
  config TARGET_XILFPGA
        bool "Support Imagination Xilfpga"
Simple merge
@@@ -4,8 -4,7 +4,8 @@@ CONFIG_SYS_MALLOC_LEN=0x4000
  CONFIG_SYS_MALLOC_F_LEN=0x400
  CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_SECT_SIZE=0x20000
- CONFIG_DEFAULT_DEVICE_TREE="img,boston"
+ CONFIG_DEFAULT_DEVICE_TREE="img/boston"
 +CONFIG_SYS_BOOTM_LEN=0x4000000
  CONFIG_SYS_LOAD_ADDR=0x88000000
  CONFIG_ENV_ADDR=0xBFFE0000
  CONFIG_TARGET_BOSTON=y
@@@ -4,8 -4,7 +4,8 @@@ CONFIG_SYS_MALLOC_LEN=0x4000
  CONFIG_SYS_MALLOC_F_LEN=0x400
  CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_SECT_SIZE=0x20000
- CONFIG_DEFAULT_DEVICE_TREE="img,boston"
+ CONFIG_DEFAULT_DEVICE_TREE="img/boston"
 +CONFIG_SYS_BOOTM_LEN=0x4000000
  CONFIG_SYS_LOAD_ADDR=0x88000000
  CONFIG_ENV_ADDR=0xBFFE0000
  CONFIG_TARGET_BOSTON=y
@@@ -4,8 -4,7 +4,8 @@@ CONFIG_SYS_MALLOC_LEN=0x4000
  CONFIG_SYS_MALLOC_F_LEN=0x400
  CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_SECT_SIZE=0x20000
- CONFIG_DEFAULT_DEVICE_TREE="img,boston"
+ CONFIG_DEFAULT_DEVICE_TREE="img/boston"
 +CONFIG_SYS_BOOTM_LEN=0x4000000
  CONFIG_SYS_LOAD_ADDR=0x88000000
  CONFIG_ENV_ADDR=0xBFFE0000
  CONFIG_TARGET_BOSTON=y
@@@ -4,8 -4,7 +4,8 @@@ CONFIG_SYS_MALLOC_LEN=0x4000
  CONFIG_SYS_MALLOC_F_LEN=0x400
  CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_SECT_SIZE=0x20000
- CONFIG_DEFAULT_DEVICE_TREE="img,boston"
+ CONFIG_DEFAULT_DEVICE_TREE="img/boston"
 +CONFIG_SYS_BOOTM_LEN=0x4000000
  CONFIG_SYS_LOAD_ADDR=0x88000000
  CONFIG_ENV_ADDR=0xBFFE0000
  CONFIG_TARGET_BOSTON=y
@@@ -4,8 -4,7 +4,8 @@@ CONFIG_SYS_MALLOC_LEN=0x4000
  CONFIG_SYS_MALLOC_F_LEN=0x400
  CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_SECT_SIZE=0x20000
- CONFIG_DEFAULT_DEVICE_TREE="img,boston"
+ CONFIG_DEFAULT_DEVICE_TREE="img/boston"
 +CONFIG_SYS_BOOTM_LEN=0x4000000
  CONFIG_SYS_LOAD_ADDR=0xffffffff88000000
  CONFIG_ENV_ADDR=0xFFFFFFFFBFFE0000
  CONFIG_TARGET_BOSTON=y
@@@ -4,8 -4,7 +4,8 @@@ CONFIG_SYS_MALLOC_LEN=0x4000
  CONFIG_SYS_MALLOC_F_LEN=0x400
  CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_SECT_SIZE=0x20000
- CONFIG_DEFAULT_DEVICE_TREE="img,boston"
+ CONFIG_DEFAULT_DEVICE_TREE="img/boston"
 +CONFIG_SYS_BOOTM_LEN=0x4000000
  CONFIG_SYS_LOAD_ADDR=0xffffffff88000000
  CONFIG_ENV_ADDR=0xFFFFFFFFBFFE0000
  CONFIG_TARGET_BOSTON=y
@@@ -4,8 -4,7 +4,8 @@@ CONFIG_SYS_MALLOC_LEN=0x4000
  CONFIG_SYS_MALLOC_F_LEN=0x400
  CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_SECT_SIZE=0x20000
- CONFIG_DEFAULT_DEVICE_TREE="img,boston"
+ CONFIG_DEFAULT_DEVICE_TREE="img/boston"
 +CONFIG_SYS_BOOTM_LEN=0x4000000
  CONFIG_SYS_LOAD_ADDR=0xffffffff88000000
  CONFIG_ENV_ADDR=0xFFFFFFFFBFFE0000
  CONFIG_TARGET_BOSTON=y
@@@ -4,8 -4,7 +4,8 @@@ CONFIG_SYS_MALLOC_LEN=0x4000
  CONFIG_SYS_MALLOC_F_LEN=0x400
  CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_SECT_SIZE=0x20000
- CONFIG_DEFAULT_DEVICE_TREE="img,boston"
+ CONFIG_DEFAULT_DEVICE_TREE="img/boston"
 +CONFIG_SYS_BOOTM_LEN=0x4000000
  CONFIG_SYS_LOAD_ADDR=0xffffffff88000000
  CONFIG_ENV_ADDR=0xFFFFFFFFBFFE0000
  CONFIG_TARGET_BOSTON=y
Simple merge
@@@ -6,7 -6,7 +6,8 @@@
  
  #include <ahci.h>
  #include <blk.h>
 +#include <bootdev.h>
+ #include <clk.h>
  #include <cpu_func.h>
  #include <dm.h>
  #include <dwc_ahsata.h>
Simple merge
Simple merge