]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
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
index 717daa9adc4a0fb66a18a274d154ac5221b9f69c,bb7c1c3869ab255a780f45163063219251009ca0..4afc3b7e0d546d3ced3dba10e68b669b9a6f177c
+++ 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>
index d7065a80e23abb49187b098954915521566dc597,733a8de4fb83b70e7912bae22ac3ce5bbfd1e34c..a0317011de7f1845014c2d26355b456917e6bb75
@@@ -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
index 6f4dfad5a31125eef5d8f066bbcd232fdc192dad,cb5898c3cafa6d37f25499c76278576466607017..5556148f3cfd08c518a5b3e60cd2d29dff813a9a
@@@ -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
index cdf13c8332f84306277849c37ef51a452369c9df,4c603b69df7b62353268ec395948310e3e2e3089..d23eb99518e450b0c24538b4f387b125e95a8244
@@@ -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
index d8fb956914c710e7aee2d83dd6770c160dba4935,17f7c4364a035ff0c7eb0f09dc844ad3713bde94..56738e955e3eeb09fc9623f041aa3199d8e9e614
@@@ -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
index b6d3102cf2a6a06f4d0725d79dfeb9bf496f4cb6,e662d167fe3d7b0698efa486afe5e1b8b63d1bef..ddc6655dd7c6eeae30a156c0d3da3c7515f8f0b3
@@@ -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
index 6b23d180f84ffd6c05fbb6f0e7c4ed640f0a9723,bf5a3ead364622da8cd5c75e375627667c239057..fa234b623058aa8bcea731b0dcf3d3d82b97b16e
@@@ -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
index ff4b52615a69550f2896f22623943193ac04a26a,de22344b5bb6e9beb1a38b1d63211d4af5e2cf08..58bf8817ab6571759d2d245efa31eb245d7303cb
@@@ -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
index a7446ec5555b6d016c545a8983103f225dd548cf,bb339cfd5dbe882b5cffc07a6f3a29c388557987..eb3ec0064dc388d488a527288659a9547002d82a
@@@ -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
index 0dab8efb875517c4b59caee7a60ebeba567815c7,260f6dfb3583a1d52b6eba999935b86450690e57..332c2ba39e9c5b430c168bd7503f7fbbcc20944a
@@@ -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
index 203f98edffc5241cd5dbb26973943186b328ff6e,27c24228ef892ff88c8b08cc3e3a62e1538d5a70..d225289fe6ea41e0e96bf9ea3b9365a93361fb18
@@@ -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