From: Tom Rini Date: Tue, 22 Apr 2025 21:13:21 +0000 (-0600) Subject: Merge patch series "MIPS: Boston: Various enhancements" X-Git-Tag: v2025.07-rc1~37 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20fcb6305eef553a94eeed6efb1a60ee3ccd9db7;p=pandora-u-boot.git Merge patch series "MIPS: Boston: Various enhancements" Jiaxun Yang 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 --- 20fcb6305eef553a94eeed6efb1a60ee3ccd9db7 diff --cc .mailmap index 717daa9adc4,bb7c1c3869a..4afc3b7e0d5 --- a/.mailmap +++ b/.mailmap @@@ -93,11 -85,10 +93,12 @@@ Neil Armstrong This contributor prefers not to receive mails This contributor prefers not to receive mails +Padmarao Begari Patrice Chotard Patrick Delaunay - Paul Burton + Paul Burton + Paul Burton +Philipp Tomsich Piyush Mehta Prabhakar Kushwaha Punnaiah Choudary Kalluri diff --cc arch/mips/Kconfig index d7065a80e23,733a8de4fb8..a0317011de7 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@@ -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" diff --cc configs/boston32r2_defconfig index 6f4dfad5a31,cb5898c3caf..5556148f3cf --- a/configs/boston32r2_defconfig +++ b/configs/boston32r2_defconfig @@@ -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 diff --cc configs/boston32r2el_defconfig index cdf13c8332f,4c603b69df7..d23eb99518e --- a/configs/boston32r2el_defconfig +++ b/configs/boston32r2el_defconfig @@@ -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 diff --cc configs/boston32r6_defconfig index d8fb956914c,17f7c4364a0..56738e955e3 --- a/configs/boston32r6_defconfig +++ b/configs/boston32r6_defconfig @@@ -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 diff --cc configs/boston32r6el_defconfig index b6d3102cf2a,e662d167fe3..ddc6655dd7c --- a/configs/boston32r6el_defconfig +++ b/configs/boston32r6el_defconfig @@@ -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 diff --cc configs/boston64r2_defconfig index 6b23d180f84,bf5a3ead364..fa234b62305 --- a/configs/boston64r2_defconfig +++ b/configs/boston64r2_defconfig @@@ -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 diff --cc configs/boston64r2el_defconfig index ff4b52615a6,de22344b5bb..58bf8817ab6 --- a/configs/boston64r2el_defconfig +++ b/configs/boston64r2el_defconfig @@@ -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 diff --cc configs/boston64r6_defconfig index a7446ec5555,bb339cfd5db..eb3ec0064dc --- a/configs/boston64r6_defconfig +++ b/configs/boston64r6_defconfig @@@ -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 diff --cc configs/boston64r6el_defconfig index 0dab8efb875,260f6dfb358..332c2ba39e9 --- a/configs/boston64r6el_defconfig +++ b/configs/boston64r6el_defconfig @@@ -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 diff --cc drivers/ata/dwc_ahsata.c index 203f98edffc,27c24228ef8..d225289fe6e --- a/drivers/ata/dwc_ahsata.c +++ b/drivers/ata/dwc_ahsata.c @@@ -6,7 -6,7 +6,8 @@@ #include #include +#include + #include #include #include #include