Mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2026-06-13 15:03:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge patch series "sc5xx Environment Cleanup and Fixes"

Browse Source 
Caleb Ethridge <caleb.ethridge@analog.com> says:

This series performs a general cleanup of the default U-boot environment
for sc5xx boards, stemming from the decision to no longer store the
environment in the SPI flash. The environments for each board have been
edited to contain the minimum number of commands needed for all supported
boot modes to avoid confusion, and the default boot command synced to spi
for all boards that support it. The filesystem for the SPI flash has also
been changed from jffs2 to ubifs.

A bug with the Ethernet reset line on the sc594 has been fixed, and the
sc573 has been renamed from the EZKIT to the EZLITE to match the name of the
publically available board. EZKIT was only used internally before release.
Preliminary binman support for sc5xx boards has been removed as it was unused
and full support never added.

Link: https://lore.kernel.org/r/cover.1779370141.git.caleb.ethridge@analog.com
This commit is contained in:
Tom Rini
2026-06-04 12:24:50 -06:00
parent cceccea3a9 e8c00a5e28
commit 397a14dd71
29 changed files with 116 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/dts/Makefile
View File

@@ -1169,7 +1169,7 @@ dtb-$(CONFIG_TARGET_IMX8MM_CL_IOT_GATE_OPTEE) += imx8mm-cl-iot-gate-optee.dtb \
imx8mm-cl-iot-gate-ied-tpm0.dtbo \
imx8mm-cl-iot-gate-ied-tpm1.dtbo
dtb-$(CONFIG_TARGET_SC573_EZKIT) += sc573-ezkit.dtb
dtb-$(CONFIG_TARGET_SC573_EZLITE) += sc573-ezlite.dtb
dtb-$(CONFIG_TARGET_SC584_EZKIT) += sc584-ezkit.dtb
dtb-$(CONFIG_TARGET_SC589_MINI) += sc589-mini.dtb
dtb-$(CONFIG_TARGET_SC589_EZKIT) += sc589-ezkit.dtb

4
arch/arm/dts/sc573-ezkit.dts → arch/arm/dts/sc573-ezlite.dts
View File

