mach-sc5xx: Remove unused image offset Kconfig options
Subsystems (2)
PATCH v5 15/15 mach-sc5xx: Remove unused image offset Kconfig options
In reply to a message not in the archiveFrom: Caleb Ethridge <[email protected]>
Remove SC5XX_UBOOT_SPL_OFFSET, SC5XX_UBOOT_OFFSET, SC5XX_FITIMAGE_OFFSET and SC5XX_ROOTFS_OFFSET as they are no longer needed in the Kconfig.
--- arch/arm/mach-sc5xx/Kconfig | 24 ------------------------ 1 file changed, 24 deletions(-)
arch/arm/mach-sc5xx/Kconfig +0 -24
@@ -116,30 +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 ADI_IMAGE string "ADI fitImage type" help
Signature · 1 line
2.34.1
PATCH v5 10/15 mach-sc5xx: Update SPI bootargs for ubifs
In reply to a message not in the archiveFrom: Caleb Ethridge <[email protected]>
Update the bootargs used in SPI/OSPI bootmode to reflect change from jffs to ubifs for the SPI's filesystem, and remove the jffs2file variable from the environment as it is now unused.
--- board/adi/sc573-ezlite/sc573-ezlite.env | 1 - board/adi/sc584-ezkit/sc584-ezkit.env | 1 - board/adi/sc589-ezkit/sc589-ezkit.env | 1 - board/adi/sc589-mini/sc589-mini.env | 1 - board/adi/sc594-som-ezkit/sc594-som-ezkit.env | 1 - board/adi/sc594-som-ezlite/sc594-som-ezlite.env | 1 - board/adi/sc598-som-ezkit/sc598-som-ezkit.env | 1 - board/adi/sc598-som-ezlite/sc598-som-ezlite.env | 1 - include/env/adi/adi_boot.env | 5 ++--- 9 files changed, 2 insertions(+), 11 deletions(-)
board/adi/sc573-ezlite/sc573-ezlite.env +0 -1
@@ -3,7 +3,6 @@ * (C) Copyright 2024 - Analog Devices, Inc. */ -jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc573-ezkit.jffs2 adi_image_offset=0xd0000 loadaddr=CONFIG_SC5XX_LOADADDR
board/adi/sc584-ezkit/sc584-ezkit.env +0 -1
@@ -3,7 +3,6 @@ * (C) Copyright 2024 - Analog Devices, Inc. */ -jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc584-ezkit.jffs2 adi_image_offset=0xd0000 loadaddr=CONFIG_SC5XX_LOADADDR
board/adi/sc589-ezkit/sc589-ezkit.env +0 -1
@@ -3,7 +3,6 @@ * (C) Copyright 2024 - Analog Devices, Inc. */ -jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc589-ezkit.jffs2 adi_image_offset=0xd0000 loadaddr=CONFIG_SC5XX_LOADADDR
board/adi/sc589-mini/sc589-mini.env +0 -1
@@ -3,7 +3,6 @@ * (C) Copyright 2024 - Analog Devices, Inc. */ -jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc589-mini.jffs2 adi_image_offset=0xd0000 loadaddr=CONFIG_SC5XX_LOADADDR
board/adi/sc594-som-ezkit/sc594-som-ezkit.env +0 -1
@@ -3,7 +3,6 @@ * (C) Copyright 2024 - Analog Devices, Inc. */ -jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc594-som-ezkit.jffs2 adi_image_offset=0x100000 loadaddr=CONFIG_SC5XX_LOADADDR
board/adi/sc594-som-ezlite/sc594-som-ezlite.env +0 -1
@@ -3,7 +3,6 @@ * (C) Copyright 2024 - Analog Devices, Inc. */ -jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc594-som-ezlite.jffs2 adi_image_offset=0x100000 loadaddr=CONFIG_SC5XX_LOADADDR
board/adi/sc598-som-ezkit/sc598-som-ezkit.env +0 -1
@@ -3,7 +3,6 @@ * (C) Copyright 2024 - Analog Devices, Inc. */ -jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc598-som-ezkit.jffs2 adi_image_offset=0x100000 loadaddr=CONFIG_SC5XX_LOADADDR
board/adi/sc598-som-ezlite/sc598-som-ezlite.env +0 -1
@@ -5,6 +5,5 @@ adi_image_offset=0x100000 loadaddr=CONFIG_SC5XX_LOADADDR -jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc598-som-ezlite.jffs2 #include <env/adi/adi_boot.env>
include/env/adi/adi_boot.env +2 -3
@@ -3,7 +3,6 @@ * * - adi_image_offset, location of the fitImage 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
@@ -48,7 +47,7 @@ mmcboot=mmc rescan; #endif #if defined(USE_SPI) -spiargs=setenv bootargs root=/dev/mtdblock4 rw rootfstype=jffs2 ${adi_bootargs}; setenv sfdev CONFIG_SC_BOOT_SPI_BUS:CONFIG_SC_BOOT_SPI_SSEL +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;
@@ -56,7 +55,7 @@ spiboot=run spiargs; #endif #if defined(USE_OSPI) -ospiargs=setenv bootargs root=/dev/mtdblock4 rw rootfstype=jffs2 ${adi_bootargs}; setenv sfdev CONFIG_SC_BOOT_OSPI_BUS:CONFIG_SC_BOOT_OSPI_SSEL +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;
Signature · 1 line
2.34.1
PATCH v5 5/15 mach-sc5xx: Add USB boot command
In reply to a message not in the archiveFrom: Caleb Ethridge <[email protected]>
Add the USB boot command to the environments
of the boards that support it.
--- board/adi/sc573-ezkit/sc573-ezkit.env | 1 + board/adi/sc584-ezkit/sc584-ezkit.env | 1 + board/adi/sc589-ezkit/sc589-ezkit.env | 1 + board/adi/sc589-mini/sc589-mini.env | 1 + board/adi/sc594-som-ezkit/sc594-som-ezkit.env | 1 + board/adi/sc594-som-ezlite/sc594-som-ezlite.env | 1 + board/adi/sc598-som-ezkit/sc598-som-ezkit.env | 1 + include/env/adi/adi_boot.env | 7 +++++++ 8 files changed, 14 insertions(+)
board/adi/sc573-ezkit/sc573-ezkit.env +1 -0
@@ -11,5 +11,6 @@ loadaddr=CONFIG_SC5XX_LOADADDR #define USE_SPI #define USE_RAM #define USE_MMC +#define USE_USB #include <env/adi/adi_boot.env>
board/adi/sc584-ezkit/sc584-ezkit.env +1 -0
@@ -10,5 +10,6 @@ loadaddr=CONFIG_SC5XX_LOADADDR #define USE_NFS #define USE_SPI #define USE_RAM +#define USE_USB #include <env/adi/adi_boot.env>
board/adi/sc589-ezkit/sc589-ezkit.env +1 -0
@@ -11,5 +11,6 @@ loadaddr=CONFIG_SC5XX_LOADADDR #define USE_RAM #define USE_MMC #define USE_SPI +#define USE_USB #include <env/adi/adi_boot.env>
board/adi/sc589-mini/sc589-mini.env +1 -0
@@ -11,5 +11,6 @@ loadaddr=CONFIG_SC5XX_LOADADDR #define USE_RAM #define USE_SPI #define USE_MMC +#define USE_USB #include <env/adi/adi_boot.env>
board/adi/sc594-som-ezkit/sc594-som-ezkit.env +1 -0
@@ -12,5 +12,6 @@ loadaddr=CONFIG_SC5XX_LOADADDR #define USE_OSPI #define USE_RAM #define USE_MMC +#define USE_USB #include <env/adi/adi_boot.env>
board/adi/sc594-som-ezlite/sc594-som-ezlite.env +1 -0
@@ -12,5 +12,6 @@ loadaddr=CONFIG_SC5XX_LOADADDR #define USE_OSPI #define USE_RAM #define USE_MMC +#define USE_USB #include <env/adi/adi_boot.env>
board/adi/sc598-som-ezkit/sc598-som-ezkit.env +1 -0
@@ -12,5 +12,6 @@ loadaddr=CONFIG_SC5XX_LOADADDR #define USE_OSPI #define USE_RAM #define USE_MMC +#define USE_USB #include <env/adi/adi_boot.env>
include/env/adi/adi_boot.env +7 -0
@@ -68,3 +68,10 @@ ramboot= wget ${loadaddr} ${serverip}:/fitImage; run ramargs; bootm ${loadaddr} #endif + +#if defined(USE_USB) +usbargs=setenv bootargs root=/dev/sda2 rw rootfstype=ext4 rootwait ${adi_bootargs} +usbboot=usb start; + ext4load usb 0:1 ${loadaddr} /fitImage; run usbargs; + bootm ${loadaddr} +#endif
Signature · 1 line
2.34.1
PATCH v5 13/15 arm: sc5xx: add missing boot env selectors
In reply to a message not in the archiveFrom: Ozan Durgut <[email protected]>
Define the boot options for SC598 SOM EZ-LITE so the shared ADI boot environment includes the expected boot commands for this board.
SC598 SOM EZ-LITE board environment utilizes the shared ADI boot environment, but it does not define any of the USE_* boot mode selectors. Without those selectors, the shared env does not generate the board boot commands such as spiboot. This leaves the default bootcmd=run spiboot without a matching environment command and breaks autoboot.
--- board/adi/sc598-som-ezlite/sc598-som-ezlite.env | 5 +++++ 1 file changed, 5 insertions(+)
board/adi/sc598-som-ezlite/sc598-som-ezlite.env +5 -0
@@ -3,5 +3,10 @@ * (C) Copyright 2024 - Analog Devices, Inc. */ +#define USE_NFS +#define USE_SPI +#define USE_RAM +#define USE_MMC +#define USE_USB #include <env/adi/adi_boot.env>
Signature · 1 line
2.34.1
PATCH v5 14/15 arm: sc5xx: Add fdt_addr_r, kernel_addr_r, and ramdisk_addr_r
In reply to a message not in the archiveFrom: Caleb Ethridge <[email protected]>
Add fdt_addr_r, kernel_addr_r, and ramdisk_addr_r to the SC5xx boards. These variables are currently unused in the environment but will be used in the future once support for booti commands is added to the SC5xx boards.
--- board/adi/sc573-ezlite/sc573-ezlite.env | 4 ++++ board/adi/sc584-ezkit/sc584-ezkit.env | 4 ++++ board/adi/sc589-ezkit/sc589-ezkit.env | 4 ++++ board/adi/sc589-mini/sc589-mini.env | 4 ++++ board/adi/sc594-som-ezkit/sc594-som-ezkit.env | 4 ++++ board/adi/sc594-som-ezlite/sc594-som-ezlite.env | 4 ++++ board/adi/sc598-som-ezkit/sc598-som-ezkit.env | 4 ++++ board/adi/sc598-som-ezlite/sc598-som-ezlite.env | 4 ++++ 8 files changed, 32 insertions(+)
board/adi/sc573-ezlite/sc573-ezlite.env +4 -0
@@ -3,6 +3,10 @@ * (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
board/adi/sc584-ezkit/sc584-ezkit.env +4 -0
@@ -3,6 +3,10 @@ * (C) Copyright 2024 - Analog Devices, Inc. */ +fdt_addr_r=CONFIG_SYS_LOAD_ADDR +kernel_addr_r=0x8A308000 +ramdisk_addr_r=0x8A800000 + #define USE_NFS #define USE_SPI #define USE_RAM
board/adi/sc589-ezkit/sc589-ezkit.env +4 -0
@@ -3,6 +3,10 @@ * (C) Copyright 2024 - Analog Devices, Inc. */ +fdt_addr_r=CONFIG_SYS_LOAD_ADDR +kernel_addr_r=0xC4008000 +ramdisk_addr_r=0xC5000000 + #define USE_NFS #define USE_RAM #define USE_MMC
board/adi/sc589-mini/sc589-mini.env +4 -0
@@ -3,6 +3,10 @@ * (C) Copyright 2024 - Analog Devices, Inc. */ +fdt_addr_r=CONFIG_SYS_LOAD_ADDR +kernel_addr_r=0xC4008000 +ramdisk_addr_r=0xC5000000 + #define USE_NFS #define USE_RAM #define USE_SPI
board/adi/sc594-som-ezkit/sc594-som-ezkit.env +4 -0
@@ -3,6 +3,10 @@ * (C) Copyright 2024 - Analog Devices, Inc. */ +fdt_addr_r=CONFIG_SYS_LOAD_ADDR +kernel_addr_r=0xA3008000 +ramdisk_addr_r=0xA8000000 + #define USE_NFS #define USE_SPI #define USE_OSPI
board/adi/sc594-som-ezlite/sc594-som-ezlite.env +4 -0
@@ -3,6 +3,10 @@ * (C) Copyright 2024 - Analog Devices, Inc. */ +fdt_addr_r=CONFIG_SYS_LOAD_ADDR +kernel_addr_r=0xA3008000 +ramdisk_addr_r=0xA8000000 + #define USE_NFS #define USE_SPI #define USE_OSPI
board/adi/sc598-som-ezkit/sc598-som-ezkit.env +4 -0
@@ -3,6 +3,10 @@ * (C) Copyright 2024 - Analog Devices, Inc. */ +fdt_addr_r=CONFIG_SYS_LOAD_ADDR +kernel_addr_r=0x9a200000 +ramdisk_addr_r=0x9c000000 + #define USE_NFS #define USE_SPI #define USE_OSPI
board/adi/sc598-som-ezlite/sc598-som-ezlite.env +4 -0
@@ -3,6 +3,10 @@ * (C) Copyright 2024 - Analog Devices, Inc. */ +fdt_addr_r=CONFIG_SYS_LOAD_ADDR +kernel_addr_r=0x9a200000 +ramdisk_addr_r=0x9c000000 + #define USE_NFS #define USE_SPI #define USE_RAM
Signature · 1 line
2.34.1
PATCH v5 6/15 mach-sc5xx: Remove preliminary binman support
In reply to a message not in the archiveFrom: Caleb Ethridge <[email protected]>
Remove preliminary binman support from all sc5xx ADSP boards. Full support was never added because it was unused.
--- arch/arm/dts/sc5xx.dtsi | 41 ------------------------------------- arch/arm/mach-sc5xx/Kconfig | 33 ----------------------------- 2 files changed, 74 deletions(-)
arch/arm/dts/sc5xx.dtsi +0 -41
@@ -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";
arch/arm/mach-sc5xx/Kconfig +0 -33
@@ -146,39 +146,6 @@ config SC5XX_LOADADDR 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
Signature · 1 line
2.34.1
PATCH v5 12/15 arm: sc5xx: Remove SC5XX_LOADADDR
In reply to a message not in the archiveFrom: Caleb Ethridge <[email protected]>
Remove the SC5XX_LOADADDR Kconfig option, replace its users with CONFIG_SYS_LOAD_ADDR, and update the ADI boot environment to use loadaddr.
SC5XX_LOADADDR was an ADI-specific duplicate of standard U-Boot load address handling. U-Boot already uses CONFIG_SYS_LOAD_ADDR for the default load address and loadaddr for boot commands, so keeping separate SC5XX-specific names is redundant.
--- arch/arm/mach-sc5xx/Kconfig | 6 ----- board/adi/sc573-ezlite/sc573-ezlite.env | 3 --- board/adi/sc584-ezkit/sc584-ezkit.env | 3 --- board/adi/sc589-ezkit/sc589-ezkit.env | 3 --- board/adi/sc589-mini/sc589-mini.env | 3 --- board/adi/sc594-som-ezkit/sc594-som-ezkit.env | 3 --- .../adi/sc594-som-ezlite/sc594-som-ezlite.env | 3 --- board/adi/sc598-som-ezkit/sc598-som-ezkit.env | 3 --- .../adi/sc598-som-ezlite/sc598-som-ezlite.env | 2 -- configs/sc573-ezlite_defconfig | 2 +- configs/sc584-ezkit_defconfig | 2 +- configs/sc589-ezkit_defconfig | 2 +- configs/sc589-mini_defconfig | 2 +- configs/sc594-som-ezkit-spl_defconfig | 2 +- configs/sc594-som-ezlite-spl_defconfig | 2 +- configs/sc598-som-ezkit-spl_defconfig | 2 +- configs/sc598-som-ezlite-spl_defconfig | 2 +- include/env/adi/adi_boot.env | 24 +++++++++---------- 18 files changed, 19 insertions(+), 50 deletions(-)
arch/arm/mach-sc5xx/Kconfig +0 -6
@@ -140,12 +140,6 @@ config SC5XX_ROOTFS_OFFSET 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. - config ADI_IMAGE string "ADI fitImage type" help
board/adi/sc573-ezlite/sc573-ezlite.env +0 -3
@@ -3,9 +3,6 @@ * (C) Copyright 2024 - Analog Devices, Inc. */ -adi_image_offset=0xd0000 -loadaddr=CONFIG_SC5XX_LOADADDR - #define USE_NFS #define USE_SPI #define USE_RAM
board/adi/sc584-ezkit/sc584-ezkit.env +0 -3
@@ -3,9 +3,6 @@ * (C) Copyright 2024 - Analog Devices, Inc. */ -adi_image_offset=0xd0000 -loadaddr=CONFIG_SC5XX_LOADADDR - #define USE_NFS #define USE_SPI #define USE_RAM
board/adi/sc589-ezkit/sc589-ezkit.env +0 -3
@@ -3,9 +3,6 @@ * (C) Copyright 2024 - Analog Devices, Inc. */ -adi_image_offset=0xd0000 -loadaddr=CONFIG_SC5XX_LOADADDR - #define USE_NFS #define USE_RAM #define USE_MMC
board/adi/sc589-mini/sc589-mini.env +0 -3
@@ -3,9 +3,6 @@ * (C) Copyright 2024 - Analog Devices, Inc. */ -adi_image_offset=0xd0000 -loadaddr=CONFIG_SC5XX_LOADADDR - #define USE_NFS #define USE_RAM #define USE_SPI
board/adi/sc594-som-ezkit/sc594-som-ezkit.env +0 -3
@@ -3,9 +3,6 @@ * (C) Copyright 2024 - Analog Devices, Inc. */ -adi_image_offset=0x100000 -loadaddr=CONFIG_SC5XX_LOADADDR - #define USE_NFS #define USE_SPI #define USE_OSPI
board/adi/sc594-som-ezlite/sc594-som-ezlite.env +0 -3
@@ -3,9 +3,6 @@ * (C) Copyright 2024 - Analog Devices, Inc. */ -adi_image_offset=0x100000 -loadaddr=CONFIG_SC5XX_LOADADDR - #define USE_NFS #define USE_SPI #define USE_OSPI
board/adi/sc598-som-ezkit/sc598-som-ezkit.env +0 -3
@@ -3,9 +3,6 @@ * (C) Copyright 2024 - Analog Devices, Inc. */ -adi_image_offset=0x100000 -loadaddr=CONFIG_SC5XX_LOADADDR - #define USE_NFS #define USE_SPI #define USE_OSPI
board/adi/sc598-som-ezlite/sc598-som-ezlite.env +0 -2
@@ -3,7 +3,5 @@ * (C) Copyright 2024 - Analog Devices, Inc. */ -adi_image_offset=0x100000 -loadaddr=CONFIG_SC5XX_LOADADDR #include <env/adi/adi_boot.env>
configs/sc573-ezlite_defconfig +1 -1
@@ -6,7 +6,7 @@ CONFIG_SPL_GPIO=y CONFIG_DM_GPIO=y CONFIG_SPL_SYS_MALLOC_F_LEN=0x10000 CONFIG_SPL_SERIAL=y -CONFIG_SC5XX_LOADADDR=0x83000000 +CONFIG_SYS_LOAD_ADDR=0x83000000 CONFIG_WATCHDOG_TIMEOUT_MSECS=60000 CONFIG_CGU0_CLKOUTSEL=7 # CONFIG_EFI_LOADER is not set
configs/sc584-ezkit_defconfig +1 -1
@@ -10,7 +10,7 @@ CONFIG_SPL_STACK=0x200C0000 CONFIG_SPL_BSS_START_ADDR=0x200A0000 CONFIG_SPL_BSS_MAX_SIZE=0x8000 CONFIG_SC58X=y -CONFIG_SC5XX_LOADADDR=0x89300000 +CONFIG_SYS_LOAD_ADDR=0x89300000 CONFIG_WATCHDOG_TIMEOUT_MSECS=60000 CONFIG_ADI_BUG_EZKHW21=y CONFIG_CGU0_CLKOUTSEL=7
configs/sc589-ezkit_defconfig +1 -1
@@ -13,7 +13,7 @@ CONFIG_SPL_BSS_START_ADDR=0x200A0000 CONFIG_SPL_BSS_MAX_SIZE=0x8000 CONFIG_SC58X=y CONFIG_TARGET_SC589_EZKIT=y -CONFIG_SC5XX_LOADADDR=0xC3000000 +CONFIG_SYS_LOAD_ADDR=0xC3000000 CONFIG_WATCHDOG_TIMEOUT_MSECS=60000 CONFIG_ADI_USE_DMC1=y CONFIG_CGU0_CLKOUTSEL=7
configs/sc589-mini_defconfig +1 -1
@@ -12,7 +12,7 @@ CONFIG_SPL_BSS_START_ADDR=0x200A0000 CONFIG_SPL_BSS_MAX_SIZE=0x8000 CONFIG_SC58X=y CONFIG_TARGET_SC589_MINI=y -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
configs/sc594-som-ezkit-spl_defconfig +1 -1
@@ -10,6 +10,7 @@ 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
@@ -74,4 +75,3 @@ CONFIG_SPL_TIMER=y CONFIG_USB=y CONFIG_USB_DWC2=y CONFIG_USB_STORAGE=y -CONFIG_SC5XX_LOADADDR=0xA2000000
configs/sc594-som-ezlite-spl_defconfig +1 -1
@@ -9,6 +9,7 @@ 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
@@ -83,4 +84,3 @@ CONFIG_USB_DWC2=y CONFIG_USB_STORAGE=y # CONFIG_SPL_CRC8 is not set # CONFIG_TOOLS_MKEFICAPSULE is not set -CONFIG_SC5XX_LOADADDR=0xA2000000
configs/sc598-som-ezkit-spl_defconfig +1 -1
@@ -11,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
@@ -108,4 +109,3 @@ CONFIG_USB_DWC2=y CONFIG_USB_STORAGE=y # CONFIG_SPL_CRC8 is not set # CONFIG_TOOLS_MKEFICAPSULE is not set -CONFIG_SC5XX_LOADADDR=0x90000000
configs/sc598-som-ezlite-spl_defconfig +1 -1
@@ -11,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
@@ -106,4 +107,3 @@ CONFIG_USB_DWC2=y CONFIG_USB_STORAGE=y # CONFIG_SPL_CRC8 is not set # CONFIG_TOOLS_MKEFICAPSULE is not set -CONFIG_SC5XX_LOADADDR=0x90000000
include/env/adi/adi_boot.env +11 -13
@@ -1,10 +1,3 @@ -/* - * A target board needs to set these variables for the commands below to work: - * - * - adi_image_offset, location of the fitImage on the SPI flash - * - loadaddr, where you want to load things - */ - #ifdef CONFIG_SC59X_64 #define EARLY_PRINTK earlycon=adi_uart,0x31003000 #else
@@ -21,6 +14,11 @@ initrd_high=0xffffffffffffffff #else initrd_high=0xffffffff #endif +#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
@@ -35,7 +33,7 @@ nfsargs=setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath},tcp,nfs nfsboot= run nfsargs; run addip; wget ${loadaddr} ${serverip}:/fitImage; - bootm ${loadaddr} + bootm #endif #if defined(USE_MMC)
@@ -43,7 +41,7 @@ mmcargs=setenv bootargs root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait ${adi_bo mmcboot=mmc rescan; ext4load mmc 0:1 ${loadaddr} /fitImage; run mmcargs; - bootm ${loadaddr} + bootm #endif #if defined(USE_SPI)
@@ -51,7 +49,7 @@ spiargs=setenv bootargs rootfstype=ubifs root=ubi0:rootfs ubi.mtd=3 rw ${adi_boo spiboot=run spiargs; sf probe ${sfdev}; sf read ${loadaddr} ${adi_image_offset} 0xF00000; - bootm ${loadaddr} + bootm #endif #if defined(USE_OSPI)
@@ -59,18 +57,18 @@ ospiargs=setenv bootargs rootfstype=ubifs root=ubi0:rootfs ubi.mtd=3 rw ${adi_bo ospiboot=run ospiargs; sf probe ${sfdev}; sf read ${loadaddr} ${adi_image_offset} 0xF00000; - bootm ${loadaddr} + bootm #endif #if defined(USE_RAM) ramboot= wget ${loadaddr} ${serverip}:/fitImage; run ramargs; - bootm ${loadaddr} + bootm #endif #if defined(USE_USB) usbargs=setenv bootargs root=/dev/sda2 rw rootfstype=ext4 rootwait ${adi_bootargs} usbboot=usb start; ext4load usb 0:1 ${loadaddr} /fitImage; run usbargs; - bootm ${loadaddr} + bootm #endif
Signature · 1 line
2.34.1
PATCH v5 8/15 mach-sc5xx: sc573: Rename EZKIT board to EZLITE
In reply to a message not in the archiveFrom: Caleb Ethridge <[email protected]>
Rename the SC573 EZKIT board to EZLITE across the device tree, defconfig, board file, and related Kconfig/Makefile entries to match with release naming. EZKIT was used internally before the official product release.
---
arch/arm/dts/Makefile | 2 +-
arch/arm/dts/{sc573-ezkit.dts => sc573-ezlite.dts} | 4 ++--
arch/arm/mach-sc5xx/Kconfig | 8 ++++----
arch/arm/mach-sc5xx/init/dmcinit.c | 2 +-
board/adi/{sc573-ezkit => sc573-ezlite}/Kconfig | 8 ++++----
board/adi/{sc573-ezkit => sc573-ezlite}/Makefile | 2 +-
.../sc573-ezkit.c => sc573-ezlite/sc573-ezlite.c} | 0
.../sc573-ezkit.env => sc573-ezlite/sc573-ezlite.env} | 0
configs/{sc573-ezkit_defconfig => sc573-ezlite_defconfig} | 2 +-
doc/device-tree-bindings/arm/adi/adi,sc5xx.yaml | 2 +-
include/configs/{sc573-ezkit.h => sc573-ezlite.h} | 4 ++--
11 files changed, 17 insertions(+), 17 deletions(-)
rename arch/arm/dts/{sc573-ezkit.dts => sc573-ezlite.dts} (98%)
rename board/adi/{sc573-ezkit => sc573-ezlite}/Kconfig (92%)
rename board/adi/{sc573-ezkit => sc573-ezlite}/Makefile (79%)
rename board/adi/{sc573-ezkit/sc573-ezkit.c => sc573-ezlite/sc573-ezlite.c} (100%)
rename board/adi/{sc573-ezkit/sc573-ezkit.env => sc573-ezlite/sc573-ezlite.env} (100%)
rename configs/{sc573-ezkit_defconfig => sc573-ezlite_defconfig} (98%)
rename include/configs/{sc573-ezkit.h => sc573-ezlite.h} (79%)arch/arm/dts/Makefile +1 -1
@@ -1186,7 +1186,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
arch/arm/dts/sc573-ezlite.dts renamed from arch/arm/dts/sc573-ezkit.dts +2 -2
@@ -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 {
arch/arm/mach-sc5xx/Kconfig +4 -4
@@ -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
@@ -600,6 +600,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
arch/arm/mach-sc5xx/init/dmcinit.c +1 -1
@@ -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
board/adi/sc573-ezlite/Kconfig renamed from board/adi/sc573-ezkit/Kconfig +4 -4
@@ -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"
board/adi/sc573-ezlite/Makefile renamed from board/adi/sc573-ezkit/Makefile +1 -1
@@ -3,4 +3,4 @@ # (C) Copyright 2025 - Analog Devices, Inc. # -obj-y += sc573-ezkit.o +obj-y += sc573-ezlite.o
board/adi/sc573-ezlite/sc573-ezlite.c renamed from board/adi/sc573-ezkit/sc573-ezkit.c +0 -0
board/adi/sc573-ezlite/sc573-ezlite.env renamed from board/adi/sc573-ezkit/sc573-ezkit.env +0 -0
configs/sc573-ezlite_defconfig renamed from configs/sc573-ezkit_defconfig +1 -1
@@ -47,7 +47,7 @@ CONFIG_SPL_OF_CONTROL=y CONFIG_OF_EMBED=y CONFIG_ENV_OVERWRITE=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
doc/device-tree-bindings/arm/adi/adi,sc5xx.yaml +1 -1
@@ -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
include/configs/sc573-ezlite.h renamed from include/configs/sc573-ezkit.h +2 -2
@@ -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
Signature · 1 line
2.34.1
PATCH v5 7/15 dts: sc594: Fix gige-reset line on EZKIT
In reply to a message not in the archiveFrom: Caleb Ethridge <[email protected]>
The gige-reset line on the EZKIT was updated for the sc598 but not the sc594. This commit aligns the two .dts files since they are describing the same hardware, the EZKIT carrier board.
--- arch/arm/dts/sc594-som-ezkit.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/dts/sc594-som-ezkit.dts +1 -1
@@ -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;
Signature · 1 line
2.34.1
PATCH v5 9/15 mach-sc5xx: Update image load address
In reply to a message not in the archiveFrom: Caleb Ethridge <[email protected]>
Update the load address for the image in
each environment to match the updated partitions
in Linux.
--- board/adi/sc573-ezlite/sc573-ezlite.env | 2 +- board/adi/sc584-ezkit/sc584-ezkit.env | 2 +- board/adi/sc589-ezkit/sc589-ezkit.env | 2 +- board/adi/sc589-mini/sc589-mini.env | 2 +- board/adi/sc594-som-ezkit/sc594-som-ezkit.env | 2 +- board/adi/sc594-som-ezlite/sc594-som-ezlite.env | 2 +- board/adi/sc598-som-ezkit/sc598-som-ezkit.env | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-)
board/adi/sc573-ezlite/sc573-ezlite.env +1 -1
@@ -4,7 +4,7 @@ */ jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc573-ezkit.jffs2 -adi_image_offset=0xe0000 +adi_image_offset=0xd0000 loadaddr=CONFIG_SC5XX_LOADADDR #define USE_NFS
board/adi/sc584-ezkit/sc584-ezkit.env +1 -1
@@ -4,7 +4,7 @@ */ jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc584-ezkit.jffs2 -adi_image_offset=0xe0000 +adi_image_offset=0xd0000 loadaddr=CONFIG_SC5XX_LOADADDR #define USE_NFS
board/adi/sc589-ezkit/sc589-ezkit.env +1 -1
@@ -4,7 +4,7 @@ */ jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc589-ezkit.jffs2 -adi_image_offset=0xe0000 +adi_image_offset=0xd0000 loadaddr=CONFIG_SC5XX_LOADADDR #define USE_NFS
board/adi/sc589-mini/sc589-mini.env +1 -1
@@ -4,7 +4,7 @@ */ jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc589-mini.jffs2 -adi_image_offset=0xe0000 +adi_image_offset=0xd0000 loadaddr=CONFIG_SC5XX_LOADADDR #define USE_NFS
board/adi/sc594-som-ezkit/sc594-som-ezkit.env +1 -1
@@ -4,7 +4,7 @@ */ jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc594-som-ezkit.jffs2 -adi_image_offset=0x110000 +adi_image_offset=0x100000 loadaddr=CONFIG_SC5XX_LOADADDR #define USE_NFS
board/adi/sc594-som-ezlite/sc594-som-ezlite.env +1 -1
@@ -4,7 +4,7 @@ */ jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc594-som-ezlite.jffs2 -adi_image_offset=0x110000 +adi_image_offset=0x100000 loadaddr=CONFIG_SC5XX_LOADADDR #define USE_NFS
board/adi/sc598-som-ezkit/sc598-som-ezkit.env +1 -1
@@ -4,7 +4,7 @@ */ jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc598-som-ezkit.jffs2 -adi_image_offset=0x110000 +adi_image_offset=0x100000 loadaddr=CONFIG_SC5XX_LOADADDR #define USE_NFS
Signature · 1 line
2.34.1
PATCH v5 4/15 mach-sc5xx: Switch from tftp to wget
In reply to a message not in the archiveFrom: Caleb Ethridge <[email protected]>
Switch the nfsboot and other relevant commands to use wget instead of tftp. This also includes the addition of the httpdstp variable for selecting the wget port.
The default port is set to 8000 instead of the usual 80 to allow for use with an unprivileged web server.
--- include/env/adi/adi_boot.env | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
include/env/adi/adi_boot.env +5 -6
@@ -15,6 +15,7 @@ /* Config options */ 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
@@ -27,15 +28,14 @@ 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; + wget ${loadaddr} ${serverip}:/fitImage; bootm ${loadaddr} #endif
@@ -64,8 +64,7 @@ ospiboot=run ospiargs; #endif #if defined(USE_RAM) -ramboot=run init_ethernet; - tftp ${loadaddr} ${tfpt_dir_prefix}${imagefile}; +ramboot= wget ${loadaddr} ${serverip}:/fitImage; run ramargs; bootm ${loadaddr} #endif
Signature · 1 line
2.34.1
PATCH v5 1/15 configs: sc5xx: Do not store environment in SPI flash
In reply to a message not in the archiveFrom: Caleb Ethridge <[email protected]>
Remove config option enabling storage of the environment in the SPI flash, to match shift of programming boot media to Linux.
--- configs/sc573-ezkit_defconfig | 4 ---- configs/sc584-ezkit_defconfig | 5 ----- configs/sc589-ezkit_defconfig | 5 ----- configs/sc589-mini_defconfig | 5 ----- configs/sc594-som-ezkit-spl_defconfig | 4 ---- configs/sc594-som-ezlite-spl_defconfig | 4 ---- configs/sc598-som-ezkit-spl_defconfig | 4 ---- configs/sc598-som-ezlite-spl_defconfig | 4 ---- 8 files changed, 35 deletions(-)
configs/sc573-ezkit_defconfig +0 -4
@@ -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=0x10000 CONFIG_SPL_SERIAL=y
@@ -52,7 +49,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_USE_HOSTNAME=y CONFIG_HOSTNAME="sc573-ezkit" CONFIG_NET_RETRY_COUNT=20
configs/sc584-ezkit_defconfig +0 -5
@@ -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
@@ -57,8 +54,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
configs/sc589-ezkit_defconfig +0 -5
@@ -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
@@ -61,8 +58,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
configs/sc589-mini_defconfig +0 -5
@@ -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
@@ -58,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-mini" CONFIG_NET_RETRY_COUNT=20
configs/sc594-som-ezkit-spl_defconfig +0 -4
@@ -4,9 +4,6 @@ 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
@@ -40,7 +37,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
configs/sc594-som-ezlite-spl_defconfig +0 -4
@@ -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=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
@@ -45,7 +42,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
configs/sc598-som-ezkit-spl_defconfig +0 -4
@@ -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
@@ -63,7 +60,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
configs/sc598-som-ezlite-spl_defconfig +0 -4
@@ -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
@@ -62,7 +59,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
Signature · 1 line
2.34.1
PATCH v5 2/15 mach-sc5xx: Remove update commands from default environment
In reply to a message not in the archiveFrom: Caleb Ethridge <[email protected]>
Remove the update_spi family of commands from the U-boot environment. These commands are not standard in U-boot, and boot media programming has moved to Linux, so the commands can be safely removed.
--- board/adi/sc573-ezkit/sc573-ezkit.env | 2 - board/adi/sc584-ezkit/sc584-ezkit.env | 2 - board/adi/sc589-ezkit/sc589-ezkit.env | 2 - board/adi/sc589-mini/sc589-mini.env | 2 - board/adi/sc594-som-ezkit/sc594-som-ezkit.env | 2 - .../adi/sc594-som-ezlite/sc594-som-ezlite.env | 2 - board/adi/sc598-som-ezkit/sc598-som-ezkit.env | 2 - .../adi/sc598-som-ezlite/sc598-som-ezlite.env | 2 - configs/sc573-ezkit_defconfig | 2 - configs/sc584-ezkit_defconfig | 2 - configs/sc589-ezkit_defconfig | 2 - configs/sc589-mini_defconfig | 2 - include/env/adi/adi_boot.env | 53 ------------------- 13 files changed, 77 deletions(-)
board/adi/sc573-ezkit/sc573-ezkit.env +0 -2
@@ -3,9 +3,7 @@ * (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
board/adi/sc584-ezkit/sc584-ezkit.env +0 -2
@@ -3,9 +3,7 @@ * (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
board/adi/sc589-ezkit/sc589-ezkit.env +0 -2
@@ -3,9 +3,7 @@ * (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
board/adi/sc589-mini/sc589-mini.env +0 -2
@@ -3,9 +3,7 @@ * (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
board/adi/sc594-som-ezkit/sc594-som-ezkit.env +0 -2
@@ -3,9 +3,7 @@ * (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
board/adi/sc594-som-ezlite/sc594-som-ezlite.env +0 -2
@@ -3,9 +3,7 @@ * (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
board/adi/sc598-som-ezkit/sc598-som-ezkit.env +0 -2
@@ -3,9 +3,7 @@ * (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
board/adi/sc598-som-ezlite/sc598-som-ezlite.env +0 -2
@@ -3,9 +3,7 @@ * (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
configs/sc573-ezkit_defconfig +0 -2
@@ -6,9 +6,7 @@ CONFIG_SPL_GPIO=y 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_WATCHDOG_TIMEOUT_MSECS=60000 CONFIG_CGU0_CLKOUTSEL=7
configs/sc584-ezkit_defconfig +0 -2
@@ -10,9 +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_WATCHDOG_TIMEOUT_MSECS=60000 CONFIG_ADI_BUG_EZKHW21=y
configs/sc589-ezkit_defconfig +0 -2
@@ -13,9 +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_WATCHDOG_TIMEOUT_MSECS=60000 CONFIG_ADI_USE_DMC1=y
configs/sc589-mini_defconfig +0 -2
@@ -12,9 +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_WATCHDOG_TIMEOUT_MSECS=60000 CONFIG_ADI_USE_DMC1=y
include/env/adi/adi_boot.env +0 -53
75 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v5 3/15 mach-sc5xx: Update boot commands
In reply to a message not in the archiveFrom: Caleb Ethridge <[email protected]>
Update the default boot commands to match the expected bootargs in Linux and new SPI partitioning scheme.
--- board/adi/sc573-ezkit/sc573-ezkit.env | 2 +- board/adi/sc584-ezkit/sc584-ezkit.env | 2 +- board/adi/sc589-ezkit/sc589-ezkit.env | 2 +- board/adi/sc589-mini/sc589-mini.env | 2 +- board/adi/sc594-som-ezkit/sc594-som-ezkit.env | 2 +- board/adi/sc594-som-ezlite/sc594-som-ezlite.env | 2 +- board/adi/sc598-som-ezkit/sc598-som-ezkit.env | 2 +- board/adi/sc598-som-ezlite/sc598-som-ezlite.env | 2 +- configs/sc573-ezkit_defconfig | 1 - configs/sc584-ezkit_defconfig | 1 - configs/sc589-ezkit_defconfig | 1 - configs/sc589-mini_defconfig | 1 - configs/sc594-som-ezkit-spl_defconfig | 1 + configs/sc594-som-ezlite-spl_defconfig | 1 + configs/sc598-som-ezkit-spl_defconfig | 1 + configs/sc598-som-ezlite-spl_defconfig | 1 + include/env/adi/adi_boot.env | 16 ++++++++++------ 17 files changed, 22 insertions(+), 18 deletions(-)
board/adi/sc573-ezkit/sc573-ezkit.env +1 -1
@@ -3,8 +3,8 @@ * (C) Copyright 2024 - Analog Devices, Inc. */ -adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc573-ezkit.jffs2 +adi_image_offset=0xe0000 loadaddr=CONFIG_SC5XX_LOADADDR #define USE_NFS
board/adi/sc584-ezkit/sc584-ezkit.env +1 -1
@@ -3,8 +3,8 @@ * (C) Copyright 2024 - Analog Devices, Inc. */ -adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc584-ezkit.jffs2 +adi_image_offset=0xe0000 loadaddr=CONFIG_SC5XX_LOADADDR #define USE_NFS
board/adi/sc589-ezkit/sc589-ezkit.env +1 -1
@@ -3,8 +3,8 @@ * (C) Copyright 2024 - Analog Devices, Inc. */ -adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc589-ezkit.jffs2 +adi_image_offset=0xe0000 loadaddr=CONFIG_SC5XX_LOADADDR #define USE_NFS
board/adi/sc589-mini/sc589-mini.env +1 -1
@@ -3,8 +3,8 @@ * (C) Copyright 2024 - Analog Devices, Inc. */ -adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc589-mini.jffs2 +adi_image_offset=0xe0000 loadaddr=CONFIG_SC5XX_LOADADDR #define USE_NFS
board/adi/sc594-som-ezkit/sc594-som-ezkit.env +1 -1
@@ -3,8 +3,8 @@ * (C) Copyright 2024 - Analog Devices, Inc. */ -adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc594-som-ezkit.jffs2 +adi_image_offset=0x110000 loadaddr=CONFIG_SC5XX_LOADADDR #define USE_NFS
board/adi/sc594-som-ezlite/sc594-som-ezlite.env +1 -1
@@ -3,8 +3,8 @@ * (C) Copyright 2024 - Analog Devices, Inc. */ -adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc594-som-ezlite.jffs2 +adi_image_offset=0x110000 loadaddr=CONFIG_SC5XX_LOADADDR #define USE_NFS
board/adi/sc598-som-ezkit/sc598-som-ezkit.env +1 -1
@@ -3,8 +3,8 @@ * (C) Copyright 2024 - Analog Devices, Inc. */ -adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc598-som-ezkit.jffs2 +adi_image_offset=0x110000 loadaddr=CONFIG_SC5XX_LOADADDR #define USE_NFS
board/adi/sc598-som-ezlite/sc598-som-ezlite.env +1 -1
@@ -3,7 +3,7 @@ * (C) Copyright 2024 - Analog Devices, Inc. */ -adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET +adi_image_offset=0x100000 loadaddr=CONFIG_SC5XX_LOADADDR jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc598-som-ezlite.jffs2
configs/sc573-ezkit_defconfig +0 -1
@@ -6,7 +6,6 @@ CONFIG_SPL_GPIO=y CONFIG_DM_GPIO=y CONFIG_SPL_SYS_MALLOC_F_LEN=0x10000 CONFIG_SPL_SERIAL=y -CONFIG_SC5XX_FITIMAGE_OFFSET=0xE0000 CONFIG_SC5XX_LOADADDR=0x83000000 CONFIG_WATCHDOG_TIMEOUT_MSECS=60000 CONFIG_CGU0_CLKOUTSEL=7
configs/sc584-ezkit_defconfig +0 -1
@@ -10,7 +10,6 @@ CONFIG_SPL_STACK=0x200C0000 CONFIG_SPL_BSS_START_ADDR=0x200A0000 CONFIG_SPL_BSS_MAX_SIZE=0x8000 CONFIG_SC58X=y -CONFIG_SC5XX_FITIMAGE_OFFSET=0xE0000 CONFIG_SC5XX_LOADADDR=0x89300000 CONFIG_WATCHDOG_TIMEOUT_MSECS=60000 CONFIG_ADI_BUG_EZKHW21=y
configs/sc589-ezkit_defconfig +0 -1
@@ -13,7 +13,6 @@ CONFIG_SPL_BSS_START_ADDR=0x200A0000 CONFIG_SPL_BSS_MAX_SIZE=0x8000 CONFIG_SC58X=y CONFIG_TARGET_SC589_EZKIT=y -CONFIG_SC5XX_FITIMAGE_OFFSET=0xE0000 CONFIG_SC5XX_LOADADDR=0xC3000000 CONFIG_WATCHDOG_TIMEOUT_MSECS=60000 CONFIG_ADI_USE_DMC1=y
configs/sc589-mini_defconfig +0 -1
@@ -12,7 +12,6 @@ CONFIG_SPL_BSS_START_ADDR=0x200A0000 CONFIG_SPL_BSS_MAX_SIZE=0x8000 CONFIG_SC58X=y CONFIG_TARGET_SC589_MINI=y -CONFIG_SC5XX_FITIMAGE_OFFSET=0xE0000 CONFIG_SC5XX_LOADADDR=0xC3000000 CONFIG_WATCHDOG_TIMEOUT_MSECS=60000 CONFIG_ADI_USE_DMC1=y
configs/sc594-som-ezkit-spl_defconfig +1 -0
@@ -74,3 +74,4 @@ CONFIG_SPL_TIMER=y CONFIG_USB=y CONFIG_USB_DWC2=y CONFIG_USB_STORAGE=y +CONFIG_SC5XX_LOADADDR=0xA2000000
configs/sc594-som-ezlite-spl_defconfig +1 -0
@@ -83,3 +83,4 @@ CONFIG_USB_DWC2=y CONFIG_USB_STORAGE=y # CONFIG_SPL_CRC8 is not set # CONFIG_TOOLS_MKEFICAPSULE is not set +CONFIG_SC5XX_LOADADDR=0xA2000000
configs/sc598-som-ezkit-spl_defconfig +1 -0
@@ -108,3 +108,4 @@ CONFIG_USB_DWC2=y CONFIG_USB_STORAGE=y # CONFIG_SPL_CRC8 is not set # CONFIG_TOOLS_MKEFICAPSULE is not set +CONFIG_SC5XX_LOADADDR=0x90000000
configs/sc598-som-ezlite-spl_defconfig +1 -0
@@ -106,3 +106,4 @@ CONFIG_USB_DWC2=y CONFIG_USB_STORAGE=y # CONFIG_SPL_CRC8 is not set # CONFIG_TOOLS_MKEFICAPSULE is not set +CONFIG_SC5XX_LOADADDR=0x90000000
include/env/adi/adi_boot.env +10 -6
@@ -40,23 +40,27 @@ nfsboot=run init_ethernet; #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} +#if defined(USE_SPI) +spiargs=setenv bootargs root=/dev/mtdblock4 rw rootfstype=jffs2 ${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} ${imagesize}; + sf read ${loadaddr} ${adi_image_offset} 0xF00000; bootm ${loadaddr} #endif #if defined(USE_OSPI) -ospiboot=run spiboot +ospiargs=setenv bootargs root=/dev/mtdblock4 rw rootfstype=jffs2 ${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)
Signature · 1 line
2.34.1
PATCH v5 11/15 configs: sc5xx: Set default bootcmd to SPI boot
In reply to a message not in the archiveFrom: Caleb Ethridge <[email protected]>
Align configs to use the same default bootcommand.
--- configs/sc589-ezkit_defconfig | 2 +- configs/sc589-mini_defconfig | 2 +- configs/sc594-som-ezkit-spl_defconfig | 2 +- configs/sc594-som-ezlite-spl_defconfig | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
configs/sc589-ezkit_defconfig +1 -1
@@ -22,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
configs/sc589-mini_defconfig +1 -1
@@ -20,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
configs/sc594-som-ezkit-spl_defconfig +1 -1
@@ -15,7 +15,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_SPL_I2C=y CONFIG_SPL_DM_SPI_FLASH=y
configs/sc594-som-ezlite-spl_defconfig +1 -1
@@ -18,7 +18,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
Signature · 1 line
2.34.1
Re: [PATCH v5 01/15] configs: sc5xx: Do not store environment in SPI flash
In reply to Caleb EthridgeQuoted 9 lines · Caleb Ethridge
configs: sc5xx: Do not store environment in SPI flash
Remove config option enabling storage of the environment in the SPI flash, to match shift of programming boot media to Linux.
Signed-off-by Caleb Ethridge <[email protected]>configs/sc573-ezkit_defconfig | 4 ----
Quoted 8 lines
configs/sc584-ezkit_defconfig | 5 ----- configs/sc589-ezkit_defconfig | 5 ----- configs/sc589-mini_defconfig | 5 ----- configs/sc594-som-ezkit-spl_defconfig | 4 ---- configs/sc594-som-ezlite-spl_defconfig | 4 ---- configs/sc598-som-ezkit-spl_defconfig | 4 ---- configs/sc598-som-ezlite-spl_defconfig | 4 ---- 8 files changed, 35 deletions(-)
Re: [PATCH v5 02/15] mach-sc5xx: Remove update commands from default environment
In reply to Caleb EthridgeHi Caleb,
Quoted 26 lines · Caleb Ethridge
mach-sc5xx: Remove update commands from default environment
Remove the
update_spifamily of commands from the U-boot environment. These commands are not standard in U-boot, and boot media programming has moved to Linux, so the commands can be safely removed.Signed-off-by Caleb Ethridge <[email protected]>board/adi/sc573-ezkit/sc573-ezkit.env | 2 -
board/adi/sc584-ezkit/sc584-ezkit.env | 2 - board/adi/sc589-ezkit/sc589-ezkit.env | 2 - board/adi/sc589-mini/sc589-mini.env | 2 - board/adi/sc594-som-ezkit/sc594-som-ezkit.env | 2 - board/adi/sc594-som-ezlite/sc594-som-ezlite.env | 2 - board/adi/sc598-som-ezkit/sc598-som-ezkit.env | 2 - board/adi/sc598-som-ezlite/sc598-som-ezlite.env | 2 - configs/sc573-ezkit_defconfig | 2 - configs/sc584-ezkit_defconfig | 2 - configs/sc589-ezkit_defconfig | 2 - configs/sc589-mini_defconfig | 2 - include/env/adi/adi_boot.env | 53 ------------------------- 13 files changed, 77 deletions(-)
include/env/adi/adi_boot.env line 7
Quoted 9 lines
include/env/adi/adi_boot.env +0
-2@@ -1,9 +1,7 @@ /* * 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 */
The jffs2file bullet should go too, right? - its only consumer is update_spi_rfs, which this patch removes. Also the jffs2file= lines in each board's *.env could be dropped
configs/sc573-ezkit_defconfig CONFIG_SPL_GPIO=y · line 11
Quoted 8 lines
configs/sc573-ezkit_defconfig +0
-2@@ -6,9 +6,7 @@ CONFIG_SPL_GPIO=y 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
The commit message only mentions the update_spi commands, but the patch also strips adi_stage2_offset/adi_rfs_offset/imagefile/init_ethernet from the env and removes CONFIG_SC5XX_UBOOT_OFFSET/CONFIG_SC5XX_ROOTFS_OFFSET from the defconfigs. Please can you expand the message to cover this, or perhaps split the patches.
Note that it should be wrttten as 'U-Boot'
Regards,
Simon
Re: [PATCH v5 03/15] mach-sc5xx: Update boot commands
In reply to Caleb EthridgeHi Caleb,
Quoted 28 lines · Caleb Ethridge
mach-sc5xx: Update boot commands
Update the default boot commands to match the expected bootargs in Linux and new SPI partitioning scheme.
Signed-off-by Caleb Ethridge <[email protected]>board/adi/sc573-ezkit/sc573-ezkit.env | 2 +-
board/adi/sc584-ezkit/sc584-ezkit.env | 2 +- board/adi/sc589-ezkit/sc589-ezkit.env | 2 +- board/adi/sc589-mini/sc589-mini.env | 2 +- board/adi/sc594-som-ezkit/sc594-som-ezkit.env | 2 +- board/adi/sc594-som-ezlite/sc594-som-ezlite.env | 2 +- board/adi/sc598-som-ezkit/sc598-som-ezkit.env | 2 +- board/adi/sc598-som-ezlite/sc598-som-ezlite.env | 2 +- configs/sc573-ezkit_defconfig | 1 - configs/sc584-ezkit_defconfig | 1 - configs/sc589-ezkit_defconfig | 1 - configs/sc589-mini_defconfig | 1 - configs/sc594-som-ezkit-spl_defconfig | 1 + configs/sc594-som-ezlite-spl_defconfig | 1 + configs/sc598-som-ezkit-spl_defconfig | 1 + configs/sc598-som-ezlite-spl_defconfig | 1 + include/env/adi/adi_boot.env | 16 ++++++++++------ 17 files changed, 22 insertions(+), 18 deletions(-)
configs/sc594-som-ezkit-spl_defconfig CONFIG_SPL_TIMER=y · line 77
Quoted 4 lines
configs/sc594-som-ezkit-spl_defconfig +1
-0@@ -74,3 +74,4 @@ CONFIG_SPL_TIMER=y CONFIG_USB=y CONFIG_USB_DWC2=y CONFIG_USB_STORAGE=y +CONFIG_SC5XX_LOADADDR=0xA2000000
Adding CONFIG_SC5XX_LOADADDR to the four sc594/sc598 SPL defconfigs seems like it doesn't relate to "update boot commands" - maybe have its own patch.
include/env/adi/adi_boot.env nfsboot=run init_ethernet; · line 42
Quoted 6 lines
include/env/adi/adi_boot.env +2
-1@@ -40,23 +40,27 @@ nfsboot=run init_ethernet; #if defined(USE_SPI) || defined(USE_OSPI) -spiargs=setenv bootargs root=/dev/mtdblock4 rw rootfstype=jffs2 ${adi_bootargs} +#if defined(USE_SPI) +spiargs=setenv bootargs root=/dev/mtdblock4 rw rootfstype=jffs2 ${adi_bootargs}; setenv sfdev CONFIG_SC_BOOT_SPI_BUS:CONFIG_SC_BOOT_SPI_SSEL
Cramming setenv sfdev onto the end of spiargs makes the variable name confusing - I'm not sure if there is a better way.
include/env/adi/adi_boot.env nfsboot=run init_ethernet; · line 43
Quoted 7 lines
include/env/adi/adi_boot.env +1
-1@@ -40,23 +40,27 @@ nfsboot=run init_ethernet; spiboot=run spiargs; sf probe ${sfdev}; - sf read ${loadaddr} ${adi_image_offset} ${imagesize}; + sf read ${loadaddr} ${adi_image_offset} 0xF00000; bootm ${loadaddr}
Hardcoding 0xf00000 (please use lower case) loses the previous ${imagesize} indirection - please explain in the commit message why a fixed read length is correct for every board if needed. Also the new ospiboot is now a verbatim copy of spiboot with only sfdev differing - previously it was a one-line 'run spiboot'. Don't you want to keep the de-duplication, e.g. by setting sfdev in ospiboot and then 'run spiboot' ?
include/env/adi/adi_boot.env nfsboot=run init_ethernet; · line 42
Quoted 7 lines
include/env/adi/adi_boot.env +2
-2@@ -40,23 +40,27 @@ nfsboot=run init_ethernet; -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;
The shift from mmcblk0p1 to mmcblk0p2 silently changes the on-disk layout assumption - please mention this in the commit message so users updating from older builds know they need to repartition. Same for dropping ${imagefile} in favour of a hardcoded /fitImage path.
Regards,
Simon
Re: [PATCH v5 04/15] mach-sc5xx: Switch from tftp to wget
In reply to Caleb EthridgeHi Caleb,
Quoted 17 lines · Caleb Ethridge
mach-sc5xx: Switch from tftp to wget
Switch the nfsboot and other relevant commands to use wget instead of tftp. This also includes the addition of the httpdstp variable for selecting the wget port.
The default port is set to 8000 instead of the usual 80 to allow for use with an unprivileged web server.
Signed-off-by Caleb Ethridge <[email protected]>
include/env/adi/adi_boot.env| 11 +++++------1 file changed, 5 insertions(+), 6 deletions(-)include/env/adi/adi_boot.env +0
-0@@ -27,15 +28,14 @@ adi_bootargs=EARLY_PRINTK console=ttySC0,CONFIG_BAUDRATE vmalloc=512M /* Boot modes are selectable and should be defined in the board env before including */
include/env/adi/adi_boot.env adi_bootargs=EARLY_PRINTK console=ttySC0,CONFIG_BAUDRATE vmalloc=512M · line 34
Quoted 10 lines
include/env/adi/adi_boot.env +2
-4#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; + wget ${loadaddr} ${serverip}:/fitImage; bootm ${loadaddr}
A few thoughts:
1. Dropping init_ethernet is a behavioural change: there is no longer a dhcp or setenv serverip ${tftpserverip} before the wget. wget will not auto-DHCP, so a user with no static IP will see this fail. Either keep a network-bring-up step or call this out explicitly in the commit message.
2. 'nfsboot= run nfsargs;' has a stray leading space after '=' (same in 'ramboot= wget ...' below). Please drop it.
3. The image path is now hard-coded to /fitImage instead of ${tftp_dir_prefix}${imagefile}. The commit message suggetss this is a pure tftp->wget switch, but it also removes the user-configurable filename/prefix. If that is intentional, please say so; otherwise keep ${imagefile} and let boards override it.
Regards,
Simon
Re: [PATCH v5 05/15] mach-sc5xx: Add USB boot command
In reply to Caleb EthridgeHi Caleb,
Quoted 8 lines · Caleb Ethridge
mach-sc5xx: Add USB boot command
Add the USB boot command to the environments
of the boards that support it.Signed-off-by Caleb Ethridge <[email protected]>board/adi/sc573-ezkit/sc573-ezkit.env | 1 +
Quoted 8 lines
board/adi/sc584-ezkit/sc584-ezkit.env | 1 + board/adi/sc589-ezkit/sc589-ezkit.env | 1 + board/adi/sc589-mini/sc589-mini.env | 1 + board/adi/sc594-som-ezkit/sc594-som-ezkit.env | 1 + board/adi/sc594-som-ezlite/sc594-som-ezlite.env | 1 + board/adi/sc598-som-ezkit/sc598-som-ezkit.env | 1 + include/env/adi/adi_boot.env | 7 +++++++ 8 files changed, 14 insertions(+)
include/env/adi/adi_boot.env ramboot= wget ${loadaddr} ${serverip}:/fitImage; · line 73
Quoted 8 lines
include/env/adi/adi_boot.env +6
-0@@ -68,3 +68,10 @@ ramboot= wget ${loadaddr} ${serverip}:/fitImage; +#if defined(USE_USB) +usbargs=setenv bootargs root=/dev/sda2 rw rootfstype=ext4 rootwait ${adi_bootargs} +usbboot=usb start; + ext4load usb 0:1 ${loadaddr} /fitImage; run usbargs; + bootm ${loadaddr} +#endif
Please split ext4load and run usbargs onto separate lines, to match the style of mmcboot/spiboot/ospiboot above.
Just to check...should the partition for the fitImage match the rootfs convention used by mmcboot (load from p1, root on p2)? You have 'usb 0:1' for the load and sda2 for root, which mirrors the mmc case, so I think this is intentional - but worth confirming a freshly-imaged USB stick is partitioned that way by the build.
Regards,
Simon
Re: [PATCH v5 06/15] mach-sc5xx: Remove preliminary binman support
In reply to Caleb EthridgeQuoted 10 lines · Caleb Ethridge
mach-sc5xx: Remove preliminary binman support
Remove preliminary binman support from all sc5xx ADSP boards. Full support was never added because it was unused.
Signed-off-by Caleb Ethridge <[email protected]>
arch/arm/dts/sc5xx.dtsi| 41 -----------------------------------------arch/arm/mach-sc5xx/Kconfig | 33 --------------------------------- 2 files changed, 74 deletions(-)
Re: [PATCH v5 07/15] dts: sc594: Fix gige-reset line on EZKIT
In reply to Caleb EthridgeQuoted 7 lines · Caleb Ethridge
dts: sc594: Fix gige-reset line on EZKIT
The gige-reset line on the EZKIT was updated for the sc598 but not the sc594. This commit aligns the two .dts files since they are describing the same hardware, the EZKIT carrier board.
Quoted 5 lines
Fixes be79378 ("board: adi: Add support for SC594")Signed-off-by Caleb Ethridge <[email protected]>
arch/arm/dts/sc594-som-ezkit.dts| 2 +-1 file changed, 1 insertion(+), 1 deletion(-)
Re: [PATCH v5 08/15] mach-sc5xx: sc573: Rename EZKIT board to EZLITE
In reply to Caleb EthridgeQuoted 10 lines · Caleb Ethridge
mach-sc5xx: sc573: Rename EZKIT board to EZLITE
Rename the SC573 EZKIT board to EZLITE across the device tree, defconfig, board file, and related Kconfig/Makefile entries to match with release naming. EZKIT was used internally before the official product release.
Signed-off-by Caleb Ethridge <[email protected]>
arch/arm/dts/Makefile| 2 +-
Quoted 11 lines
arch/arm/dts/{sc573-ezkit.dts => sc573-ezlite.dts} | 4 ++--
arch/arm/mach-sc5xx/Kconfig | 8 ++++----
arch/arm/mach-sc5xx/init/dmcinit.c | 2 +-
board/adi/{sc573-ezkit => sc573-ezlite}/Kconfig | 8 ++++----
board/adi/{sc573-ezkit => sc573-ezlite}/Makefile | 2 +-
.../{sc573-ezkit/sc573-ezkit.c => sc573-ezlite/sc573-ezlite.c} | 0
.../sc573-ezkit.env => sc573-ezlite/sc573-ezlite.env} | 0
configs/{sc573-ezkit_defconfig => sc573-ezlite_defconfig} | 2 +-
doc/device-tree-bindings/arm/adi/adi,sc5xx.yaml | 2 +-
include/configs/{sc573-ezkit.h => sc573-ezlite.h} | 4 ++--
11 files changed, 17 insertions(+), 17 deletions(-)Re: [PATCH v5 09/15] mach-sc5xx: Update image load address
In reply to Caleb EthridgeHi Caleb,
Quoted 8 lines · Caleb Ethridge
mach-sc5xx: Update image load address
Update the load address for the image in
each environment to match the updated partitions
in Linux.Signed-off-by Caleb Ethridge <[email protected]>
Quoted 8 lines
board/adi/sc573-ezlite/sc573-ezlite.env | 2 +-
board/adi/sc584-ezkit/sc584-ezkit.env | 2 +- board/adi/sc589-ezkit/sc589-ezkit.env | 2 +- board/adi/sc589-mini/sc589-mini.env | 2 +- board/adi/sc594-som-ezkit/sc594-som-ezkit.env | 2 +- board/adi/sc594-som-ezlite/sc594-som-ezlite.env | 2 +- board/adi/sc598-som-ezkit/sc598-som-ezkit.env | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-)
The commit body would benefit from naming the partition layout this matches (e.g. the Linux MTD partition or the device tree change) so future readers can check the value. As it stands "the updated partitions in Linux" is hard to verify.
Regards,
Simon
Re: [PATCH v5 10/15] mach-sc5xx: Update SPI bootargs for ubifs
In reply to Caleb EthridgeHi Caleb,
Quoted 23 lines · Caleb Ethridge
mach-sc5xx: Update SPI bootargs for ubifs
Update the bootargs used in SPI/OSPI bootmode to reflect change from jffs to ubifs for the SPI's filesystem, and remove the jffs2file variable from the environment as it is now unused.
Signed-off-by Caleb Ethridge <[email protected]>board/adi/sc573-ezlite/sc573-ezlite.env | 1 -
board/adi/sc584-ezkit/sc584-ezkit.env | 1 - board/adi/sc589-ezkit/sc589-ezkit.env | 1 - board/adi/sc589-mini/sc589-mini.env | 1 - board/adi/sc594-som-ezkit/sc594-som-ezkit.env | 1 - board/adi/sc594-som-ezlite/sc594-som-ezlite.env | 1 - board/adi/sc598-som-ezkit/sc598-som-ezkit.env | 1 - board/adi/sc598-som-ezlite/sc598-som-ezlite.env | 1 - include/env/adi/adi_boot.env | 5 ++--- 9 files changed, 2 insertions(+), 11 deletions(-)commit
c83fc4349c728f61e5f4e77913a401bf70e97ae1
Quoted 6 lines
mach-sc5xx: Update SPI bootargs for ubifs
Update the bootargs used in SPI/OSPI bootmode to reflect change from jffs to ubifs for the SPI's filesystem, and remove the jffs2file variable from the environment as it is now unused.
nit: should say "from jffs2 to ubifs"
Regards,
Simon
Re: [PATCH v5 11/15] configs: sc5xx: Set default bootcmd to SPI boot
In reply to Caleb EthridgeHi Caleb,
Quoted 14 lines · Caleb Ethridge
configs: sc5xx: Set default bootcmd to SPI boot
Align configs to use the same default bootcommand.
Signed-off-by Caleb Ethridge <[email protected]>configs/sc589-ezkit_defconfig | 2 +-
configs/sc589-mini_defconfig | 2 +- configs/sc594-som-ezkit-spl_defconfig | 2 +- configs/sc594-som-ezlite-spl_defconfig | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
configs/sc589-ezkit_defconfig CONFIG_FIT=y · line 22
Quoted 2 lines
configs/sc589-ezkit_defconfig +1
-1@@ -22,7 +22,7 @@ CONFIG_FIT=y -CONFIG_BOOTCOMMAND="run ramboot" +CONFIG_BOOTCOMMAND="run spiboot"
The commit message says "Align configs to use the same default bootcommand", but after this patch sc573-ezlite and sc584-ezkit still have CONFIG_BOOTCOMMAND="run ramboot". Both define USE_SPI, so spiboot is available there too. Please update those defconfigs as well, or mention this in the commit message.
Also worth noting the motivation, that with the environment no longer stored in SPI (patch 1) and the new SPI partitioning from patch 3, SPI is now the intended default boot medium.
configs/sc594-som-ezkit-spl_defconfig CONFIG_FIT=y · line 15
Quoted 4 lines
configs/sc594-som-ezkit-spl_defconfig +1
-1@@ -15,7 +15,7 @@ CONFIG_FIT=y -CONFIG_BOOTCOMMAND="run ospiboot" +CONFIG_BOOTCOMMAND="run spiboot"
Just to check - patch 3 keeps a distinct ospiboot target (with its own ospiargs setting sfdev to the OSPI bus/SSEL), so switching the sc594 SOM boards from ospiboot to spiboot now points them at the SPI bus instead of OSPI. Is that intentional on these OSPI-equipped SOMs, or should the bootcmd remain "run ospiboot"? Please spell this out in the commit message.
Regards,
Simon
Re: [PATCH v5 12/15] arm: sc5xx: Remove SC5XX_LOADADDR
In reply to Caleb EthridgeQuoted 25 lines · Caleb Ethridge
arm: sc5xx: Remove
SC5XX_LOADADDRRemove the
SC5XX_LOADADDRKconfigoption, replace its users withCONFIG_SYS_LOAD_ADDR, and update the ADI boot environment to use loadaddr.
SC5XX_LOADADDRwas an ADI-specific duplicate of standard U-Boot load address handling. U-Boot already usesCONFIG_SYS_LOAD_ADDRfor the default load address and loadaddr for boot commands, so keeping separate SC5XX-specific names is redundant.Signed-off-by Ozan Durgut <[email protected]>Signed-off-by Caleb Ethridge <[email protected]>
arch/arm/mach-sc5xx/Kconfig| 6 ------board/adi/sc573-ezlite/sc573-ezlite.env | 3 --- board/adi/sc584-ezkit/sc584-ezkit.env | 3 --- board/adi/sc589-ezkit/sc589-ezkit.env | 3 --- board/adi/sc589-mini/sc589-mini.env | 3 --- board/adi/sc594-som-ezkit/sc594-som-ezkit.env | 3 --- board/adi/sc594-som-ezlite/sc594-som-ezlite.env | 3 --- board/adi/sc598-som-ezkit/sc598-som-ezkit.env | 3 --- board/adi/sc598-som-ezlite/sc598-som-ezlite.env | 2 -- configs/sc573-ezlite_defconfig | 2 +- configs/sc584-ezkit_defconfig | 2 +-
Quoted 8 lines
configs/sc589-ezkit_defconfig | 2 +- configs/sc589-mini_defconfig | 2 +- configs/sc594-som-ezkit-spl_defconfig | 2 +- configs/sc594-som-ezlite-spl_defconfig | 2 +- configs/sc598-som-ezkit-spl_defconfig | 2 +- configs/sc598-som-ezlite-spl_defconfig | 2 +- include/env/adi/adi_boot.env | 24 +++++++++++------------- 18 files changed, 19 insertions(+), 50 deletions(-)
Re: [PATCH v5 13/15] arm: sc5xx: add missing boot env selectors
In reply to Caleb EthridgeQuoted 11 lines · Caleb Ethridge
arm: sc5xx: add missing boot env selectors
Define the boot options for SC598 SOM EZ-LITE so the shared ADI boot environment includes the expected boot commands for this board.
SC598 SOM EZ-LITE board environment utilizes the shared ADI boot environment, but it does not define any of the USE_* boot mode selectors. Without those selectors, the shared env does not generate the board boot commands such as spiboot. This leaves the default bootcmd=run spiboot without a matching environment command and breaks autoboot.
Quoted 5 lines
Fixes c9e893d ("board: adi: Add support for SC598")Signed-off-by Ozan Durgut <[email protected]>board/adi/sc598-som-ezlite/sc598-som-ezlite.env | 5 +++++
1 file changed, 5 insertions(+)
Re: [PATCH v5 14/15] arm: sc5xx: Add fdt_addr_r, kernel_addr_r, and ramdisk_addr_r
In reply to Caleb EthridgeHi Caleb,
Quoted 21 lines · Caleb Ethridge
arm: sc5xx: Add
fdt_addr_r,kernel_addr_r, andramdisk_addr_rAdd
fdt_addr_r,kernel_addr_r, andramdisk_addr_rto the SC5xx boards. These variables are currently unused in the environment but will be used in the future once support for booti commands is added to the SC5xx boards.Signed-off-by Caleb Ethridge <[email protected]>board/adi/sc573-ezlite/sc573-ezlite.env | 4 ++++
board/adi/sc584-ezkit/sc584-ezkit.env | 4 ++++ board/adi/sc589-ezkit/sc589-ezkit.env | 4 ++++ board/adi/sc589-mini/sc589-mini.env | 4 ++++ board/adi/sc594-som-ezkit/sc594-som-ezkit.env | 4 ++++ board/adi/sc594-som-ezlite/sc594-som-ezlite.env | 4 ++++ board/adi/sc598-som-ezkit/sc598-som-ezkit.env | 4 ++++ board/adi/sc598-som-ezlite/sc598-som-ezlite.env | 4 ++++ 8 files changed, 32 insertions(+)
board/adi/sc573-ezlite/sc573-ezlite.env line 5
Quoted 3 lines
board/adi/sc573-ezlite/sc573-ezlite.env +3
-0@@ -3,6 +3,10 @@ +fdt_addr_r=CONFIG_SYS_LOAD_ADDR +kernel_addr_r=0x84008000 +ramdisk_addr_r=0x85000000
fdt_addr_r resolves to the same address as loadaddr (which also defaults to CONFIG_SYS_LOAD_ADDR and is what the existing FIT-based boot scripts in adi_boot.env load to). When booti support lands, loading a kernel image to ${loadaddr} and an FDT to ${fdt_addr_r} would overwrite each other. How about picking a distinct value now so the future booti patch doesn't have to touch every board file again?
board/adi/sc584-ezkit/sc584-ezkit.env line 5
Quoted 5 lines
board/adi/sc584-ezkit/sc584-ezkit.env +3
-0@@ -3,6 +3,10 @@ +fdt_addr_r=CONFIG_SYS_LOAD_ADDR +kernel_addr_r=0x8A308000 +ramdisk_addr_r=0x8A800000
Please use lower-case hex. The gap between kernel_addr_r and ramdisk_addr_r here is only 0x4f8000 (~5 MiB), which is tight for a typical ARM kernel. The other 32-bit boards in this patch leave ~16 MiB. Is that intentional?
Regards,
Simon
Quoted 9 lines · Caleb Ethridge
mach-sc5xx: Remove unused image offset
KconfigoptionsRemove
SC5XX_UBOOT_SPL_OFFSET,SC5XX_UBOOT_OFFSET,SC5XX_FITIMAGE_OFFSETandSC5XX_ROOTFS_OFFSETas they are no longer needed in theKconfig.Signed-off-by Caleb Ethridge <[email protected]>
arch/arm/mach-sc5xx/Kconfig| 24 ------------------------1 file changed, 24 deletions(-)
Re: [PATCH v5 03/15] mach-sc5xx: Update boot commands
In reply to Simon GlassHi Simon,
Quoted 3 lines
Adding
CONFIG_SC5XX_LOADADDRto the four sc594/sc598 SPL defconfigs seems like it doesn't relate to "update boot commands" - maybe have its own patch.
I have moved these changes to their own commit, it will be reflected along with the other commit changes in the next version of the patch series.
Quoted 2 lines
Don't you want to keep the de-duplication, e.g. by setting sfdev in ospiboot and then 'run spiboot' ?
I would prefer to keep them separate, we have kept them separate in our older versions of our U-boot fork as well. De-duplication is good but at this point with new boards in the sc5xx family being developed and released, I believe keeping the flexibility to easily change either of these commands without affecting the other is better.
Thanks,
Caleb Ethridge
Re: [PATCH v5 05/15] mach-sc5xx: Add USB boot command
In reply to Simon GlassHi Simon,
Quoted 2 lines
Just to check...should the partition for the fitImage match the rootfs convention used by mmcboot (load from p1, root on p2)?
That is correct, the USB and eMMC have the same partition layout.
Thanks,
Caleb Ethridge
Re: [PATCH v5 05/15] mach-sc5xx: Add USB boot command
In reply to Simon GlassHi Simon,
Quoted 2 lines
Just to check...should the partition for the fitImage match the rootfs convention used by mmcboot (load from p1, root on p2)?
That is correct, the USB and eMMC have the same partition layout.
Thanks,
Caleb Ethridge
Re: [PATCH v5 14/15] arm: sc5xx: Add fdt_addr_r, kernel_addr_r, and ramdisk_addr_r
In reply to Simon GlassHi Simon,
Quoted 2 lines
The other 32-bit boards in this patch leave ~16
MiB. Is that intentional?
No, this looks to be a typo in the ramdisk_addr_r, all of the boards allocate the same space for the kernel image in the load. This will be fixed in the next revision.
Quoted 2 lines
How about picking a distinct value now so
the future booti patch doesn't have to touch every board file again?
I'm not sure I follow your meaning here? Ultimately when booting a user would choose to either use the fitImage with bootm or the booti approach with everything loaded individually, and there is the potential that once booti support is added we will deprecate and completely replace the bootm commands with booti versions.
Also, currently when we build the fitImage, we place the ramdisk and kernel offset in the fitImage so that when loaded to CONFIG_SYS_LOAD_ADDR, they would appear at the addresses from the environment for the ramdisk and kernel. So if you were to load the fdt, kernel and ramdisk to these addresses, then create a fitImage with our build system with those same images and load it at CONFIG_SYS_LOAD_ADDR, nothing in the RAM would change.
Does this make sense? It would not ultimately matter if you loaded the fitImage or the pieces individually, as they would be loaded to the same locations in memory.
Thanks,
Caleb Ethridge
Re: [PATCH v5 14/15] arm: sc5xx: Add fdt_addr_r, kernel_addr_r, and ramdisk_addr_r
Hi Caleb,
Quoted 27 lines · Caleb Ethridge
Hi Simon,
Quoted 2 lines
The other 32-bit boards in this patch leave ~16
MiB. Is that intentional?No, this looks to be a typo in the
ramdisk_addr_r, all of the boards allocate the same space for the kernel image in the load. This will be fixed in the next revision.Quoted 2 lines
How about picking a distinct value now so
the future booti patch doesn't have to touch every board file again?I'm not sure I follow your meaning here? Ultimately when booting a user would choose to either use the fitImage with bootm or the booti approach with everything loaded individually, and there is the potential that once booti support is added we will deprecate and completely replace the bootm commands with booti versions.
Also, currently when we build the fitImage, we place the ramdisk and kernel offset in the fitImage so that when loaded to
CONFIG_SYS_LOAD_ADDR, they would appear at the addresses from the environment for the ramdisk and kernel. So if you were to load the fdt, kernel and ramdisk to these addresses, then create a fitImage with our build system with those same images and load it atCONFIG_SYS_LOAD_ADDR, nothing in the RAM would change.
Quoted 2 lines
Does this make sense? It would not ultimately matter if you loaded the fitImage or the pieces individually, as they would be loaded to the same locations in memory.
Ah yes that makes sense, thanks.
Regards,
Simon