Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -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*
Expand Down
3 changes: 3 additions & 0 deletions arch/arm/mach-sc5xx/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ if ARCH_SC5XX
config SYS_VENDOR
default "adi"

config SYS_SOC
default "sc5xx"

choice
prompt "SC5xx SoC Select"
help
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-sc5xx/init/clkinit.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
*/

#include <asm/arch-adi/sc5xx/sc5xx.h>
#include <asm/arch/sc5xx.h>
#include <asm/io.h>
#include <linux/types.h>
#include "clkinit.h"
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-sc5xx/init/dmcinit.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

#include <asm/io.h>
#include <asm/arch-adi/sc5xx/sc5xx.h>
#include <asm/arch/sc5xx.h>
#include <linux/types.h>
#include "clkinit.h"
#include "dmcinit.h"
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-sc5xx/sc57x-spl.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/

#include <asm/arch-adi/sc5xx/spl.h>
#include <asm/arch/spl.h>

// Table 45-16 in SC573 HRM
const struct adi_boot_args adi_rom_boot_args[] = {
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/mach-sc5xx/sc57x.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
*/

#include <asm/io.h>
#include <asm/arch-adi/sc5xx/sc5xx.h>
#include <asm/arch-adi/sc5xx/spl.h>
#include <asm/arch/sc5xx.h>
#include <asm/arch/spl.h>

#define REG_SPU0_SECUREC0 0x3108B980
#define REG_PADS0_PCFG0 0x31004404
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-sc5xx/sc58x-spl.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/

#include <asm/arch-adi/sc5xx/spl.h>
#include <asm/arch/spl.h>

// Table 53-13 in SC58x HRM
const struct adi_boot_args adi_rom_boot_args[] = {
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/mach-sc5xx/sc58x.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
*/

#include <asm/io.h>
#include <asm/arch-adi/sc5xx/sc5xx.h>
#include <asm/arch-adi/sc5xx/spl.h>
#include <asm/arch/sc5xx.h>
#include <asm/arch/spl.h>

#define REG_SPU0_SECUREC0 0x3108C980
#define REG_PADS0_PCFG0 0x31004404
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-sc5xx/sc59x-spl.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/

#include <asm/arch-adi/sc5xx/spl.h>
#include <asm/arch/spl.h>

// Table 45-14 in sc594 HRM
const struct adi_boot_args adi_rom_boot_args[] = {
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/mach-sc5xx/sc59x.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
*/

#include <asm/io.h>
#include <asm/arch-adi/sc5xx/sc5xx.h>
#include <asm/arch-adi/sc5xx/spl.h>
#include <asm/arch/sc5xx.h>
#include <asm/arch/spl.h>

#define REG_SPU0_SECUREC0 0x3108B980
#define REG_PADS0_PCFG0 0x31004604
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-sc5xx/sc59x_64-spl.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/

#include <asm/arch-adi/sc5xx/spl.h>
#include <asm/arch/spl.h>

// Table 47-14 in SC598 hardware reference manual
const struct adi_boot_args adi_rom_boot_args[] = {
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/mach-sc5xx/sc59x_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

#include <asm/io.h>
#include <asm/armv8/mmu.h>
#include <asm/arch-adi/sc5xx/sc5xx.h>
#include <asm/arch-adi/sc5xx/spl.h>
#include <asm/arch/sc5xx.h>
#include <asm/arch/spl.h>

#define REG_TSGENWR0_CNTCR 0x310AE000
#define REG_PADS0_PCFG0 0x31004604
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/mach-sc5xx/soc.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
*
*/

#include <asm/arch-adi/sc5xx/sc5xx.h>
#include <asm/arch-adi/sc5xx/soc.h>
#include <asm/arch/sc5xx.h>
#include <asm/arch/soc.h>
#include <asm/global_data.h>
#include <asm/io.h>
#include <cpu_func.h>
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/mach-sc5xx/spl.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
*/

#include <spl.h>
#include <asm/arch-adi/sc5xx/sc5xx.h>
#include <asm/arch-adi/sc5xx/spl.h>
#include <asm/arch/sc5xx.h>
#include <asm/arch/spl.h>
#include "init/clkinit.h"
#include "init/dmcinit.h"

Expand Down
2 changes: 1 addition & 1 deletion board/adi/carriers/somcrr_common.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* (C) Copyright 2025 - Analog Devices, Inc.
*/

#include <asm/arch-adi/sc5xx/sc5xx.h>
#include <asm/arch/sc5xx.h>
#include <linux/delay.h>

#include "somcrr.h"
Expand Down
4 changes: 2 additions & 2 deletions board/adi/common-sc594-som/sc594-som.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
#include <config.h>
#include <phy.h>
#include <asm/u-boot.h>
#include <asm/arch-adi/sc5xx/sc5xx.h>
#include <asm/arch-adi/sc5xx/soc.h>
#include <asm/arch/sc5xx.h>
#include <asm/arch/soc.h>

#include "../carriers/somcrr.h"

Expand Down
4 changes: 2 additions & 2 deletions board/adi/common-sc598-som/sc598-som.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
#include <config.h>
#include <phy.h>
#include <asm/u-boot.h>
#include <asm/arch-adi/sc5xx/sc5xx.h>
#include <asm/arch-adi/sc5xx/soc.h>
#include <asm/arch/sc5xx.h>
#include <asm/arch/soc.h>
#include <asm/armv8/mmu.h>

#include "../carriers/somcrr.h"
Expand Down
4 changes: 2 additions & 2 deletions board/adi/sc573-ezlite/sc573-ezlite.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

#include <phy.h>
#include <asm/u-boot.h>
#include <asm/arch-adi/sc5xx/sc5xx.h>
#include <asm/arch-adi/sc5xx/soc.h>
#include <asm/arch/sc5xx.h>
#include <asm/arch/soc.h>

int board_phy_config(struct phy_device *phydev)
{
Expand Down
4 changes: 2 additions & 2 deletions board/adi/sc584-ezkit/sc584-ezkit.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

#include <phy.h>
#include <asm/u-boot.h>
#include <asm/arch-adi/sc5xx/sc5xx.h>
#include <asm/arch-adi/sc5xx/soc.h>
#include <asm/arch/sc5xx.h>
#include <asm/arch/soc.h>

int board_phy_config(struct phy_device *phydev)
{
Expand Down
4 changes: 2 additions & 2 deletions board/adi/sc589-ezkit/sc589-ezkit.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

#include <phy.h>
#include <asm/u-boot.h>
#include <asm/arch-adi/sc5xx/sc5xx.h>
#include <asm/arch-adi/sc5xx/soc.h>
#include <asm/arch/sc5xx.h>
#include <asm/arch/soc.h>

int board_phy_config(struct phy_device *phydev)
{
Expand Down
4 changes: 2 additions & 2 deletions board/adi/sc589-mini/sc589-mini.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

#include <phy.h>
#include <asm/u-boot.h>
#include <asm/arch-adi/sc5xx/sc5xx.h>
#include <asm/arch-adi/sc5xx/soc.h>
#include <asm/arch/sc5xx.h>
#include <asm/arch/soc.h>

int board_phy_config(struct phy_device *phydev)
{
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/dwc_eth_qos_adi.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include <reset.h>
#include <linux/io.h>

#include <asm/arch-adi/sc5xx/sc5xx.h>
#include <asm/arch/sc5xx.h>

#include "dwc_eth_qos.h"

Expand Down
Loading