@@ -9,8 +9,8 @@
#include "sc57x.dtsi"
/ {
model = "ADI SC573-EZKIT";
compatible = "adi,sc573-ezkit", "adi,sc57x";
model = "ADI SC573-EZLITE";
compatible = "adi,sc573-ezlite", "adi,sc57x";
};
&i2c0 {

2
arch/arm/dts/sc594-som-ezkit.dts
View File

@@ -130,7 +130,7 @@
gige-reset {
gpio-hog;
gpios = <15 GPIO_ACTIVE_HIGH>;
gpios = <15 GPIO_ACTIVE_LOW>;
output-high;
line-name = "gige-reset";
bootph-pre-ram;

41
arch/arm/dts/sc5xx.dtsi
View File

@@ -25,47 +25,6 @@
bootph-pre-ram;
};
#ifdef CONFIG_SC5XX_USE_BINMAN
binman {
filename = CONFIG_SC5XX_BINMAN_FILENAME;
stage1-boot {
offset = <CONFIG_SC5XX_UBOOT_SPL_OFFSET>;
type = "blob-ext";
filename = "spl/u-boot-spl.ldr";
};
/* since falcon mode can jump from SPL to OS directly
* full u-boot is optional
*
* @todo: review if we can say this given support has
* not yet been upstreamed. Otherwise we might have to
* invoke binman only for full u-boot.
*/
stage2-boot {
offset = <CONFIG_SC5XX_UBOOT_OFFSET>;
type = "blob-ext";
filename = "u-boot.ldr";
optional;
};
#ifdef CONFIG_SC5XX_FITIMAGE_NAME
fitImage {
offset = <CONFIG_SC5XX_FITIMAGE_OFFSET>;
type = "blob-ext";
filename = CONFIG_SC5XX_FITIMAGE_NAME;
};
#endif
#ifdef CONFIG_SC5XX_ROOTFS_NAME
rfs {
offset = <CONFIG_SC5XX_ROOTFS_OFFSET>;
type = "blob-ext";
filename = CONFIG_SC5XX_ROOTFS_NAME;
};
#endif
};
#endif
clocks {
dummy: dummy {
compatible = "fixed-clock";

71
arch/arm/mach-sc5xx/Kconfig
View File

@@ -25,7 +25,7 @@ config SC57X
bool "SC57x series"
select COMMON_CLK_ADI_SC57X
select CPU_V7A
select TARGET_SC573_EZKIT
select TARGET_SC573_EZLITE
config SC58X
bool "SC58x series"
@@ -51,8 +51,8 @@ endchoice
if SC57X
config TARGET_SC573_EZKIT
bool "Support SC573-EZKIT"
config TARGET_SC573_EZLITE
bool "Support SC573-EZLITE"
endif
@@ -116,69 +116,6 @@ endchoice
endif
config SC5XX_UBOOT_SPL_OFFSET
hex "SPL offset"
default 0x0
help
The default offset where the SPL is located.
config SC5XX_UBOOT_OFFSET
hex "U-Boot offset"
default 0x40000
help
The default offset where u-boot is located.
config SC5XX_FITIMAGE_OFFSET
hex "FitImage offset"
default 0x1a0000
help
The default offset where the fitImage is located.
config SC5XX_ROOTFS_OFFSET
hex "RootFS offset"
default 0x102000
help
The default offset where the rootfs is located.
config SC5XX_LOADADDR
hex "Load address"
default 0x90000000
help
The default load address for u-boot.
menu "Binman configuration"
config SC5XX_USE_BINMAN
bool "Use binman for final image"
select BINMAN
help
If you wish to use binman to assemble an image, say 'Y' here.
This will enable binman-specific sections in the device tree.
config SC5XX_BINMAN_FILENAME
string "Image name"
default "sc5xx-image.img"
depends on SC5XX_USE_BINMAN
help
The name of the image that will be created by binman.
This is used to create the final image.
config SC5XX_FITIMAGE_NAME
string "FitImage name"
default "fitImage"
depends on SC5XX_USE_BINMAN
help
The name of the fitImage to be packed by binman.
This is used to create the final image.
config SC5XX_ROOTFS_NAME
string "RootFS name"
default "rootfs"
depends on SC5XX_USE_BINMAN
help
The name of the rootfs to be packed by binman.
This is used to create the final image.
endmenu
config ADI_IMAGE
string "ADI fitImage type"
help
@@ -633,6 +570,6 @@ source "board/adi/sc594-som-ezlite/Kconfig"
source "board/adi/sc589-ezkit/Kconfig"
source "board/adi/sc589-mini/Kconfig"
source "board/adi/sc584-ezkit/Kconfig"
source "board/adi/sc573-ezkit/Kconfig"
source "board/adi/sc573-ezlite/Kconfig"
endif

2
arch/arm/mach-sc5xx/init/dmcinit.c
View File

@@ -101,7 +101,7 @@
#ifdef CONFIG_TARGET_SC584_EZKIT
#define DMC_PADCTL2_VALUE 0x0078283C
#elif CONFIG_TARGET_SC573_EZKIT
#elif CONFIG_TARGET_SC573_EZLITE
#define DMC_PADCTL2_VALUE 0x00782828
#elif CONFIG_TARGET_SC589_MINI || CONFIG_TARGET_SC589_EZKIT
#define DMC_PADCTL2_VALUE 0x00783C3C

17
board/adi/sc573-ezkit/sc573-ezkit.env
View File

@@ -1,17 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0-or-later+ */
/*
* (C) Copyright 2024 - Analog Devices, Inc.
*/
adi_stage2_offset=CONFIG_SC5XX_UBOOT_OFFSET
adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET
adi_rfs_offset=CONFIG_SC5XX_ROOTFS_OFFSET
jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc573-ezkit.jffs2
loadaddr=CONFIG_SC5XX_LOADADDR
#define USE_NFS
#define USE_SPI
#define USE_RAM
#define USE_MMC
#include <env/adi/adi_boot.env>

8
board/adi/sc573-ezkit/Kconfig → board/adi/sc573-ezlite/Kconfig
View File

@@ -2,19 +2,19 @@
#
# (C) Copyright 2024 - Analog Devices, Inc.
if TARGET_SC573_EZKIT
if TARGET_SC573_EZLITE
config SYS_BOARD
default "sc573-ezkit"
default "sc573-ezlite"
config SYS_CONFIG_NAME
default "sc573-ezkit"
default "sc573-ezlite"
config LDR_CPU
default "ADSP-SC573-0.0"
config DEFAULT_DEVICE_TREE
default "sc573-ezkit"
default "sc573-ezlite"
config ADI_IMAGE
default "tiny"

2
board/adi/sc573-ezkit/Makefile → board/adi/sc573-ezlite/Makefile
View File

@@ -3,4 +3,4 @@
# (C) Copyright 2025 - Analog Devices, Inc.
#
obj-y += sc573-ezkit.o
obj-y += sc573-ezlite.o

0
board/adi/sc573-ezkit/sc573-ezkit.c → board/adi/sc573-ezlite/sc573-ezlite.c
View File

16
board/adi/sc573-ezlite/sc573-ezlite.env Normal file
View File

@@ -0,0 +1,16 @@
/* SPDX-License-Identifier: GPL-2.0-or-later+ */
/*
* (C) Copyright 2024 - Analog Devices, Inc.
*/
fdt_addr_r=CONFIG_SYS_LOAD_ADDR
kernel_addr_r=0x84008000
ramdisk_addr_r=0x85000000
#define USE_NFS
#define USE_SPI
#define USE_RAM
#define USE_MMC
#define USE_USB
#include <env/adi/adi_boot.env>

9
board/adi/sc584-ezkit/sc584-ezkit.env
View File

@@ -3,14 +3,13 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/
adi_stage2_offset=CONFIG_SC5XX_UBOOT_OFFSET
adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET
adi_rfs_offset=CONFIG_SC5XX_ROOTFS_OFFSET
jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc584-ezkit.jffs2
loadaddr=CONFIG_SC5XX_LOADADDR
fdt_addr_r=CONFIG_SYS_LOAD_ADDR
kernel_addr_r=0x8a308000
ramdisk_addr_r=0x8b300000
#define USE_NFS
#define USE_SPI
#define USE_RAM
#define USE_USB
#include <env/adi/adi_boot.env>

9
board/adi/sc589-ezkit/sc589-ezkit.env
View File

@@ -3,15 +3,14 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/
adi_stage2_offset=CONFIG_SC5XX_UBOOT_OFFSET
adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET
adi_rfs_offset=CONFIG_SC5XX_ROOTFS_OFFSET
jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc589-ezkit.jffs2
loadaddr=CONFIG_SC5XX_LOADADDR
fdt_addr_r=CONFIG_SYS_LOAD_ADDR
kernel_addr_r=0xc4008000
ramdisk_addr_r=0xc5000000
#define USE_NFS
#define USE_RAM
#define USE_MMC
#define USE_SPI
#define USE_USB
#include <env/adi/adi_boot.env>

9
board/adi/sc589-mini/sc589-mini.env
View File

@@ -3,15 +3,14 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/
adi_stage2_offset=CONFIG_SC5XX_UBOOT_OFFSET
adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET
adi_rfs_offset=CONFIG_SC5XX_ROOTFS_OFFSET
jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc589-mini.jffs2
loadaddr=CONFIG_SC5XX_LOADADDR
fdt_addr_r=CONFIG_SYS_LOAD_ADDR
kernel_addr_r=0xc4008000
ramdisk_addr_r=0xc5000000
#define USE_NFS
#define USE_RAM
#define USE_SPI
#define USE_MMC
#define USE_USB
#include <env/adi/adi_boot.env>

9
board/adi/sc594-som-ezkit/sc594-som-ezkit.env
View File

@@ -3,16 +3,15 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/
adi_stage2_offset=CONFIG_SC5XX_UBOOT_OFFSET
adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET
adi_rfs_offset=CONFIG_SC5XX_ROOTFS_OFFSET
jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc594-som-ezkit.jffs2
loadaddr=CONFIG_SC5XX_LOADADDR
fdt_addr_r=CONFIG_SYS_LOAD_ADDR
kernel_addr_r=0xa3008000
ramdisk_addr_r=0xa8000000
#define USE_NFS
#define USE_SPI
#define USE_OSPI
#define USE_RAM
#define USE_MMC
#define USE_USB
#include <env/adi/adi_boot.env>

9
board/adi/sc594-som-ezlite/sc594-som-ezlite.env
View File

@@ -3,16 +3,15 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/
adi_stage2_offset=CONFIG_SC5XX_UBOOT_OFFSET
adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET
adi_rfs_offset=CONFIG_SC5XX_ROOTFS_OFFSET
jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc594-som-ezlite.jffs2
loadaddr=CONFIG_SC5XX_LOADADDR
fdt_addr_r=CONFIG_SYS_LOAD_ADDR
kernel_addr_r=0xa3008000
ramdisk_addr_r=0xa8000000
#define USE_NFS
#define USE_SPI
#define USE_OSPI
#define USE_RAM
#define USE_MMC
#define USE_USB
#include <env/adi/adi_boot.env>

9
board/adi/sc598-som-ezkit/sc598-som-ezkit.env
View File

@@ -3,16 +3,15 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/
adi_stage2_offset=CONFIG_SC5XX_UBOOT_OFFSET
adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET
adi_rfs_offset=CONFIG_SC5XX_ROOTFS_OFFSET
jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc598-som-ezkit.jffs2
loadaddr=CONFIG_SC5XX_LOADADDR
fdt_addr_r=CONFIG_SYS_LOAD_ADDR
kernel_addr_r=0x9a200000
ramdisk_addr_r=0x9c000000
#define USE_NFS
#define USE_SPI
#define USE_OSPI
#define USE_RAM
#define USE_MMC
#define USE_USB
#include <env/adi/adi_boot.env>

14
board/adi/sc598-som-ezlite/sc598-som-ezlite.env
View File

@@ -3,10 +3,14 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/
adi_stage2_offset=CONFIG_SC5XX_UBOOT_OFFSET
adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET
adi_rfs_offset=CONFIG_SC5XX_ROOTFS_OFFSET
loadaddr=CONFIG_SC5XX_LOADADDR
jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc598-som-ezlite.jffs2
fdt_addr_r=CONFIG_SYS_LOAD_ADDR
kernel_addr_r=0x9a200000
ramdisk_addr_r=0x9c000000
#define USE_NFS
#define USE_SPI
#define USE_RAM
#define USE_MMC
#define USE_USB
#include <env/adi/adi_boot.env>

11
configs/sc573-ezkit_defconfig → configs/sc573-ezlite_defconfig
View File

@@ -3,16 +3,10 @@ CONFIG_SYS_ARM_CACHE_WRITETHROUGH=y
CONFIG_ARCH_SC5XX=y
CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_SPL_GPIO=y
CONFIG_ENV_SIZE=0x4000
CONFIG_ENV_OFFSET=0xD0000
CONFIG_ENV_SECT_SIZE=0x4000
CONFIG_DM_GPIO=y
CONFIG_SPL_SYS_MALLOC_F_LEN=0x10000
CONFIG_SPL_SERIAL=y
CONFIG_SC5XX_UBOOT_OFFSET=0x20000
CONFIG_SC5XX_FITIMAGE_OFFSET=0xE0000
CONFIG_SC5XX_ROOTFS_OFFSET=0x6E0000
CONFIG_SC5XX_LOADADDR=0x83000000
CONFIG_SYS_LOAD_ADDR=0x83000000
CONFIG_WATCHDOG_TIMEOUT_MSECS=60000
CONFIG_CGU0_CLKOUTSEL=7
# CONFIG_EFI_LOADER is not set
@@ -52,9 +46,8 @@ CONFIG_CMD_FS_GENERIC=y
CONFIG_SPL_OF_CONTROL=y
CONFIG_OF_EMBED=y
CONFIG_ENV_OVERWRITE=y
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_USE_HOSTNAME=y
CONFIG_HOSTNAME="sc573-ezkit"
CONFIG_HOSTNAME="sc573-ezlite"
CONFIG_NET_RETRY_COUNT=20
CONFIG_IP_DEFRAG=y
CONFIG_SPL_CLK=y

10
configs/sc584-ezkit_defconfig
View File

@@ -3,9 +3,6 @@ CONFIG_SYS_ARM_CACHE_WRITETHROUGH=y
CONFIG_ARCH_SC5XX=y
CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_SPL_GPIO=y
CONFIG_ENV_SIZE=0x4000
CONFIG_ENV_OFFSET=0xD0000
CONFIG_ENV_SECT_SIZE=0x4000
CONFIG_DM_GPIO=y
CONFIG_SPL_SYS_MALLOC_F_LEN=0x8000
CONFIG_SPL_SERIAL=y
@@ -13,10 +10,7 @@ CONFIG_SPL_STACK=0x200C0000
CONFIG_SPL_BSS_START_ADDR=0x200A0000
CONFIG_SPL_BSS_MAX_SIZE=0x8000
CONFIG_SC58X=y
CONFIG_SC5XX_UBOOT_OFFSET=0x20000
CONFIG_SC5XX_FITIMAGE_OFFSET=0xE0000
CONFIG_SC5XX_ROOTFS_OFFSET=0x6E0000
CONFIG_SC5XX_LOADADDR=0x89300000
CONFIG_SYS_LOAD_ADDR=0x89300000
CONFIG_WATCHDOG_TIMEOUT_MSECS=60000
CONFIG_ADI_BUG_EZKHW21=y
CONFIG_CGU0_CLKOUTSEL=7
@@ -57,8 +51,6 @@ CONFIG_CMD_FS_GENERIC=y
CONFIG_SPL_OF_CONTROL=y
CONFIG_OF_EMBED=y
CONFIG_ENV_OVERWRITE=y
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_ENV_SPI_MAX_HZ=10000000
CONFIG_USE_HOSTNAME=y
CONFIG_HOSTNAME="sc584-ezkit"
CONFIG_NET_RETRY_COUNT=20

12
configs/sc589-ezkit_defconfig
View File

@@ -5,9 +5,6 @@ CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_SPL_GPIO=y
CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xC203F000
CONFIG_SF_DEFAULT_SPEED=1000000
CONFIG_ENV_SIZE=0x4000
CONFIG_ENV_OFFSET=0xD0000
CONFIG_ENV_SECT_SIZE=0x4000
CONFIG_DM_GPIO=y
CONFIG_SPL_SYS_MALLOC_F_LEN=0x8000
CONFIG_SPL_SERIAL=y
@@ -16,10 +13,7 @@ CONFIG_SPL_BSS_START_ADDR=0x200A0000
CONFIG_SPL_BSS_MAX_SIZE=0x8000
CONFIG_SC58X=y
CONFIG_TARGET_SC589_EZKIT=y
CONFIG_SC5XX_UBOOT_OFFSET=0x20000
CONFIG_SC5XX_FITIMAGE_OFFSET=0xE0000
CONFIG_SC5XX_ROOTFS_OFFSET=0x6E0000
CONFIG_SC5XX_LOADADDR=0xC3000000
CONFIG_SYS_LOAD_ADDR=0xC3000000
CONFIG_WATCHDOG_TIMEOUT_MSECS=60000
CONFIG_ADI_USE_DMC1=y
CONFIG_CGU0_CLKOUTSEL=7
@@ -28,7 +22,7 @@ CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
CONFIG_LEGACY_IMAGE_FORMAT=y
CONFIG_USE_BOOTCOMMAND=y
CONFIG_BOOTCOMMAND="run ramboot"
CONFIG_BOOTCOMMAND="run spiboot"
CONFIG_SYS_CBSIZE=512
CONFIG_CYCLIC_MAX_CPU_TIME_US=1000
# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
@@ -61,8 +55,6 @@ CONFIG_CMD_FS_GENERIC=y
CONFIG_SPL_OF_CONTROL=y
CONFIG_OF_EMBED=y
CONFIG_ENV_OVERWRITE=y
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_ENV_SPI_MAX_HZ=10000000
CONFIG_USE_HOSTNAME=y
CONFIG_HOSTNAME="sc589-ezkit"
CONFIG_NET_RETRY_COUNT=20

12
configs/sc589-mini_defconfig
View File

@@ -4,9 +4,6 @@ CONFIG_ARCH_SC5XX=y
CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_SPL_GPIO=y
CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xC203F000
CONFIG_ENV_SIZE=0x10000
CONFIG_ENV_OFFSET=0xD0000
CONFIG_ENV_SECT_SIZE=0x10000
CONFIG_DM_GPIO=y
CONFIG_SPL_SYS_MALLOC_F_LEN=0x8000
CONFIG_SPL_SERIAL=y
@@ -15,10 +12,7 @@ CONFIG_SPL_BSS_START_ADDR=0x200A0000
CONFIG_SPL_BSS_MAX_SIZE=0x8000
CONFIG_SC58X=y
CONFIG_TARGET_SC589_MINI=y
CONFIG_SC5XX_UBOOT_OFFSET=0x20000
CONFIG_SC5XX_FITIMAGE_OFFSET=0xE0000
CONFIG_SC5XX_ROOTFS_OFFSET=0x8E0000
CONFIG_SC5XX_LOADADDR=0xC3000000
CONFIG_SYS_LOAD_ADDR=0xC3000000
CONFIG_WATCHDOG_TIMEOUT_MSECS=60000
CONFIG_ADI_USE_DMC1=y
# CONFIG_EFI_LOADER is not set
@@ -26,7 +20,7 @@ CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
CONFIG_LEGACY_IMAGE_FORMAT=y
CONFIG_USE_BOOTCOMMAND=y
CONFIG_BOOTCOMMAND="run ramboot"
CONFIG_BOOTCOMMAND="run spiboot"
CONFIG_SYS_CBSIZE=512
# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
CONFIG_SPL_I2C=y
@@ -58,8 +52,6 @@ CONFIG_CMD_FS_GENERIC=y
CONFIG_SPL_OF_CONTROL=y
CONFIG_OF_EMBED=y
CONFIG_ENV_OVERWRITE=y
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_ENV_SPI_MAX_HZ=10000000
CONFIG_USE_HOSTNAME=y
CONFIG_HOSTNAME="sc589-mini"
CONFIG_NET_RETRY_COUNT=20

7
configs/sc594-som-ezkit-spl_defconfig
View File

@@ -4,21 +4,19 @@ CONFIG_ARCH_SC5XX=y
CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_SPL_GPIO=y
CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x8203f000
CONFIG_ENV_SIZE=0x20000
CONFIG_ENV_OFFSET=0x100000
CONFIG_ENV_SECT_SIZE=0x20000
CONFIG_DM_GPIO=y
CONFIG_SPL_DM_SPI=y
CONFIG_SPL_SYS_MALLOC_F_LEN=0x10000
CONFIG_SPL_SERIAL=y
CONFIG_SC59X=y
CONFIG_TARGET_SC594_SOM_EZKIT=y
CONFIG_SYS_LOAD_ADDR=0xA2000000
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
CONFIG_LEGACY_IMAGE_FORMAT=y
CONFIG_USE_BOOTCOMMAND=y
CONFIG_BOOTCOMMAND="run ospiboot"
CONFIG_BOOTCOMMAND="run spiboot"
CONFIG_SYS_CBSIZE=512
CONFIG_SPL_I2C=y
CONFIG_SPL_DM_SPI_FLASH=y
@@ -40,7 +38,6 @@ CONFIG_CMD_EXT4=y
CONFIG_CMD_FAT=y
CONFIG_OF_EMBED=y
CONFIG_ENV_OVERWRITE=y
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_USE_HOSTNAME=y
CONFIG_HOSTNAME="sc594-som-ezkit"
CONFIG_NET_RETRY_COUNT=20

7
configs/sc594-som-ezlite-spl_defconfig
View File

@@ -3,15 +3,13 @@ CONFIG_SYS_ARM_CACHE_WRITETHROUGH=y
CONFIG_ARCH_SC5XX=y
CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_SPL_GPIO=y
CONFIG_ENV_SIZE=0x20000
CONFIG_ENV_OFFSET=0x100000
CONFIG_ENV_SECT_SIZE=0x20000
CONFIG_DM_GPIO=y
CONFIG_SPL_DM_SPI=y
CONFIG_SPL_SYS_MALLOC_F_LEN=0x10000
CONFIG_SPL_SERIAL=y
CONFIG_SPL_STACK=0x200E4000
CONFIG_SC59X=y
CONFIG_SYS_LOAD_ADDR=0xA2000000
CONFIG_CGU1_DIV_S1SELEX=16
CONFIG_CDU0_CLKO10=5
CONFIG_SF_DEFAULT_BUS=0
@@ -21,7 +19,7 @@ CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
CONFIG_LEGACY_IMAGE_FORMAT=y
CONFIG_USE_BOOTCOMMAND=y
CONFIG_BOOTCOMMAND="run ospiboot"
CONFIG_BOOTCOMMAND="run spiboot"
CONFIG_SYS_CBSIZE=512
CONFIG_CYCLIC_MAX_CPU_TIME_US=1000
CONFIG_SPL_I2C=y
@@ -45,7 +43,6 @@ CONFIG_CMD_FAT=y
# CONFIG_DOS_PARTITION is not set
CONFIG_OF_EMBED=y
CONFIG_ENV_OVERWRITE=y
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_USE_HOSTNAME=y
CONFIG_HOSTNAME="sc594-som-ezlite"
CONFIG_NET_RETRY_COUNT=20

5
configs/sc598-som-ezkit-spl_defconfig
View File

@@ -4,9 +4,6 @@ CONFIG_COUNTER_FREQUENCY=31250000
CONFIG_ARCH_SC5XX=y
CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_SPL_GPIO=y
CONFIG_ENV_SIZE=0x20000
CONFIG_ENV_OFFSET=0x180000
CONFIG_ENV_SECT_SIZE=0x20000
CONFIG_DM_GPIO=y
CONFIG_SPL_DM_SPI=y
CONFIG_SPL_SYS_MALLOC_F_LEN=0x10000
@@ -14,6 +11,7 @@ CONFIG_SPL_SERIAL=y
CONFIG_SC59X_64=y
CONFIG_TARGET_SC598_SOM_EZKIT=y
CONFIG_SYS_BOOTM_LEN=0x4000000
CONFIG_SYS_LOAD_ADDR=0x90000000
CONFIG_CGU1_PLL3_DDRCLK=y
CONFIG_CGU1_PLL3_VCO_MSEL=64
CONFIG_CGU1_PLL3_DCLK_DIV=2
@@ -63,7 +61,6 @@ CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_FAT=y
CONFIG_OF_EMBED=y
CONFIG_ENV_OVERWRITE=y
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_USE_HOSTNAME=y
CONFIG_HOSTNAME="sc598-som-ezkit"
CONFIG_NET_RETRY_COUNT=20

5
configs/sc598-som-ezlite-spl_defconfig
View File

@@ -4,9 +4,6 @@ CONFIG_COUNTER_FREQUENCY=31250000
CONFIG_ARCH_SC5XX=y
CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_SPL_GPIO=y
CONFIG_ENV_SIZE=0x20000
CONFIG_ENV_OFFSET=0x180000
CONFIG_ENV_SECT_SIZE=0x20000
CONFIG_DM_GPIO=y
CONFIG_SPL_DM_SPI=y
CONFIG_SPL_SYS_MALLOC_F_LEN=0x10000
@@ -14,6 +11,7 @@ CONFIG_SPL_SERIAL=y
CONFIG_SPL_STACK=0x200E4000
CONFIG_SC59X_64=y
CONFIG_SYS_BOOTM_LEN=0x4000000
CONFIG_SYS_LOAD_ADDR=0x90000000
CONFIG_CGU1_PLL3_DDRCLK=y
CONFIG_CGU1_PLL3_VCO_MSEL=64
CONFIG_CGU1_PLL3_DCLK_DIV=2
@@ -62,7 +60,6 @@ CONFIG_CMD_EXT4=y
CONFIG_CMD_EXT4_WRITE=y
CONFIG_OF_EMBED=y
CONFIG_ENV_OVERWRITE=y
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_USE_HOSTNAME=y
CONFIG_HOSTNAME="sc598-som-ezlite"
CONFIG_NET_RETRY_COUNT=20

2
doc/device-tree-bindings/arm/adi/adi,sc5xx.yaml
View File

@@ -18,7 +18,7 @@ properties:
oneOf:
- description: SC57X Series Boards
items:
- const: adi,sc573-ezkit
- const: adi,sc573-ezlite
- const: adi,sc57x
- description: SC58X Series Boards

4
include/configs/sc573-ezkit.h → include/configs/sc573-ezlite.h
View File

@@ -3,8 +3,8 @@
* (C) Copyright 2024 - Analog Devices, Inc.
*/
#ifndef __CONFIG_SC573_EZKIT_H
#define __CONFIG_SC573_EZKIT_H
#ifndef __CONFIG_SC573_EZLITE_H
#define __CONFIG_SC573_EZLITE_H
/*
* Memory Settings

119
include/env/adi/adi_boot.env vendored
View File

@@ -1,13 +1,3 @@
/*
* A target board needs to set these variables for the commands below to work:
*
* - adi_stage2_offset, the location of stage2-boot.ldr on the SPI flash
* - adi_image_offset, location of the fitImage on the SPI flash
* - adi_rfs_offset, location of the RFS on the SPI flash
* - loadaddr, where you want to load things
* - jffs2file, name of the jffs2 file for update, ex adsp-sc5xx-tiny-adsp-sc573.jffs2
*/
#ifdef CONFIG_SC59X_64
#define EARLY_PRINTK earlycon=adi_uart,0x31003000
#else
@@ -15,106 +5,71 @@
#endif
/* Config options */
imagefile=fitImage
ethaddr=02:80:ad:20:31:e8
eth1addr=02:80:ad:20:31:e9
httpdstp=8000
uart_console=CONFIG_UART_CONSOLE
#ifdef CONFIG_SC59X_64
initrd_high=0xffffffffffffffff
#else
initrd_high=0xffffffff
#endif
/* Helper routines */
init_ethernet=mii info;
dhcp;
setenv serverip ${tftpserverip}
#if defined(CONFIG_SC59X) || defined(CONFIG_SC59X_64)
adi_image_offset=0x100000
#else
adi_image_offset=0xd0000
#endif
/* Args for each boot mode */
adi_bootargs=EARLY_PRINTK console=ttySC0,CONFIG_BAUDRATE vmalloc=512M
ramargs=setenv bootargs ${adi_bootargs}
addip=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}:eth0:off
rootpath=/romfs
/* Boot modes are selectable and should be defined in the board env before including */
#if defined(USE_NFS)
// rootpath is set by CONFIG_ROOTPATH
nfsargs=setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath},tcp,nfsvers=3 ${adi_bootargs}
nfsboot=run init_ethernet;
tftp ${loadaddr} ${tftp_dir_prefix}${imagefile};
run nfsargs;
nfsboot=run nfsargs;
run addip;
bootm ${loadaddr}
wget ${loadaddr} ${serverip}:/fitImage;
bootm
#endif
#if defined(USE_MMC)
mmcargs=setenv bootargs root=/dev/mmcblk0p1 rw rootfstype=ext4 rootwait ${adi_bootargs}
mmcargs=setenv bootargs root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait ${adi_bootargs}
mmcboot=mmc rescan;
ext4load mmc 0:1 ${loadaddr} /boot/${imagefile};
ext4load mmc 0:1 ${loadaddr} /fitImage;
run mmcargs;
bootm ${loadaddr}
#endif
#if defined(USE_SPI) || defined(USE_OSPI)
spiargs=setenv bootargs root=/dev/mtdblock4 rw rootfstype=jffs2 ${adi_bootargs}
spiboot=run spiargs;
sf probe ${sfdev};
sf read ${loadaddr} ${adi_image_offset} ${imagesize};
bootm ${loadaddr}
#endif
#if defined(USE_OSPI)
ospiboot=run spiboot
#endif
#if defined(USE_RAM)
ramboot=run init_ethernet;
tftp ${loadaddr} ${tfpt_dir_prefix}${imagefile};
run ramargs;
bootm ${loadaddr}
#endif
/* Update commands */
stage1file=stage1-boot.ldr
stage2file=stage2-boot.ldr
#if defined(USE_SPI) || defined(USE_OSPI)
update_spi_uboot_stage1=tftp ${loadaddr} ${tftp_dir_prefix}${stage1file};
sf probe ${sfdev};
sf update ${loadaddr} 0x0 ${filesize}
update_spi_uboot_stage2=tftp ${loadaddr} ${tftp_dir_prefix}${stage2file};
sf probe ${sfdev};
sf update ${loadaddr} ${adi_stage2_offset} ${filesize}
update_spi_uboot=run update_spi_uboot_stage1;
run update_spi_uboot_stage2;
update_spi_fit=tftp ${loadaddr} ${tftp_dir_prefix}${imagefile};
sf probe ${sfdev};
sf update ${loadaddr} ${adi_image_offset} ${filesize};
setenv imagesize ${filesize}
update_spi_rfs=tftp ${loadaddr} ${tftp_dir_prefix}${jffs2file};
sf probe ${sfdev};
sf update ${loadaddr} ${adi_rfs_offset} ${filesize}
start_update_spi=run init_ethernet;
run update_spi_uboot;
run update_spi_fit;
run update_spi_rfs;
start_update_spi_uboot_only=run init_ethernet;
run update_spi_uboot;
bootm
#endif
#if defined(USE_SPI)
update_spi=setenv sfdev CONFIG_SC_BOOT_SPI_BUS:CONFIG_SC_BOOT_SPI_SSEL;
setenv bootcmd run spiboot;
setenv argscmd spiargs;
run start_update_spi;
saveenv
spiargs=setenv bootargs rootfstype=ubifs root=ubi0:rootfs ubi.mtd=3 rw ${adi_bootargs}; setenv sfdev CONFIG_SC_BOOT_SPI_BUS:CONFIG_SC_BOOT_SPI_SSEL
spiboot=run spiargs;
sf probe ${sfdev};
sf read ${loadaddr} ${adi_image_offset} 0xf00000;
bootm ${loadaddr}
#endif
#if defined(USE_OSPI)
update_ospi=setenv sfdev CONFIG_SC_BOOT_OSPI_BUS:CONFIG_SC_BOOT_OSPI_SSEL;
setenv bootcmd run ospiboot;
setenv argscmd spiargs;
run start_update_spi;
saveenv
ospiargs=setenv bootargs rootfstype=ubifs root=ubi0:rootfs ubi.mtd=3 rw ${adi_bootargs}; setenv sfdev CONFIG_SC_BOOT_OSPI_BUS:CONFIG_SC_BOOT_OSPI_SSEL
ospiboot=run ospiargs;
sf probe ${sfdev};
sf read ${loadaddr} ${adi_image_offset} 0xf00000;
bootm ${loadaddr}
#endif
#if defined(USE_RAM)
ramboot=wget ${loadaddr} ${serverip}:/fitImage;
run ramargs;
bootm
#endif
#if defined(USE_USB)
usbargs=setenv bootargs root=/dev/sda2 rw rootfstype=ext4 rootwait ${adi_bootargs}
usbboot=usb start;
run usbargs;
ext4load usb 0:1 ${loadaddr} /fitImage;
bootm ${loadaddr}
#endif