diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0382f571db67..630922b4f7fd 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,7 +19,12 @@ jobs: strategy: matrix: defconfig: + - 'sc573-ezlite_defconfig' + - 'sc584-ezkit_defconfig' + - 'sc589-ezkit_defconfig' + - 'sc589-mini_defconfig' - 'sc594-som-ezkit-spl_defconfig' + - 'sc594-som-ezlite-spl_defconfig' build_aarch64: uses: analogdevicesinc/u-boot/.github/workflows/build-aarch64.yml@ci @@ -28,8 +33,9 @@ jobs: strategy: matrix: defconfig: - - 'sc598-som-ezkit-spl_defconfig' - 'sc598-htol-spl_defconfig' + - 'sc598-som-ezkit-spl_defconfig' + - 'sc598-som-ezlite-spl_defconfig' - 'xilinx_zynqmp_virt_defconfig' check: diff --git a/MAINTAINERS b/MAINTAINERS index 11c7da896ff9..3a8eb2eb4ce9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -626,7 +626,7 @@ L: linux@analog.com S: Supported T: git https://github.com/analogdevicesinc/u-boot F: arch/arm/dts/sc5* -F: arch/arm/include/asm/arch-adi/ +F: arch/arm/include/asm/arch-sc5xx/ F: arch/arm/mach-sc5xx/ F: board/adi/ F: configs/sc5* diff --git a/arch/arm/include/asm/arch-adi/sc5xx/sc5xx.h b/arch/arm/include/asm/arch-sc5xx/sc5xx.h similarity index 100% rename from arch/arm/include/asm/arch-adi/sc5xx/sc5xx.h rename to arch/arm/include/asm/arch-sc5xx/sc5xx.h diff --git a/arch/arm/include/asm/arch-adi/sc5xx/soc.h b/arch/arm/include/asm/arch-sc5xx/soc.h similarity index 100% rename from arch/arm/include/asm/arch-adi/sc5xx/soc.h rename to arch/arm/include/asm/arch-sc5xx/soc.h diff --git a/arch/arm/include/asm/arch-adi/sc5xx/spl.h b/arch/arm/include/asm/arch-sc5xx/spl.h similarity index 100% rename from arch/arm/include/asm/arch-adi/sc5xx/spl.h rename to arch/arm/include/asm/arch-sc5xx/spl.h diff --git a/arch/arm/mach-sc5xx/Kconfig b/arch/arm/mach-sc5xx/Kconfig index efb3c66675af..44402b2568d9 100644 --- a/arch/arm/mach-sc5xx/Kconfig +++ b/arch/arm/mach-sc5xx/Kconfig @@ -13,6 +13,9 @@ if ARCH_SC5XX config SYS_VENDOR default "adi" +config SYS_SOC + default "sc5xx" + choice prompt "SC5xx SoC Select" help diff --git a/arch/arm/mach-sc5xx/init/clkinit.c b/arch/arm/mach-sc5xx/init/clkinit.c index 3dcba33bd1bf..f9c83c6efac3 100644 --- a/arch/arm/mach-sc5xx/init/clkinit.c +++ b/arch/arm/mach-sc5xx/init/clkinit.c @@ -6,7 +6,7 @@ * */ -#include +#include #include #include #include "clkinit.h" diff --git a/arch/arm/mach-sc5xx/init/dmcinit.c b/arch/arm/mach-sc5xx/init/dmcinit.c index f3d5c11f4374..2026735cc214 100644 --- a/arch/arm/mach-sc5xx/init/dmcinit.c +++ b/arch/arm/mach-sc5xx/init/dmcinit.c @@ -7,7 +7,7 @@ */ #include -#include +#include #include #include "clkinit.h" #include "dmcinit.h" diff --git a/arch/arm/mach-sc5xx/sc57x-spl.c b/arch/arm/mach-sc5xx/sc57x-spl.c index 28380b89b489..6084493cf4fc 100644 --- a/arch/arm/mach-sc5xx/sc57x-spl.c +++ b/arch/arm/mach-sc5xx/sc57x-spl.c @@ -3,7 +3,7 @@ * (C) Copyright 2024 - Analog Devices, Inc. */ -#include +#include // Table 45-16 in SC573 HRM const struct adi_boot_args adi_rom_boot_args[] = { diff --git a/arch/arm/mach-sc5xx/sc57x.c b/arch/arm/mach-sc5xx/sc57x.c index 02b04cd1b2fe..7e58e92b188f 100644 --- a/arch/arm/mach-sc5xx/sc57x.c +++ b/arch/arm/mach-sc5xx/sc57x.c @@ -7,8 +7,8 @@ */ #include -#include -#include +#include +#include #define REG_SPU0_SECUREC0 0x3108B980 #define REG_PADS0_PCFG0 0x31004404 diff --git a/arch/arm/mach-sc5xx/sc58x-spl.c b/arch/arm/mach-sc5xx/sc58x-spl.c index ae809f09e55b..2582e38ce122 100644 --- a/arch/arm/mach-sc5xx/sc58x-spl.c +++ b/arch/arm/mach-sc5xx/sc58x-spl.c @@ -3,7 +3,7 @@ * (C) Copyright 2024 - Analog Devices, Inc. */ -#include +#include // Table 53-13 in SC58x HRM const struct adi_boot_args adi_rom_boot_args[] = { diff --git a/arch/arm/mach-sc5xx/sc58x.c b/arch/arm/mach-sc5xx/sc58x.c index c981cafd9865..dc11df683a85 100644 --- a/arch/arm/mach-sc5xx/sc58x.c +++ b/arch/arm/mach-sc5xx/sc58x.c @@ -7,8 +7,8 @@ */ #include -#include -#include +#include +#include #define REG_SPU0_SECUREC0 0x3108C980 #define REG_PADS0_PCFG0 0x31004404 diff --git a/arch/arm/mach-sc5xx/sc59x-spl.c b/arch/arm/mach-sc5xx/sc59x-spl.c index c8fc25fe7c4d..883bdb3c7722 100644 --- a/arch/arm/mach-sc5xx/sc59x-spl.c +++ b/arch/arm/mach-sc5xx/sc59x-spl.c @@ -3,7 +3,7 @@ * (C) Copyright 2024 - Analog Devices, Inc. */ -#include +#include // Table 45-14 in sc594 HRM const struct adi_boot_args adi_rom_boot_args[] = { diff --git a/arch/arm/mach-sc5xx/sc59x.c b/arch/arm/mach-sc5xx/sc59x.c index 675f8c7d69a3..286f6d52eef0 100644 --- a/arch/arm/mach-sc5xx/sc59x.c +++ b/arch/arm/mach-sc5xx/sc59x.c @@ -7,8 +7,8 @@ */ #include -#include -#include +#include +#include #define REG_SPU0_SECUREC0 0x3108B980 #define REG_PADS0_PCFG0 0x31004604 diff --git a/arch/arm/mach-sc5xx/sc59x_64-spl.c b/arch/arm/mach-sc5xx/sc59x_64-spl.c index 3992538133df..500824b5bb9e 100644 --- a/arch/arm/mach-sc5xx/sc59x_64-spl.c +++ b/arch/arm/mach-sc5xx/sc59x_64-spl.c @@ -3,7 +3,7 @@ * (C) Copyright 2024 - Analog Devices, Inc. */ -#include +#include // Table 47-14 in SC598 hardware reference manual const struct adi_boot_args adi_rom_boot_args[] = { diff --git a/arch/arm/mach-sc5xx/sc59x_64.c b/arch/arm/mach-sc5xx/sc59x_64.c index a8402075d0a6..b9694a48e87b 100644 --- a/arch/arm/mach-sc5xx/sc59x_64.c +++ b/arch/arm/mach-sc5xx/sc59x_64.c @@ -8,8 +8,8 @@ #include #include -#include -#include +#include +#include #define REG_TSGENWR0_CNTCR 0x310AE000 #define REG_PADS0_PCFG0 0x31004604 diff --git a/arch/arm/mach-sc5xx/soc.c b/arch/arm/mach-sc5xx/soc.c index cf8ff0dc3af6..09978a5cf44d 100644 --- a/arch/arm/mach-sc5xx/soc.c +++ b/arch/arm/mach-sc5xx/soc.c @@ -6,8 +6,8 @@ * */ -#include -#include +#include +#include #include #include #include diff --git a/arch/arm/mach-sc5xx/spl.c b/arch/arm/mach-sc5xx/spl.c index c529829420d6..94e4a08fa32f 100644 --- a/arch/arm/mach-sc5xx/spl.c +++ b/arch/arm/mach-sc5xx/spl.c @@ -7,8 +7,8 @@ */ #include -#include -#include +#include +#include #include "init/clkinit.h" #include "init/dmcinit.h" diff --git a/board/adi/carriers/somcrr_common.c b/board/adi/carriers/somcrr_common.c index 34ae48f31d28..7bd890d6e707 100644 --- a/board/adi/carriers/somcrr_common.c +++ b/board/adi/carriers/somcrr_common.c @@ -3,7 +3,7 @@ * (C) Copyright 2025 - Analog Devices, Inc. */ -#include +#include #include #include "somcrr.h" diff --git a/board/adi/common-sc594-som/sc594-som.c b/board/adi/common-sc594-som/sc594-som.c index aab729fc7619..37817c4b0628 100644 --- a/board/adi/common-sc594-som/sc594-som.c +++ b/board/adi/common-sc594-som/sc594-som.c @@ -6,8 +6,8 @@ #include #include #include -#include -#include +#include +#include #include "../carriers/somcrr.h" diff --git a/board/adi/common-sc598-som/sc598-som.c b/board/adi/common-sc598-som/sc598-som.c index 96b73520e66a..0e1ee828956a 100644 --- a/board/adi/common-sc598-som/sc598-som.c +++ b/board/adi/common-sc598-som/sc598-som.c @@ -6,8 +6,8 @@ #include #include #include -#include -#include +#include +#include #include #include "../carriers/somcrr.h" diff --git a/board/adi/sc573-ezlite/sc573-ezlite.c b/board/adi/sc573-ezlite/sc573-ezlite.c index 288c26707616..464142b27a5e 100644 --- a/board/adi/sc573-ezlite/sc573-ezlite.c +++ b/board/adi/sc573-ezlite/sc573-ezlite.c @@ -5,8 +5,8 @@ #include #include -#include -#include +#include +#include int board_phy_config(struct phy_device *phydev) { diff --git a/board/adi/sc584-ezkit/sc584-ezkit.c b/board/adi/sc584-ezkit/sc584-ezkit.c index 288c26707616..464142b27a5e 100644 --- a/board/adi/sc584-ezkit/sc584-ezkit.c +++ b/board/adi/sc584-ezkit/sc584-ezkit.c @@ -5,8 +5,8 @@ #include #include -#include -#include +#include +#include int board_phy_config(struct phy_device *phydev) { diff --git a/board/adi/sc589-ezkit/sc589-ezkit.c b/board/adi/sc589-ezkit/sc589-ezkit.c index 288c26707616..464142b27a5e 100644 --- a/board/adi/sc589-ezkit/sc589-ezkit.c +++ b/board/adi/sc589-ezkit/sc589-ezkit.c @@ -5,8 +5,8 @@ #include #include -#include -#include +#include +#include int board_phy_config(struct phy_device *phydev) { diff --git a/board/adi/sc589-mini/sc589-mini.c b/board/adi/sc589-mini/sc589-mini.c index 288c26707616..464142b27a5e 100644 --- a/board/adi/sc589-mini/sc589-mini.c +++ b/board/adi/sc589-mini/sc589-mini.c @@ -5,8 +5,8 @@ #include #include -#include -#include +#include +#include int board_phy_config(struct phy_device *phydev) { diff --git a/drivers/net/dwc_eth_qos_adi.c b/drivers/net/dwc_eth_qos_adi.c index b578225eaad3..37db8525b48f 100644 --- a/drivers/net/dwc_eth_qos_adi.c +++ b/drivers/net/dwc_eth_qos_adi.c @@ -15,7 +15,7 @@ #include #include -#include +#include #include "dwc_eth_qos.h"