Convert CONFIG_BOARD_SIZE_LIMIT to Kconfig
Subsystems (15)
PATCH 1/25 Convert CONFIG_BOARD_SIZE_LIMIT to Kconfig
This converts the following to Kconfig:
CONFIG_BOARD_SIZE_LIMIT
To do this, introduce CONFIG_HAS_BOARD_SIZE_LIMIT.
--- Kconfig | 17 +++++++++++++++++ README | 5 ----- configs/bk4r1_defconfig | 2 ++ configs/colibri_pxa270_defconfig | 2 ++ configs/colibri_vf_defconfig | 2 ++ configs/ea-lpc3250devkitv2_defconfig | 2 ++ configs/gardena-smart-gateway-mt7688_defconfig | 2 ++ configs/guruplug_defconfig | 2 ++ configs/linkit-smart-7688_defconfig | 2 ++ configs/mx51evk_defconfig | 2 ++ configs/mx53loco_defconfig | 2 ++ configs/mx7ulp_com_defconfig | 2 ++ configs/openrd_base_defconfig | 2 ++ configs/openrd_client_defconfig | 2 ++ configs/openrd_ultimate_defconfig | 2 ++ configs/pcm052_defconfig | 2 ++ configs/pico-dwarf-imx6ul_defconfig | 2 ++ configs/pico-dwarf-imx7d_defconfig | 2 ++ configs/pico-hobbit-imx6ul_defconfig | 2 ++ configs/pico-hobbit-imx7d_defconfig | 2 ++ configs/pico-imx6_defconfig | 2 ++ configs/pico-imx6ul_defconfig | 2 ++ configs/pico-imx7d_bl33_defconfig | 2 ++ configs/pico-imx7d_defconfig | 2 ++ configs/pico-nymph-imx7d_defconfig | 2 ++ configs/pico-pi-imx6ul_defconfig | 2 ++ configs/pico-pi-imx7d_defconfig | 2 ++ configs/sheevaplug_defconfig | 2 ++ configs/tbs2910_defconfig | 2 ++ configs/vf610twr_defconfig | 2 ++ configs/vf610twr_nand_defconfig | 2 ++ configs/warp7_bl33_defconfig | 2 ++ configs/warp7_defconfig | 2 ++ include/configs/bk4r1.h | 3 --- include/configs/colibri_pxa270.h | 2 -- include/configs/colibri_vf.h | 3 --- include/configs/ea-lpc3250devkitv2.h | 5 ----- include/configs/gardena-smart-gateway-mt7688.h | 6 ------ include/configs/guruplug.h | 5 ----- include/configs/linkit-smart-7688.h | 6 ------ include/configs/mx51evk.h | 13 ------------- include/configs/mx53loco.h | 12 ------------ include/configs/mx7ulp_com.h | 10 ---------- include/configs/openrd.h | 5 ----- include/configs/pcm052.h | 3 --- include/configs/pico-imx6.h | 12 ------------ include/configs/pico-imx6ul.h | 11 ----------- include/configs/pico-imx7d.h | 10 ---------- include/configs/rcar-gen3-common.h | 3 --- include/configs/sheevaplug.h | 5 ----- include/configs/sunxi-common.h | 9 --------- include/configs/tbs2910.h | 2 -- include/configs/vf610twr.h | 3 --- include/configs/warp7.h | 13 ------------- 54 files changed, 79 insertions(+), 146 deletions(-)
Kconfig +17 -0
@@ -395,6 +395,23 @@ config BUILD_TARGET special image will be automatically built upon calling make / buildman. +config HAS_BOARD_SIZE_LIMIT + bool "Define a maximum size for the U-Boot image" + default y if RCAR_GEN3 + help + In some cases, we need to enforce a hard limit on how big the U-Boot + image itself can be. + +config BOARD_SIZE_LIMIT + int "Maximum size of the U-Boot image in bytes" + default 1048576 if RCAR_GEN3 + depends on HAS_BOARD_SIZE_LIMIT + help + Maximum size of the U-Boot image. When defined, the build system + checks that the actual size does not exceed it. This does not + include SPL nor TPL, on platforms that use that functionality, they + have a separate option to restict size. + config SYS_CUSTOM_LDSCRIPT bool "Use a custom location for the U-Boot linker script" help
README +0 -5
@@ -2183,11 +2183,6 @@ use the "saveenv" command to store a valid environment. later, once stdio is running and output goes to the LCD, if present. -- CONFIG_BOARD_SIZE_LIMIT: - Maximum size of the U-Boot image. When defined, the - build system checks that the actual size does not - exceed it. - Low Level (hardware related) configuration options: ---------------------------------------------------
configs/bk4r1_defconfig +2 -0
@@ -17,6 +17,8 @@ CONFIG_ENV_OFFSET_REDUND=0x220000 CONFIG_TARGET_BK4R1=y CONFIG_SYS_MEMTEST_START=0x80010000 CONFIG_SYS_MEMTEST_END=0x87c00000 +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=520192 CONFIG_SYS_LOAD_ADDR=0x82000000 CONFIG_FIT=y CONFIG_BOOTDELAY=3
configs/colibri_pxa270_defconfig +2 -0
@@ -9,6 +9,8 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x40000 CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_ENV_VARS_UBOOT_CONFIG=y +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=262144 CONFIG_SYS_LOAD_ADDR=0xa0000000 CONFIG_TIMESTAMP=y CONFIG_SYS_MONITOR_BASE=0x00000000
configs/colibri_vf_defconfig +2 -0
@@ -14,6 +14,8 @@ CONFIG_TARGET_COLIBRI_VF=y CONFIG_SYS_MEMTEST_START=0x80010000 CONFIG_SYS_MEMTEST_END=0x87c00000 CONFIG_ENV_VARS_UBOOT_CONFIG=y +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=520192 CONFIG_SYS_LOAD_ADDR=0x80008000 CONFIG_BOOTDELAY=1 CONFIG_USE_BOOTCOMMAND=y
configs/ea-lpc3250devkitv2_defconfig +2 -0
@@ -9,6 +9,8 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_TARGET_EA_LPC3250DEVKITV2=y CONFIG_DEFAULT_DEVICE_TREE="lpc3250-ea3250" CONFIG_DISTRO_DEFAULTS=y +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=1048575 CONFIG_SYS_LOAD_ADDR=0x80100000 # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set # CONFIG_AUTOBOOT is not set
configs/gardena-smart-gateway-mt7688_defconfig +2 -0
@@ -22,6 +22,8 @@ CONFIG_RESTORE_EXCEPTION_VECTOR_BASE=y # CONFIG_MIPS_BOOT_ENV_LEGACY is not set CONFIG_MIPS_BOOT_FDT=y CONFIG_ENV_VARS_UBOOT_CONFIG=y +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=655360 CONFIG_SYS_LOAD_ADDR=0x80100000 CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y
configs/guruplug_defconfig +2 -0
@@ -12,6 +12,8 @@ CONFIG_ENV_OFFSET=0xE0000 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-guruplug-server-plus" CONFIG_IDENT_STRING="\nMarvell-GuruPlug" # CONFIG_SYS_MALLOC_F is not set +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=917504 CONFIG_SYS_LOAD_ADDR=0x800000 CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTCOMMAND=y
configs/linkit-smart-7688_defconfig +2 -0
@@ -19,6 +19,8 @@ CONFIG_MIPS_CACHE_DISABLE=y CONFIG_RESTORE_EXCEPTION_VECTOR_BASE=y # CONFIG_MIPS_BOOT_ENV_LEGACY is not set CONFIG_MIPS_BOOT_FDT=y +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=524288 CONFIG_SYS_LOAD_ADDR=0x80100000 CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y
configs/mx51evk_defconfig +2 -0
@@ -9,6 +9,8 @@ CONFIG_TARGET_MX51EVK=y CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx51-babbage" # CONFIG_CMD_BMODE is not set +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=785408 CONFIG_SYS_LOAD_ADDR=0x92000000 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="mmc dev ${mmcdev}; if mmc rescan; then if run loadbootscript; then run bootscript; else if run loadimage; then run mmcboot; else run netboot; fi; fi; else run netboot; fi"
configs/mx53loco_defconfig +2 -0
@@ -13,6 +13,8 @@ CONFIG_SYS_I2C_MXC_I2C3=y CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx53-qsb" # CONFIG_CMD_BMODE is not set +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=785408 CONFIG_SYS_LOAD_ADDR=0x72000000 CONFIG_SUPPORT_RAW_INITRD=y CONFIG_USE_BOOTCOMMAND=y
configs/mx7ulp_com_defconfig +2 -0
@@ -9,6 +9,8 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx7ulp-com" CONFIG_LDO_ENABLED_MODE=y CONFIG_TARGET_MX7ULP_COM=y +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=785408 CONFIG_SYS_LOAD_ADDR=0x60800000 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="if run loadimage; then run mmcboot; fi"
configs/openrd_base_defconfig +2 -0
@@ -13,6 +13,8 @@ CONFIG_ENV_OFFSET=0x80000 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-openrd-base" CONFIG_IDENT_STRING="\nOpenRD-Base" # CONFIG_SYS_MALLOC_F is not set +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=524288 CONFIG_SYS_LOAD_ADDR=0x800000 CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTCOMMAND=y
configs/openrd_client_defconfig +2 -0
@@ -14,6 +14,8 @@ CONFIG_ENV_OFFSET=0x80000 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-openrd-client" CONFIG_IDENT_STRING="\nOpenRD-Client" # CONFIG_SYS_MALLOC_F is not set +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=524288 CONFIG_SYS_LOAD_ADDR=0x800000 CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTCOMMAND=y
configs/openrd_ultimate_defconfig +2 -0
@@ -14,6 +14,8 @@ CONFIG_ENV_OFFSET=0x80000 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-openrd-ultimate" CONFIG_IDENT_STRING="\nOpenRD-Ultimate" # CONFIG_SYS_MALLOC_F is not set +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=524288 CONFIG_SYS_LOAD_ADDR=0x800000 CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTCOMMAND=y
configs/pcm052_defconfig +2 -0
@@ -13,6 +13,8 @@ CONFIG_ENV_OFFSET_REDUND=0xC0000 CONFIG_TARGET_PCM052=y CONFIG_SYS_MEMTEST_START=0x80010000 CONFIG_SYS_MEMTEST_END=0x87c00000 +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=520192 CONFIG_SYS_LOAD_ADDR=0x82000000 CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTCOMMAND=y
configs/pico-dwarf-imx6ul_defconfig +2 -0
@@ -19,6 +19,8 @@ CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0x88000000 CONFIG_DISTRO_DEFAULTS=y +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=715776 CONFIG_BOOTDELAY=3 CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd" CONFIG_DEFAULT_FDT_FILE="imx6ul-pico-dwarf.dtb"
configs/pico-dwarf-imx7d_defconfig +2 -0
@@ -21,6 +21,8 @@ CONFIG_ARMV7_BOOT_SEC_DEFAULT=y CONFIG_IMX_RDC=y CONFIG_IMX_BOOTAUX=y CONFIG_DISTRO_DEFAULTS=y +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=715776 CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd" CONFIG_DEFAULT_FDT_FILE="imx7d-pico-dwarf.dtb" CONFIG_SPL_I2C=y
configs/pico-hobbit-imx6ul_defconfig +2 -0
@@ -20,6 +20,8 @@ CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0x88000000 CONFIG_DISTRO_DEFAULTS=y +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=715776 CONFIG_BOOTDELAY=3 CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd" CONFIG_DEFAULT_FDT_FILE="imx6ul-pico-hobbit.dtb"
configs/pico-hobbit-imx7d_defconfig +2 -0
@@ -21,6 +21,8 @@ CONFIG_ARMV7_BOOT_SEC_DEFAULT=y CONFIG_IMX_RDC=y CONFIG_IMX_BOOTAUX=y CONFIG_DISTRO_DEFAULTS=y +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=715776 CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd" CONFIG_DEFAULT_FDT_FILE="imx7d-pico-hobbit.dtb" CONFIG_SPL_I2C=y
configs/pico-imx6_defconfig +2 -0
@@ -18,6 +18,8 @@ CONFIG_SPL_SERIAL=y CONFIG_SPL=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_DISTRO_DEFAULTS=y +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=715776 CONFIG_FIT=y CONFIG_SPL_FIT_PRINT=y CONFIG_SPL_LOAD_FIT=y
configs/pico-imx6ul_defconfig +2 -0
@@ -20,6 +20,8 @@ CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0x88000000 CONFIG_DISTRO_DEFAULTS=y +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=715776 CONFIG_BOOTDELAY=3 CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd" CONFIG_DEFAULT_FDT_FILE="ask"
configs/pico-imx7d_bl33_defconfig +2 -0
@@ -19,6 +19,8 @@ CONFIG_SPL=y CONFIG_ARMV7_BOOT_SEC_DEFAULT=y CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0xa0000000 +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=715776 CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y
configs/pico-imx7d_defconfig +2 -0
@@ -21,6 +21,8 @@ CONFIG_ARMV7_BOOT_SEC_DEFAULT=y CONFIG_IMX_RDC=y CONFIG_IMX_BOOTAUX=y CONFIG_DISTRO_DEFAULTS=y +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=715776 CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd" CONFIG_DEFAULT_FDT_FILE="ask" CONFIG_SPL_I2C=y
configs/pico-nymph-imx7d_defconfig +2 -0
@@ -21,6 +21,8 @@ CONFIG_ARMV7_BOOT_SEC_DEFAULT=y CONFIG_IMX_RDC=y CONFIG_IMX_BOOTAUX=y CONFIG_DISTRO_DEFAULTS=y +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=715776 CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd" CONFIG_DEFAULT_FDT_FILE="imx7d-pico-dwarf.dtb" CONFIG_SPL_I2C=y
configs/pico-pi-imx6ul_defconfig +2 -0
@@ -20,6 +20,8 @@ CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0x88000000 CONFIG_DISTRO_DEFAULTS=y +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=715776 CONFIG_BOOTDELAY=3 CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd" CONFIG_DEFAULT_FDT_FILE="imx6ul-pico-pi.dtb"
configs/pico-pi-imx7d_defconfig +2 -0
@@ -21,6 +21,8 @@ CONFIG_ARMV7_BOOT_SEC_DEFAULT=y CONFIG_IMX_RDC=y CONFIG_IMX_BOOTAUX=y CONFIG_DISTRO_DEFAULTS=y +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=715776 CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd" CONFIG_DEFAULT_FDT_FILE="imx7d-pico-pi.dtb" CONFIG_SPL_I2C=y
configs/sheevaplug_defconfig +2 -0
@@ -13,6 +13,8 @@ CONFIG_ENV_OFFSET=0x80000 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-sheevaplug" CONFIG_IDENT_STRING="\nMarvell-Sheevaplug" # CONFIG_SYS_MALLOC_F is not set +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=524288 CONFIG_SYS_LOAD_ADDR=0x800000 CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTCOMMAND=y
configs/tbs2910_defconfig +2 -0
@@ -15,6 +15,8 @@ CONFIG_AHCI=y CONFIG_SYS_MEMTEST_START=0x10000000 CONFIG_SYS_MEMTEST_END=0x2f400000 CONFIG_LTO=y +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=392192 CONFIG_SUPPORT_RAW_INITRD=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTCOMMAND=y
configs/vf610twr_defconfig +2 -0
@@ -13,6 +13,8 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="vf610-twr" CONFIG_SYS_MEMTEST_START=0x80010000 CONFIG_SYS_MEMTEST_END=0x87c00000 +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=520192 CONFIG_SYS_LOAD_ADDR=0x82000000 CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTCOMMAND=y
configs/vf610twr_nand_defconfig +2 -0
@@ -13,6 +13,8 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="vf610-twr" CONFIG_SYS_MEMTEST_START=0x80010000 CONFIG_SYS_MEMTEST_END=0x87c00000 +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=520192 CONFIG_SYS_LOAD_ADDR=0x82000000 CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTCOMMAND=y
configs/warp7_bl33_defconfig +2 -0
@@ -10,6 +10,8 @@ CONFIG_ARMV7_BOOT_SEC_DEFAULT=y CONFIG_IMX_HAB=y CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0xa0000000 +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=785408 CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y
configs/warp7_defconfig +2 -0
@@ -15,6 +15,8 @@ CONFIG_IMX_BOOTAUX=y CONFIG_IMX_HAB=y CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0xa0000000 +CONFIG_HAS_BOARD_SIZE_LIMIT=y +CONFIG_BOARD_SIZE_LIMIT=785408 CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_USE_BOOTCOMMAND=y
include/configs/bk4r1.h +0 -3
@@ -62,9 +62,6 @@#define CONFIG_SYS_FSL_QSPI_LE #endif -/* We boot from the gfxRAM area of the OCRAM. */ -#define CONFIG_BOARD_SIZE_LIMIT 520192 -/* boot command, including the target-defined one if any */ /* Extra env settings (including the target-defined ones if any) */
include/configs/colibri_pxa270.h +0 -2
@@ -12,8 +12,6 @@/* * High Level Board Configuration Options */ -/* Avoid overwriting factory configuration block */ -#define CONFIG_BOARD_SIZE_LIMIT 0x40000/* * Environment settings
include/configs/colibri_vf.h +0 -3
@@ -23,9 +23,6 @@#define CONFIG_FDTADDR 0x84000000 -/* We boot from the gfxRAM area of the OCRAM. */ -#define CONFIG_BOARD_SIZE_LIMIT 520192 -#define MEM_LAYOUT_ENV_SETTINGS \ "bootm_size=0x10000000\0" \ "fdt_addr_r=0x82000000\0" \
include/configs/ea-lpc3250devkitv2.h +0 -5
@@ -10,11 +10,6 @@#include <linux/sizes.h> #include <asm/arch/cpu.h> -/* -* SoC and board defines -*/ -#define CONFIG_BOARD_SIZE_LIMIT 0x000fffff/* maximum allowable size for full U-Boot binary */ -/* * RAM */
include/configs/gardena-smart-gateway-mt7688.h +0 -6
@@ -46,10 +46,4 @@/* Environment settings */ -/* -* Environment is right behind U-Boot in flash. Make sure U-Boot -* doesn't grow into the environment area. -*/ -#define CONFIG_BOARD_SIZE_LIMIT CONFIG_ENV_OFFSET -#endif /* __CONFIG_GARDENA_SMART_GATEWAY_H */
include/configs/guruplug.h +0 -5
@@ -18,11 +18,6 @@* max 4k env size is enough, but in case of nand * it has to be rounded to sector size */ -/* -* Environment is right behind U-Boot in flash. Make sure U-Boot -* doesn't grow into the environment area. -*/ -#define CONFIG_BOARD_SIZE_LIMIT CONFIG_ENV_OFFSET/* * Default environment variables
include/configs/linkit-smart-7688.h +0 -6
@@ -47,10 +47,4 @@/* Environment settings */ -/* -* Environment is right behind U-Boot in flash. Make sure U-Boot -* doesn't grow into the environment area. -*/ -#define CONFIG_BOARD_SIZE_LIMIT CONFIG_ENV_OFFSET -#endif /* __CONFIG_LINKIT_SMART_7688_H */
include/configs/mx51evk.h +0 -13
@@ -130,17 +130,4 @@* environment organization */ -/* -* Environment starts at CONFIG_ENV_OFFSET=0xC0000 = 768k = 768 * 1024 = 786432 -* -* Detect overlap between U-Boot image and environment area in build-time -* -* CONFIG_BOARD_SIZE_LIMIT = CONFIG_ENV_OFFSET - u-boot.imx offset -* CONFIG_BOARD_SIZE_LIMIT = 768k - 1k = 767k = 785408 -* -* Currently CONFIG_BOARD_SIZE_LIMIT does not handle expressions, so -* write the direct value here -*/ -#define CONFIG_BOARD_SIZE_LIMIT 785408 -#endif
include/configs/mx53loco.h +0 -12
@@ -106,18 +106,6 @@#define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -/* Environment starts at 768k = 768 * 1024 = 786432 */ -/* -* Detect overlap between U-Boot image and environment area in build-time -* -* CONFIG_BOARD_SIZE_LIMIT = CONFIG_ENV_OFFSET - u-boot.imx offset -* CONFIG_BOARD_SIZE_LIMIT = 768k - 1k = 767k = 785408 -* -* Currently CONFIG_BOARD_SIZE_LIMIT does not handle expressions, so -* write the direct value here -*/ -#define CONFIG_BOARD_SIZE_LIMIT 785408 -#ifdef CONFIG_CMD_SATA #define CONFIG_DWC_AHSATA_PORT_ID 0#define CONFIG_DWC_AHSATA_BASE_ADDR SATA_BASE_ADDR
include/configs/mx7ulp_com.h +0 -10
@@ -17,16 +17,6 @@#define CONFIG_SYS_BOOTM_LEN 0x1000000 -/* -* Detect overlap between U-Boot image and environment area in build-time -* -* CONFIG_BOARD_SIZE_LIMIT = CONFIG_ENV_OFFSET - u-boot-dtb.imx offset -* CONFIG_BOARD_SIZE_LIMIT = 768k - 1k = 767k = 785408 -* -* Currently CONFIG_BOARD_SIZE_LIMIT does not handle expressions, so -* write the direct value here -*/ -#define CONFIG_BOARD_SIZE_LIMIT 785408#define CONFIG_MMCROOT "/dev/mmcblk0p2"/* Using ULP WDOG for reset */
include/configs/openrd.h +0 -5
@@ -22,11 +22,6 @@* max 4k env size is enough, but in case of nand * it has to be rounded to sector size */ -/* -* Environment is right behind U-Boot in flash. Make sure U-Boot -* doesn't grow into the environment area. -*/ -#define CONFIG_BOARD_SIZE_LIMIT CONFIG_ENV_OFFSET/* * Default environment variables
include/configs/pcm052.h +0 -3
@@ -16,9 +16,6 @@#define CONFIG_SYS_MAX_NAND_DEVICE 1 -/* We boot from the gfxRAM area of the OCRAM. */ -#define CONFIG_BOARD_SIZE_LIMIT 520192 -/* if no target-specific extra environment settings were defined by the target, define an empty one */ #ifndef PCM052_EXTRA_ENV_SETTINGS
include/configs/pico-imx6.h +0 -12
@@ -116,18 +116,6 @@/* Environment organization */ -/* Environment starts at 768k = 768 * 1024 = 786432 */ -/* -* Detect overlap between U-Boot image and environment area in build-time -* -* CONFIG_BOARD_SIZE_LIMIT = CONFIG_ENV_OFFSET - u-boot.img offset -* CONFIG_BOARD_SIZE_LIMIT = 768k - 69k = 699k = 715776 -* -* Currently CONFIG_BOARD_SIZE_LIMIT does not handle expressions, so -* write the direct value here -*/ -#define CONFIG_BOARD_SIZE_LIMIT 715776 -/* Ethernet Configuration */ #define IMX_FEC_BASE ENET_BASE_ADDR#define CONFIG_FEC_MXC_PHYADDR 1
include/configs/pico-imx6ul.h +0 -11
@@ -116,17 +116,6 @@ (CONFIG_SYS_INIT_RAM_ADDR +CONFIG_SYS_INIT_SP_OFFSET ) /* environment organization */ -/* Environment starts at 768k = 768 * 1024 = 786432 */ -/* -* Detect overlap between U-Boot image and environment area in build-time -* -* CONFIG_BOARD_SIZE_LIMIT = CONFIG_ENV_OFFSET - u-boot.img offset -* CONFIG_BOARD_SIZE_LIMIT = 768k - 69k = 699k = 715776 -* -* Currently CONFIG_BOARD_SIZE_LIMIT does not handle expressions, so -* write the direct value here - */ -#define CONFIG_BOARD_SIZE_LIMIT 715776#ifdef CONFIG_DM_VIDEO #define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR
include/configs/pico-imx7d.h +0 -10
@@ -122,16 +122,6 @@/* FLASH and environment organization */ /* Environment starts at 768k = 768 * 1024 = 786432 */ -/* -* Detect overlap between U-Boot image and environment area in build-time -* -* CONFIG_BOARD_SIZE_LIMIT = CONFIG_ENV_OFFSET - u-boot.img offset -* CONFIG_BOARD_SIZE_LIMIT = 768k - 69k = 699k = 715776 -* -* Currently CONFIG_BOARD_SIZE_LIMIT does not handle expressions, so -* write the direct value here -*/ -#define CONFIG_BOARD_SIZE_LIMIT 715776#define CONFIG_SYS_FSL_USDHC_NUM 2
include/configs/rcar-gen3-common.h +0 -3
@@ -44,9 +44,6 @@#define CONFIG_SYS_MONITOR_LEN (1 * 1024 * 1024)#define CONFIG_SYS_BOOTM_LEN (64 << 20) -/* The HF/QSPI layout permits up to 1 MiB large bootloader blob */ -#define CONFIG_BOARD_SIZE_LIMIT 1048576 -/* ENV setting */ #define CONFIG_EXTRA_ENV_SETTINGS \
include/configs/sheevaplug.h +0 -5
@@ -18,11 +18,6 @@* max 4k env size is enough, but in case of nand * it has to be rounded to sector size */ -/* -* Environment is right behind U-Boot in flash. Make sure U-Boot -* doesn't grow into the environment area. -*/ -#define CONFIG_BOARD_SIZE_LIMIT CONFIG_ENV_OFFSET/* * Default environment variables
include/configs/sunxi-common.h +0 -9
@@ -98,15 +98,6 @@/* mmc config */ #define CONFIG_MMC_SUNXI_SLOT 0 -#if defined(CONFIG_ENV_IS_IN_MMC ) -/* -* This is actually (CONFIG_ENV_OFFSET - -* (CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)), but the value will be used -* directly in a makefile, without the preprocessor expansion. -*/ -#define CONFIG_BOARD_SIZE_LIMIT 0x7e000 -#endif -#define CONFIG_SYS_MMC_MAX_DEVICE 4/*
include/configs/tbs2910.h +0 -2
@@ -55,8 +55,6 @@#endif /* CONFIG_CMD_USB_MASS_STORAGE */ #endif /* CONFIG_CMD_USB */ -#define CONFIG_BOARD_SIZE_LIMIT 392192/* (CONFIG_ENV_OFFSET - 1024) */ -#define CONFIG_EXTRA_ENV_SETTINGS \ BOOTENV \ "bootargs_mmc1=console=ttymxc0,115200 di0_primary console=tty1\0" \
include/configs/vf610twr.h +0 -3
@@ -29,9 +29,6 @@/* I2C Configs */ #define CONFIG_SYS_SPD_BUS_NUM 0 -/* We boot from the gfxRAM area of the OCRAM. */ -#define CONFIG_BOARD_SIZE_LIMIT 520192 -/* * We do have 128MB of memory on the Vybrid Tower board. Leave the last * 16MB alone to avoid conflicts with Cortex-M4 firmwares running from
include/configs/warp7.h +0 -13
@@ -94,19 +94,6 @@#define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -/* -* Environment starts at CONFIG_ENV_OFFSET= 0xC0000 = 768k = 768*1024 = 786432 -* -* Detect overlap between U-Boot image and environment area in build-time -* -* CONFIG_BOARD_SIZE_LIMIT = CONFIG_ENV_OFFSET - u-boot.imx offset -* CONFIG_BOARD_SIZE_LIMIT = 768k - 1k = 767k = 785408 -* -* Currently CONFIG_BOARD_SIZE_LIMIT does not handle expressions, so -* write the direct value here -*/ -#define CONFIG_BOARD_SIZE_LIMIT 785408 -/* environment organization */ #define CONFIG_SYS_FSL_USDHC_NUM 1
Signature · 1 line
2.25.1
PATCH 2/25 mvebu: Move BOOTROM_ERR_REG out of CONFIG namespace
This register is referenced in one location and does not seem configurable, so remove it from CONFIG namespace.
--- arch/arm/mach-mvebu/cpu.c | 2 +- arch/arm/mach-mvebu/include/mach/soc.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-mvebu/cpu.c +1 -1
@@ -91,7 +91,7 @@ u32 get_boot_device(void)* be done, via the bootrom error register. Here the * MSB marks if the UART mode is active. */ - val =readl (CONFIG_BOOTROM_ERR_REG ); + val =readl (BOOTROM_ERR_REG ); boot_device = (val &BOOTROM_ERR_MODE_MASK ) >>BOOTROM_ERR_MODE_OFFS ;debug ("BOOTROM_REG=0x%08x boot_device=0x%x\n" , val, boot_device);if (boot_device ==BOOTROM_ERR_MODE_UART )
arch/arm/mach-mvebu/include/mach/soc.h +1 -1
@@ -125,7 +125,7 @@#define COMPHY_REFCLK_ALIGNMENT (MVEBU_REGISTER(0x182f8))/* BootROM error register (also includes some status infos) */ -#define CONFIG_BOOTROM_ERR_REG (MVEBU_REGISTER(0x182d0)) +#define BOOTROM_ERR_REG (MVEBU_REGISTER(0x182d0))#define BOOTROM_ERR_MODE_OFFS 28#define BOOTROM_ERR_MODE_MASK (0xf << BOOTROM_ERR_MODE_OFFS)#define BOOTROM_ERR_MODE_UART 0x6
Signature · 1 line
2.25.1
Re: [PATCH 02/25] mvebu: Move BOOTROM_ERR_REG out of CONFIG namespace
Quoted 5 lines · Tom Rini
This register is referenced in one location and does not seem configurable, so remove it from CONFIG namespace.
Cc Stefan Roese <[email protected]>Signed-off-by Tom Rini <[email protected]>
Thanks,
Stefan
Quoted 23 lines
--- arch/arm/mach-mvebu/cpu.c | 2 +- arch/arm/mach-mvebu/include/mach/soc.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)arch/arm/mach-mvebu/cpu.c +1
-1@@ -91,7 +91,7 @@ u32 get_boot_device(void)* be done, via the bootrom error register. Here the * MSB marks if the UART mode is active. */ - val =readl (CONFIG_BOOTROM_ERR_REG ); + val =readl (BOOTROM_ERR_REG ); boot_device = (val &BOOTROM_ERR_MODE_MASK ) >>BOOTROM_ERR_MODE_OFFS ;debug ("BOOTROM_REG=0x%08x boot_device=0x%x\n" , val, boot_device);if (boot_device ==BOOTROM_ERR_MODE_UART )arch/arm/mach-mvebu/include/mach/soc.h +0
-0
arch/arm/mach-mvebu/include/mach/soc.h line 131
Quoted 8 lines
arch/arm/mach-mvebu/include/mach/soc.h +1
-1@@ -125,7 +125,7 @@#define COMPHY_REFCLK_ALIGNMENT (MVEBU_REGISTER(0x182f8))/* BootROM error register (also includes some status infos) */ -#define CONFIG_BOOTROM_ERR_REG (MVEBU_REGISTER(0x182d0)) +#define BOOTROM_ERR_REG (MVEBU_REGISTER(0x182d0))#define BOOTROM_ERR_MODE_OFFS 28#define BOOTROM_ERR_MODE_MASK (0xf << BOOTROM_ERR_MODE_OFFS)#define BOOTROM_ERR_MODE_UART 0x6
Viele Grüße,
Stefan Roese
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]
Re: [PATCH 02/25] mvebu: Move BOOTROM_ERR_REG out of CONFIG namespace
In reply to Tom RiniQuoted 6 lines · Tom Rini
This register is referenced in one location and does not seem configurable, so remove it from CONFIG namespace.
Cc Stefan Roese <[email protected]>Signed-off-by Tom Rini <[email protected]>Reviewed-by Stefan Roese <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH 3/25 tegra: Migrate CI_UDC_HAS_HOSTPC to Kconfig
In reply to Tom RiniThis option is only enabled for CI_UDC and !TEGRA20, so implement it as such in Kconfig directly.
--- arch/arm/mach-tegra/Kconfig | 4 ++++ include/configs/apalis-tk1.h | 1 - include/configs/apalis_t30.h | 1 - include/configs/beaver.h | 1 - include/configs/cei-tk1-som.h | 1 - include/configs/colibri_t20.h | 1 - include/configs/colibri_t30.h | 1 - include/configs/dalmore.h | 1 - include/configs/jetson-tk1.h | 1 - include/configs/nyan-big.h | 1 - include/configs/p2371-0000.h | 1 - include/configs/p2371-2180.h | 1 - include/configs/p2571.h | 1 - include/configs/p3450-0000.h | 1 - include/configs/tegra-common-usb-gadget.h | 18 ------------------ include/configs/venice2.h | 1 - 16 files changed, 4 insertions(+), 32 deletions(-) delete mode 100644 include/configs/tegra-common-usb-gadget.h
arch/arm/mach-tegra/Kconfig +4 -0
@@ -164,6 +164,10 @@ config TEGRA_DISCONNECT_UDC_ON_BOOT USB controller when U-Boot boots to avoid leaving a stale USB device present. +config CI_UDC_HAS_HOSTPC + def_bool y + depends on CI_UDC && !TEGRA20 + config SYS_MALLOC_F_LEN default 0x1800
include/configs/apalis-tk1.h +0 -1
@@ -111,7 +111,6 @@#undef CONFIG_SYS_MAXARGS#define CONFIG_SYS_MAXARGS 32 -#include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" #endif /* __CONFIG_H */
include/configs/apalis_t30.h +0 -1
@@ -49,7 +49,6 @@#define BOARD_EXTRA_ENV_SETTINGS \ UBOOT_UPDATE -#include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" #endif /* __CONFIG_H */
include/configs/beaver.h +0 -1
@@ -24,7 +24,6 @@#define CONFIG_TEGRA_SLINK_CTRLS 6#define CONFIG_SPI_FLASH_SIZE (4 << 20) -#include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" #endif /* __CONFIG_H */
include/configs/cei-tk1-som.h +0 -1
@@ -25,7 +25,6 @@/* SPI */ #define CONFIG_SPI_FLASH_SIZE (4 << 20) -#include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" #endif /* __CONFIG_H */
include/configs/colibri_t20.h +0 -1
@@ -39,7 +39,6 @@#undef CONFIG_SYS_MAXARGS#define CONFIG_SYS_MAXARGS 32 -#include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" #endif /* __CONFIG_H */
include/configs/colibri_t30.h +0 -1
@@ -47,7 +47,6 @@#define BOARD_EXTRA_ENV_SETTINGS \ UBOOT_UPDATE -#include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" #endif /* __CONFIG_H */
include/configs/dalmore.h +0 -1
@@ -22,7 +22,6 @@/* SPI */ #define CONFIG_SPI_FLASH_SIZE (4 << 20) -#include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" #endif /* __CONFIG_H */
include/configs/jetson-tk1.h +0 -1
@@ -23,7 +23,6 @@/* SPI */ #define CONFIG_SPI_FLASH_SIZE (4 << 20) -#include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" #endif /* __CONFIG_H */
include/configs/nyan-big.h +0 -1
@@ -26,7 +26,6 @@/* SPI */ #define CONFIG_SPI_FLASH_SIZE (4 << 20) -#include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" #endif /* __CONFIG_H */
include/configs/p2371-0000.h +0 -1
@@ -22,7 +22,6 @@/* SPI */ #define CONFIG_SPI_FLASH_SIZE (4 << 20) -#include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" #endif /* _P2371_0000_H */
include/configs/p2371-2180.h +0 -1
@@ -22,7 +22,6 @@/* SPI */ #define CONFIG_SPI_FLASH_SIZE (4 << 20) -#include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" /* Crystal is 38.4MHz. clk_m runs at half that rate */
include/configs/p2571.h +0 -1
@@ -22,7 +22,6 @@/* SPI */ #define CONFIG_SPI_FLASH_SIZE (4 << 20) -#include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" #endif /* _P2571_H */
include/configs/p3450-0000.h +0 -1
@@ -33,7 +33,6 @@ "fi\0"/* General networking support */ -#include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" /* Crystal is 38.4MHz. clk_m runs at half that rate */
include/configs/tegra-common-usb-gadget.h deleted +0 -18
@@ -1,18 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* -* (C) Copyright 2014 -* NVIDIA Corporation <www.nvidia.com> -*/ - -#ifndef _TEGRA_COMMON_USB_GADGET_H_ -#define _TEGRA_COMMON_USB_GADGET_H_ - -#ifndef CONFIG_SPL_BUILD -/* USB gadget mode support*/ -#ifndef CONFIG_TEGRA20 -#define CONFIG_CI_UDC_HAS_HOSTPC -#endif -/* DFU protocol */ -#endif - -#endif /* _TEGRA_COMMON_USB_GADGET_H_ */
include/configs/venice2.h +0 -1
@@ -23,7 +23,6 @@/* SPI */ #define CONFIG_SPI_FLASH_SIZE (4 << 20) -#include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" #endif /* __CONFIG_H */
Signature · 1 line
2.25.1
Re: [PATCH 03/25] tegra: Migrate CI_UDC_HAS_HOSTPC to Kconfig
Quoted 5 lines · Tom Rini
This option is only enabled for
CI_UDCand !TEGRA20, so implement it as such inKconfigdirectly.Signed-off-by Tom Rini <[email protected]>
Quoted 230 lines
--- arch/arm/mach-tegra/Kconfig | 4 ++++ include/configs/apalis-tk1.h | 1 - include/configs/apalis_t30.h | 1 - include/configs/beaver.h | 1 - include/configs/cei-tk1-som.h | 1 - include/configs/colibri_t20.h | 1 - include/configs/colibri_t30.h | 1 - include/configs/dalmore.h | 1 - include/configs/jetson-tk1.h | 1 - include/configs/nyan-big.h | 1 - include/configs/p2371-0000.h | 1 - include/configs/p2371-2180.h | 1 - include/configs/p2571.h | 1 - include/configs/p3450-0000.h | 1 - include/configs/tegra-common-usb-gadget.h | 18 ------------------ include/configs/venice2.h | 1 - 16 files changed, 4 insertions(+), 32 deletions(-) delete mode 100644 include/configs/tegra-common-usb-gadget.harch/arm/mach-tegra/Kconfig +4
-0@@ -164,6 +164,10 @@ config TEGRA_DISCONNECT_UDC_ON_BOOT USB controller when U-Boot boots to avoid leaving a stale USB device present. +config CI_UDC_HAS_HOSTPC + def_bool y + depends on CI_UDC && !TEGRA20 + config SYS_MALLOC_F_LEN default 0x1800include/configs/apalis-tk1.h +0
-1@@ -111,7 +111,6 @@#undef CONFIG_SYS_MAXARGS#define CONFIG_SYS_MAXARGS 32 -#include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" #endif /* __CONFIG_H */ include/configs/apalis_t30.h +0
-1@@ -49,7 +49,6 @@#define BOARD_EXTRA_ENV_SETTINGS \ UBOOT_UPDATE -#include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" #endif /* __CONFIG_H */ include/configs/beaver.h +0
-1@@ -24,7 +24,6 @@#define CONFIG_TEGRA_SLINK_CTRLS 6#define CONFIG_SPI_FLASH_SIZE (4 << 20) -#include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" #endif /* __CONFIG_H */ include/configs/cei-tk1-som.h +0
-1@@ -25,7 +25,6 @@/* SPI */ #define CONFIG_SPI_FLASH_SIZE (4 << 20) -#include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" #endif /* __CONFIG_H */ include/configs/colibri_t20.h +0
-1@@ -39,7 +39,6 @@#undef CONFIG_SYS_MAXARGS#define CONFIG_SYS_MAXARGS 32 -#include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" #endif /* __CONFIG_H */ include/configs/colibri_t30.h +0
-1@@ -47,7 +47,6 @@#define BOARD_EXTRA_ENV_SETTINGS \ UBOOT_UPDATE -#include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" #endif /* __CONFIG_H */ include/configs/dalmore.h +0
-1@@ -22,7 +22,6 @@/* SPI */ #define CONFIG_SPI_FLASH_SIZE (4 << 20) -#include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" #endif /* __CONFIG_H */ include/configs/jetson-tk1.h +0
-1@@ -23,7 +23,6 @@/* SPI */ #define CONFIG_SPI_FLASH_SIZE (4 << 20) -#include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" #endif /* __CONFIG_H */ include/configs/nyan-big.h +0
-1@@ -26,7 +26,6 @@/* SPI */ #define CONFIG_SPI_FLASH_SIZE (4 << 20) -#include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" #endif /* __CONFIG_H */ include/configs/p2371-0000.h +0
-1@@ -22,7 +22,6 @@/* SPI */ #define CONFIG_SPI_FLASH_SIZE (4 << 20) -#include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" #endif /* _P2371_0000_H */ include/configs/p2371-2180.h +0
-1@@ -22,7 +22,6 @@/* SPI */ #define CONFIG_SPI_FLASH_SIZE (4 << 20) -#include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" /* Crystal is 38.4MHz. clk_m runs at half that rate */ include/configs/p2571.h +0
-1@@ -22,7 +22,6 @@/* SPI */ #define CONFIG_SPI_FLASH_SIZE (4 << 20) -#include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" #endif /* _P2571_H */ include/configs/p3450-0000.h +0
-1@@ -33,7 +33,6 @@ "fi\0"/* General networking support */ -#include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" /* Crystal is 38.4MHz. clk_m runs at half that rate */ include/configs/tegra-common-usb-gadget.h deleted +0
-18@@ -1,18 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* -* (C) Copyright 2014 -* NVIDIA Corporation <www.nvidia.com> -*/ - -#ifndef _TEGRA_COMMON_USB_GADGET_H_ -#define _TEGRA_COMMON_USB_GADGET_H_ - -#ifndef CONFIG_SPL_BUILD -/* USB gadget mode support*/ -#ifndef CONFIG_TEGRA20 -#define CONFIG_CI_UDC_HAS_HOSTPC -#endif -/* DFU protocol */ -#endif - -#endif /* _TEGRA_COMMON_USB_GADGET_H_ */ include/configs/venice2.h +0
-2@@ -23,7 +23,6 @@/* SPI */ #define CONFIG_SPI_FLASH_SIZE (4 << 20) -#include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" #endif /* __CONFIG_H */ --2.25.1
Re: [PATCH 03/25] tegra: Migrate CI_UDC_HAS_HOSTPC to Kconfig
In reply to Tom RiniQuoted 6 lines · Tom Rini
This option is only enabled for
CI_UDCand !TEGRA20, so implement it as such inKconfigdirectly.Signed-off-by Tom Rini <[email protected]>Reviewed-by Peter Robinson <[email protected]>Tested-by Peter Robinson <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH 4/25 Convert CONFIG_CMDLINE_PS_SUPPORT to Kconfig
In reply to Tom RiniThis converts the following to Kconfig:
CONFIG_CMDLINE_PS_SUPPORT
--- README | 8 -------- cmd/Kconfig | 7 +++++++ configs/socfpga_vining_fpga_defconfig | 1 + include/configs/socfpga_vining_fpga.h | 3 --- 4 files changed, 8 insertions(+), 11 deletions(-)
README +0 -8
@@ -1532,14 +1532,6 @@ The following options need to be configured: of the backslashes before semicolons and special symbols. -- Command Line Editing and History: - CONFIG_CMDLINE_PS_SUPPORT - - Enable support for changing the command prompt string - at run-time. Only static string is supported so far. - The string is obtained from environment variables PS1 - and PS2. - - Default Environment: CONFIG_EXTRA_ENV_SETTINGS
cmd/Kconfig +7 -0
@@ -31,6 +31,13 @@ config CMDLINE_EDITING Enable editing and History functions for interactive command line input operations +config CMDLINE_PS_SUPPORT + bool "Enable support for changing the command prompt string at run-time" + depends on HUSH_PARSER + help + Only static string in the prompt is supported so far. The string is + obtained from environment variables PS1 and PS2. + config AUTO_COMPLETE bool "Enable auto complete using TAB" depends on CMDLINE
configs/socfpga_vining_fpga_defconfig +1 -0
@@ -27,6 +27,7 @@ CONFIG_CLOCKS=y CONFIG_MISC_INIT_R=y CONFIG_SPL_SPI_LOAD=y CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000 +CONFIG_CMDLINE_PS_SUPPORT=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y CONFIG_CMD_EEPROM=y
include/configs/socfpga_vining_fpga.h +0 -3
@@ -186,9 +186,6 @@"fi\0" \"socfpga_legacy_reset_compat=1\0" -/* Support changing the prompt string */ -#define CONFIG_CMDLINE_PS_SUPPORT - /* The rest of the configuration is shared */#include <configs/socfpga_common.h>
Signature · 1 line
2.25.1
Re: [PATCH 04/25] Convert CONFIG_CMDLINE_PS_SUPPORT to Kconfig
Quoted 4 lines · Tom Rini
This converts the following to
Kconfig:
CONFIG_CMDLINE_PS_SUPPORTSigned-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH 5/25 arm: integrator: Migrate platform-specific options and cleanup armcoremodule.h
In reply to Tom RiniThis converts the following to Kconfig:
CONFIG_CM_INIT
CONFIG_CM_REMAP
CONFIG_CM_SPD_DETECT
CONFIG_CM_MULTIPLE_SSRAM
CONFIG_CM_TCRAM
We make the first three of these options be always enabled, as that matches usage. We select the last two based on how they were defined in armcoremodule.h. This also allows us to remove some unused code in board/armltd/integrator/lowlevel_init.S
--- arch/arm/mach-integrator/Kconfig | 19 +++++++++++++ board/armltd/integrator/integrator.c | 1 + board/armltd/integrator/lowlevel_init.S | 7 +---- include/armcoremodule.h | 36 ------------------------- include/configs/integrator-common.h | 27 ------------------- include/configs/integratorap.h | 9 ------- 6 files changed, 21 insertions(+), 78 deletions(-)
arch/arm/mach-integrator/Kconfig +19 -0
@@ -32,14 +32,18 @@ config CM920T config CM926EJ_S bool "Core Module for ARM926EJ-STM" select CPU_ARM926EJS + select CM_TCRAM config CM946ES bool "Core Module for ARM946E-STM" select CPU_ARM946ES + select CM_MULTIPLE_SSRAM + select CM_TCRAM config CM1136 bool "Core Module for ARM1136JF-STM" select CPU_ARM1136 + select CM_TCRAM endchoice
@@ -56,4 +60,19 @@ config SYS_CONFIG_NAME config SYS_MALLOC_F_LEN default 0x2000 +config CM_INIT + def_bool y + +config CM_REMAP + def_bool y + +config CM_SPD_DETECT + def_bool y + +config CM_MULTIPLE_SSRAM + bool + +config CM_TCRAM + bool + endmenu
board/armltd/integrator/integrator.c +1 -0
@@ -24,6 +24,7 @@#include <init.h> #include <net.h> #include <netdev.h> +#include <armcoremodule.h> #include <asm/global_data.h> #include <asm/io.h> #include <dm/platform_data/serial_pl01x.h>
board/armltd/integrator/lowlevel_init.S +1 -6
@@ -7,6 +7,7 @@ */ #include <config.h> +#include <armcoremodule.h> /* Reset using CM control register */ .global reset_cpu
@@ -41,10 +42,6 @@ lowlevel_init: /* set the desired CM specific value */ mov r2,#CMMASK_LOWVEC /* Vectors at 0x00000000 for all */ -#if defined (CONFIG_CM10200E) || defined (CONFIG_CM10220E) - orr r2,r2,#CMMASK_INIT_102 -#else - #if !defined (CONFIG_CM920T) && !defined (CONFIG_CM920T_ETM) && \ !defined (CONFIG_CM940T)
@@ -69,8 +66,6 @@ lowlevel_init: #endif /* CMxx6 code */ -#endif /* ARM102xxE value */ - /* read CM_INIT */ mov r0, #CM_BASE ldr r1, [r0, #OS_INIT]
include/armcoremodule.h +0 -36
@@ -34,42 +34,6 @@/* CM926EJ-S */ /* CM1136-EJ-S */ -#if defined (CONFIG_CM10200E ) || defined (CONFIG_CM10220E ) -#define CMMASK_INIT_102 0x00000300/* see CM102xx ref manual */ -/* - PLL test clock bypassed */ -/* - bus clock ratio 2 */ -/* - little endian */ -/* - vectors at zero */ -#endif /* CM1022xx */ - -/* Determine CM characteristics */ - -#undef CONFIG_CM_MULTIPLE_SSRAM -#undef CONFIG_CM_SPD_DETECT -#undef CONFIG_CM_REMAP -#undef CONFIG_CM_INIT -#undef CONFIG_CM_TCRAM - -#if defined (CONFIG_CM946E_S ) || defined (CONFIG_CM966E_S ) -#define CONFIG_CM_MULTIPLE_SSRAM /* CM has multiple SSRAM mapping */ -#endif - -/* Excalibur core module has reduced functionality */ -#ifndef CONFIG_CM922T_XA10 -#define CONFIG_CM_SPD_DETECT /* CM supports SPD query */ -#define OS_SPD 0x00000100/* Address of SPD data */ -#define CONFIG_CM_REMAP /* CM supports remapping */ -#define CONFIG_CM_INIT /* CM has initialization reg */ -#endif /* NOT EXCALIBUR */ - -#if defined(CONFIG_CM926EJ_S ) || defined (CONFIG_CM946E_S ) || \ - defined(CONFIG_CM966E_S ) || defined (CONFIG_CM1026EJ_S ) || \ - defined(CONFIG_CM1136JF_S ) -#define CONFIG_CM_TCRAM /* CM has TCRAM */ -#endif - -#ifdef CONFIG_CM_SPD_DETECT #define OS_SPD 0x00000100/* The SDRAM SPD data is copied here */ -#endif #endif /* __ARMCOREMODULE_H */
include/configs/integrator-common.h +0 -27
@@ -8,33 +8,6 @@#define CONFIG_SYS_TIMERBASE 0x13000100/* Timer1 */ -/* -* There are various dependencies on the core module (CM) fitted -* Users should refer to their CM user guide -*/ -#include "armcoremodule.h" - -/* -* Initialize and remap the core module, use SPD to detect memory size -* If CONFIG_SKIP_LOWLEVEL_INIT is not defined & -* the core module has a CM_INIT register -* then the U-Boot initialisation code will -* e.g. ARM Boot Monitor or pre-loader is repeated once -* (to re-initialise any existing CM_INIT settings to safe values). -* -* This is usually not the desired behaviour since the platform -* will either reboot into the ARM monitor (or pre-loader) -* or continuously cycle thru it without U-Boot running, -* depending upon the setting of Integrator/CP switch S2-4. -* -* However it may be needed if Integrator/CP switch S2-1 -* is set OFF to boot direct into U-Boot. -* In that case comment out the line below. -*/ -#define CONFIG_CM_INIT -#define CONFIG_CM_REMAP -#define CONFIG_CM_SPD_DETECT -/* * The ARM boot monitor initializes the board. * However, the default U-Boot code also performs the initialization.
include/configs/integratorap.h +0 -9
@@ -27,13 +27,4 @@* PCI definitions */ -/*----------------------------------------------------------------------- -* There are various dependencies on the core module (CM) fitted -* Users should refer to their CM user guide -* - when porting adjust u-boot/Makefile accordingly -* to define the necessary CONFIG_ s for the CM involved -* see e.g. integratorcp_CM926EJ-S_config -*/ -#include "armcoremodule.h" -#endif /* __CONFIG_H */
Signature · 1 line
2.25.1
Re: [PATCH 05/25] arm: integrator: Migrate platform-specific options and cleanup armcoremodule.h
Quoted 7 lines · Tom Rini
This converts the following to
Kconfig:
CONFIG_CM_INIT
CONFIG_CM_REMAP
CONFIG_CM_SPD_DETECT
CONFIG_CM_MULTIPLE_SSRAM
CONFIG_CM_TCRAM
Quoted 8 lines
We make the first three of these options be always enabled, as that matches usage. We select the last two based on how they were defined in
armcoremodule.h. This also allows us to remove some unused code inboard/armltd/integrator/lowlevel_init.SCc Linus Walleij <[email protected]>Cc Andre Przywara <[email protected]>Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH 6/25 s5p_goni, smdkc100: Move some environment settings out of CONFIG
In reply to Tom RiniA number of CONFIG options are used on these platforms as part of the default environment. Set some of these more directly and in other cases, just reference them directly.
--- include/configs/s5p_goni.h | 23 ++++++++++------------- include/configs/smdkc100.h | 24 ++++++++++-------------- 2 files changed, 20 insertions(+), 27 deletions(-)
include/configs/s5p_goni.h +10 -13
@@ -67,18 +67,14 @@"name=" PARTS_CSC ",size=150MiB,uuid=${uuid_gpt_" PARTS_CSC "};" \ "name="PARTS_UMS",size=-,uuid=${uuid_gpt_"PARTS_UMS"}\0" \ -#define CONFIG_RAMDISK_BOOT "root=/dev/ram0 rw rootfstype=ext4" \ - " ${console} ${meminfo}" - -#define CONFIG_COMMON_BOOT "${console} ${meminfo} ${mtdparts}" - -#define CONFIG_UPDATEB "updateb=onenand erase 0x0 0x100000;" \ - " onenand write 0x32008000 0x0 0x100000\0" +#define COMMON_BOOT "${console} ${meminfo} ${mtdparts}"#define CONFIG_MISC_COMMON #define CONFIG_EXTRA_ENV_SETTINGS \ - CONFIG_UPDATEB \ + "updateb=" \ + "onenand erase 0x0 0x100000;" \ + "onenand write 0x32008000 0x0 0x100000\0" \ "updatek=" \ "onenand erase 0xc00000 0x600000;" \ "onenand write 0x31008000 0xc00000 0x600000\0" \
@@ -91,22 +87,23 @@"flashboot=" \"set bootargs root=/dev/mtdblock${bootblock} " \"rootfstype=${rootfstype} ${opts} " \ -"${lcdinfo} " CONFIG_COMMON_BOOT "; run bootk\0" \ +"${lcdinfo} " COMMON_BOOT "; run bootk\0" \"ubifsboot=" \"set bootargs root=ubi0!rootfs rootfstype=ubifs " \"${opts} ${lcdinfo} " \ -CONFIG_COMMON_BOOT "; run bootk\0" \ +COMMON_BOOT "; run bootk\0" \"tftpboot=" \"set bootargs root=ubi0!rootfs rootfstype=ubifs " \ -"${opts} ${lcdinfo} " CONFIG_COMMON_BOOT \ +"${opts} ${lcdinfo} " COMMON_BOOT \"; tftp 0x30007FC0 uImage; bootm 0x30007FC0\0" \"ramboot=" \ -"set bootargs " CONFIG_RAMDISK_BOOT \ +"set bootargs root=/dev/ram0 rw rootfstype=ext4" \ +" ${console} ${meminfo} " \"initrd=0x33000000,8M ramdisk=8192\0" \"mmcboot=" \"set bootargs root=/dev/mmcblk${mmcdev}p${mmcrootpart} " \"rootfstype=${rootfstype} ${opts} ${lcdinfo} " \ -CONFIG_COMMON_BOOT "; run bootk\0" \ +COMMON_BOOT "; run bootk\0" \"boottrace=setenv opts initcall_debug; run bootcmd\0" \"bootchart=set opts init=/sbin/bootchartd; run bootcmd\0" \"verify=n\0" \
include/configs/smdkc100.h +10 -14
@@ -35,19 +35,14 @@/* PWM */ #define CONFIG_PWM 1 -#define CONFIG_RAMDISK_BOOT "root=/dev/ram0 rw rootfstype=ext2" \ - " console=ttySAC0,115200n8" \ - " mem=128M" - -#define CONFIG_COMMON_BOOT "console=ttySAC0,115200n8" \ +#define COMMON_BOOT "console=ttySAC0,115200n8" \ " mem=128M " \ " " CONFIG_MTDPARTS_DEFAULT -#define CONFIG_UPDATEB "updateb=onenand erase 0x0 0x40000;" \ - " onenand write 0x32008000 0x0 0x40000\0" -#define CONFIG_EXTRA_ENV_SETTINGS \ - CONFIG_UPDATEB \ + "updateb=" \ + "onenand erase 0x0 0x40000;" \ + "onenand write 0x32008000 0x0 0x40000\0" \ "updatek=" \ "onenand erase 0x60000 0x300000;" \ "onenand write 0x31008000 0x60000 0x300000\0" \
@@ -60,25 +55,26 @@"flashboot=" \"set bootargs root=/dev/mtdblock${bootblock} " \"rootfstype=${rootfstype} " \ -"ubi.mtd=${ubiblock} ${opts} " CONFIG_COMMON_BOOT ";" \ +"ubi.mtd=${ubiblock} ${opts} " COMMON_BOOT ";" \"run bootk\0" \"ubifsboot=" \"set bootargs root=ubi0!rootfs rootfstype=ubifs " \ -" ubi.mtd=${ubiblock} ${opts} " CONFIG_COMMON_BOOT "; " \ +" ubi.mtd=${ubiblock} ${opts} " COMMON_BOOT "; " \"run bootk\0" \"boottrace=setenv opts initcall_debug; run bootcmd\0" \"android=" \"set bootargs root=ubi0!ramdisk ubi.mtd=${ubiblock} " \ -"rootfstype=ubifs init=/init.sh " CONFIG_COMMON_BOOT "; " \ +"rootfstype=ubifs init=/init.sh " COMMON_BOOT "; " \"run bootk\0" \"nfsboot=" \"set bootargs root=/dev/nfs ubi.mtd=${ubiblock} " \"nfsroot=${nfsroot},nolock " \"ip=${ipaddr}:${serverip}:${gatewayip}:" \ -"${netmask}:nowplus:usb0:off " CONFIG_COMMON_BOOT "; " \ +"${netmask}:nowplus:usb0:off " COMMON_BOOT "; " \"run bootk\0" \"ramboot=" \ -"set bootargs " CONFIG_RAMDISK_BOOT \ +"set bootargs root=/dev/ram0 rw rootfstype=ext2" \ +" console=ttySAC0,115200n8 mem=128M" \" initrd=0x33000000,8M ramdisk=8192\0" \"rootfstype=cramfs\0" \"mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
Signature · 1 line
2.25.1
Re: [PATCH 06/25] s5p_goni, smdkc100: Move some environment settings out of CONFIG
2022년 3월 31일 (목) 07:09, Tom Rini <[email protected]>님이 작성:
Quoted 131 lines
A number of CONFIG options are used on these platforms as part of the default environment. Set some of these more directly and in other cases, just reference them directly.
Cc Jaehoon Chung <[email protected]>Cc Minkyu Kang <[email protected]>Signed-off-by Tom Rini <[email protected]>--- include/configs/s5p_goni.h | 23 ++++++++++------------- include/configs/smdkc100.h | 24 ++++++++++-------------- 2 files changed, 20 insertions(+), 27 deletions(-)include/configs/s5p_goni.h +10
-13@@ -67,18 +67,14 @@"name=" PARTS_CSC ",size=150MiB,uuid=${uuid_gpt_" PARTS_CSC "};" \ "name="PARTS_UMS",size=-,uuid=${uuid_gpt_"PARTS_UMS"}\0" \ -#define CONFIG_RAMDISK_BOOT "root=/dev/ram0 rw rootfstype=ext4" \ - " ${console} ${meminfo}" - -#define CONFIG_COMMON_BOOT "${console} ${meminfo} ${mtdparts}" - -#define CONFIG_UPDATEB "updateb=onenand erase 0x0 0x100000;" \ - " onenand write 0x32008000 0x0 0x100000\0" +#define COMMON_BOOT "${console} ${meminfo} ${mtdparts}"#define CONFIG_MISC_COMMON #define CONFIG_EXTRA_ENV_SETTINGS \ - CONFIG_UPDATEB \ + "updateb=" \ + "onenand erase 0x0 0x100000;" \ + "onenand write 0x32008000 0x0 0x100000\0" \ "updatek=" \ "onenand erase 0xc00000 0x600000;" \ "onenand write 0x31008000 0xc00000 0x600000\0" \@@ -91,22 +87,23 @@"flashboot=" \"set bootargs root=/dev/mtdblock${bootblock} " \"rootfstype=${rootfstype} ${opts} " \ -"${lcdinfo} " CONFIG_COMMON_BOOT "; run bootk\0" \ +"${lcdinfo} " COMMON_BOOT "; run bootk\0" \"ubifsboot=" \"set bootargs root=ubi0!rootfs rootfstype=ubifs " \"${opts} ${lcdinfo} " \ -CONFIG_COMMON_BOOT "; run bootk\0" \ +COMMON_BOOT "; run bootk\0" \"tftpboot=" \"set bootargs root=ubi0!rootfs rootfstype=ubifs " \ -"${opts} ${lcdinfo} " CONFIG_COMMON_BOOT \ +"${opts} ${lcdinfo} " COMMON_BOOT \"; tftp 0x30007FC0 uImage; bootm 0x30007FC0\0" \"ramboot=" \ -"set bootargs " CONFIG_RAMDISK_BOOT \ +"set bootargs root=/dev/ram0 rw rootfstype=ext4" \ +" ${console} ${meminfo} " \"initrd=0x33000000,8M ramdisk=8192\0" \"mmcboot=" \"set bootargs root=/dev/mmcblk${mmcdev}p${mmcrootpart} " \"rootfstype=${rootfstype} ${opts} ${lcdinfo} " \ -CONFIG_COMMON_BOOT "; run bootk\0" \ +COMMON_BOOT "; run bootk\0" \"boottrace=setenv opts initcall_debug; run bootcmd\0" \"bootchart=set opts init=/sbin/bootchartd; run bootcmd\0" \"verify=n\0" \include/configs/smdkc100.h +10
-15@@ -35,19 +35,14 @@/* PWM */ #define CONFIG_PWM 1 -#define CONFIG_RAMDISK_BOOT "root=/dev/ram0 rw rootfstype=ext2" \ - " console=ttySAC0,115200n8" \ - " mem=128M" - -#define CONFIG_COMMON_BOOT "console=ttySAC0,115200n8" \ +#define COMMON_BOOT "console=ttySAC0,115200n8" \ " mem=128M " \ " " CONFIG_MTDPARTS_DEFAULT -#define CONFIG_UPDATEB "updateb=onenand erase 0x0 0x40000;" \ - " onenand write 0x32008000 0x0 0x40000\0" -#define CONFIG_EXTRA_ENV_SETTINGS \ - CONFIG_UPDATEB \ + "updateb=" \ + "onenand erase 0x0 0x40000;" \ + "onenand write 0x32008000 0x0 0x40000\0" \ "updatek=" \ "onenand erase 0x60000 0x300000;" \ "onenand write 0x31008000 0x60000 0x300000\0" \@@ -60,25 +55,26 @@"flashboot=" \"set bootargs root=/dev/mtdblock${bootblock} " \"rootfstype=${rootfstype} " \ -"ubi.mtd=${ubiblock} ${opts} " CONFIG_COMMON_BOOT ";" \ +"ubi.mtd=${ubiblock} ${opts} " COMMON_BOOT ";" \"run bootk\0" \"ubifsboot=" \"set bootargs root=ubi0!rootfs rootfstype=ubifs " \ -" ubi.mtd=${ubiblock} ${opts} " CONFIG_COMMON_BOOT "; " \ +" ubi.mtd=${ubiblock} ${opts} " COMMON_BOOT "; " \"run bootk\0" \"boottrace=setenv opts initcall_debug; run bootcmd\0" \"android=" \"set bootargs root=ubi0!ramdisk ubi.mtd=${ubiblock} " \ -"rootfstype=ubifs init=/init.sh " CONFIG_COMMON_BOOT "; " \ +"rootfstype=ubifs init=/init.sh " COMMON_BOOT "; " \"run bootk\0" \"nfsboot=" \"set bootargs root=/dev/nfs ubi.mtd=${ubiblock} " \"nfsroot=${nfsroot},nolock " \"ip=${ipaddr}:${serverip}:${gatewayip}:" \ -"${netmask}:nowplus:usb0:off " CONFIG_COMMON_BOOT "; " \ +"${netmask}:nowplus:usb0:off " COMMON_BOOT "; " \"run bootk\0" \"ramboot=" \ -"set bootargs " CONFIG_RAMDISK_BOOT \ +"set bootargs root=/dev/ram0 rw rootfstype=ext2" \ +" console=ttySAC0,115200n8 mem=128M" \" initrd=0x33000000,8M ramdisk=8192\0" \"rootfstype=cramfs\0" \"mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \ --2.25.1
Quoted 1 line
Reviewed-by Minkyu Kang <[email protected]>
Thanks.
Signature · 1 line
Thanks. Minkyu Kang.
Re: [PATCH 06/25] s5p_goni, smdkc100: Move some environment settings out of CONFIG
In reply to Tom RiniQuoted 7 lines · Tom Rini
A number of CONFIG options are used on these platforms as part of the default environment. Set some of these more directly and in other cases, just reference them directly.
Cc Jaehoon Chung <[email protected]>Cc Minkyu Kang <[email protected]>Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
Re: [PATCH 06/25] s5p_goni, smdkc100: Move some environment settings out of CONFIG
In reply to Tom RiniQuoted 7 lines · Tom Rini
A number of CONFIG options are used on these platforms as part of the default environment. Set some of these more directly and in other cases, just reference them directly.
Cc Jaehoon Chung <[email protected]>Cc Minkyu Kang <[email protected]>Signed-off-by Tom Rini <[email protected]>
Best Regards,
Jaehoon Chung
Quoted 121 lines
--- include/configs/s5p_goni.h | 23 ++++++++++------------- include/configs/smdkc100.h | 24 ++++++++++-------------- 2 files changed, 20 insertions(+), 27 deletions(-)include/configs/s5p_goni.h +10
-13@@ -67,18 +67,14 @@"name=" PARTS_CSC ",size=150MiB,uuid=${uuid_gpt_" PARTS_CSC "};" \ "name="PARTS_UMS",size=-,uuid=${uuid_gpt_"PARTS_UMS"}\0" \ -#define CONFIG_RAMDISK_BOOT "root=/dev/ram0 rw rootfstype=ext4" \ - " ${console} ${meminfo}" - -#define CONFIG_COMMON_BOOT "${console} ${meminfo} ${mtdparts}" - -#define CONFIG_UPDATEB "updateb=onenand erase 0x0 0x100000;" \ - " onenand write 0x32008000 0x0 0x100000\0" +#define COMMON_BOOT "${console} ${meminfo} ${mtdparts}"#define CONFIG_MISC_COMMON #define CONFIG_EXTRA_ENV_SETTINGS \ - CONFIG_UPDATEB \ + "updateb=" \ + "onenand erase 0x0 0x100000;" \ + "onenand write 0x32008000 0x0 0x100000\0" \ "updatek=" \ "onenand erase 0xc00000 0x600000;" \ "onenand write 0x31008000 0xc00000 0x600000\0" \@@ -91,22 +87,23 @@"flashboot=" \"set bootargs root=/dev/mtdblock${bootblock} " \"rootfstype=${rootfstype} ${opts} " \ -"${lcdinfo} " CONFIG_COMMON_BOOT "; run bootk\0" \ +"${lcdinfo} " COMMON_BOOT "; run bootk\0" \"ubifsboot=" \"set bootargs root=ubi0!rootfs rootfstype=ubifs " \"${opts} ${lcdinfo} " \ -CONFIG_COMMON_BOOT "; run bootk\0" \ +COMMON_BOOT "; run bootk\0" \"tftpboot=" \"set bootargs root=ubi0!rootfs rootfstype=ubifs " \ -"${opts} ${lcdinfo} " CONFIG_COMMON_BOOT \ +"${opts} ${lcdinfo} " COMMON_BOOT \"; tftp 0x30007FC0 uImage; bootm 0x30007FC0\0" \"ramboot=" \ -"set bootargs " CONFIG_RAMDISK_BOOT \ +"set bootargs root=/dev/ram0 rw rootfstype=ext4" \ +" ${console} ${meminfo} " \"initrd=0x33000000,8M ramdisk=8192\0" \"mmcboot=" \"set bootargs root=/dev/mmcblk${mmcdev}p${mmcrootpart} " \"rootfstype=${rootfstype} ${opts} ${lcdinfo} " \ -CONFIG_COMMON_BOOT "; run bootk\0" \ +COMMON_BOOT "; run bootk\0" \"boottrace=setenv opts initcall_debug; run bootcmd\0" \"bootchart=set opts init=/sbin/bootchartd; run bootcmd\0" \"verify=n\0" \include/configs/smdkc100.h +10
-14@@ -35,19 +35,14 @@/* PWM */ #define CONFIG_PWM 1 -#define CONFIG_RAMDISK_BOOT "root=/dev/ram0 rw rootfstype=ext2" \ - " console=ttySAC0,115200n8" \ - " mem=128M" - -#define CONFIG_COMMON_BOOT "console=ttySAC0,115200n8" \ +#define COMMON_BOOT "console=ttySAC0,115200n8" \ " mem=128M " \ " " CONFIG_MTDPARTS_DEFAULT -#define CONFIG_UPDATEB "updateb=onenand erase 0x0 0x40000;" \ - " onenand write 0x32008000 0x0 0x40000\0" -#define CONFIG_EXTRA_ENV_SETTINGS \ - CONFIG_UPDATEB \ + "updateb=" \ + "onenand erase 0x0 0x40000;" \ + "onenand write 0x32008000 0x0 0x40000\0" \ "updatek=" \ "onenand erase 0x60000 0x300000;" \ "onenand write 0x31008000 0x60000 0x300000\0" \@@ -60,25 +55,26 @@"flashboot=" \"set bootargs root=/dev/mtdblock${bootblock} " \"rootfstype=${rootfstype} " \ -"ubi.mtd=${ubiblock} ${opts} " CONFIG_COMMON_BOOT ";" \ +"ubi.mtd=${ubiblock} ${opts} " COMMON_BOOT ";" \"run bootk\0" \"ubifsboot=" \"set bootargs root=ubi0!rootfs rootfstype=ubifs " \ -" ubi.mtd=${ubiblock} ${opts} " CONFIG_COMMON_BOOT "; " \ +" ubi.mtd=${ubiblock} ${opts} " COMMON_BOOT "; " \"run bootk\0" \"boottrace=setenv opts initcall_debug; run bootcmd\0" \"android=" \"set bootargs root=ubi0!ramdisk ubi.mtd=${ubiblock} " \ -"rootfstype=ubifs init=/init.sh " CONFIG_COMMON_BOOT "; " \ +"rootfstype=ubifs init=/init.sh " COMMON_BOOT "; " \"run bootk\0" \"nfsboot=" \"set bootargs root=/dev/nfs ubi.mtd=${ubiblock} " \"nfsroot=${nfsroot},nolock " \"ip=${ipaddr}:${serverip}:${gatewayip}:" \ -"${netmask}:nowplus:usb0:off " CONFIG_COMMON_BOOT "; " \ +"${netmask}:nowplus:usb0:off " COMMON_BOOT "; " \"run bootk\0" \"ramboot=" \ -"set bootargs " CONFIG_RAMDISK_BOOT \ +"set bootargs root=/dev/ram0 rw rootfstype=ext2" \ +" console=ttySAC0,115200n8 mem=128M" \" initrd=0x33000000,8M ramdisk=8192\0" \"rootfstype=cramfs\0" \"mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
PATCH 7/25 MPC837XERDB: Stop using CONFIG_RAMDISKFILE
In reply to Tom RiniWe don't really configure this, just set it directly in the environment section.
--- include/configs/MPC837XERDB.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
include/configs/MPC837XERDB.h +1 -2
@@ -315,7 +315,6 @@#define CONFIG_HOSTNAME "mpc837x_rdb"#define CONFIG_ROOTPATH "/nfsroot" -#define CONFIG_RAMDISKFILE "rootfs.ext2.gz.uboot"/* U-Boot image on TFTP server */ #define CONFIG_UBOOTPATH "u-boot.bin"#define CONFIG_FDTFILE "mpc8379_rdb.dtb"
@@ -337,7 +336,7 @@"fdtaddr=780000\0" \"fdtfile=" CONFIG_FDTFILE "\0" \"ramdiskaddr=1000000\0" \ -"ramdiskfile=" CONFIG_RAMDISKFILE "\0" \ +"ramdiskfile=rootfs.ext2.gz.uboot\0" \"console=ttyS0\0" \"setbootargs=setenv bootargs " \"root=$rootdev rw console=$console,$baudrate $othbootargs\0" \
Signature · 1 line
2.25.1
Re: [PATCH 07/25] MPC837XERDB: Stop using CONFIG_RAMDISKFILE
Quoted 4 lines · Tom Rini
We don't really configure this, just set it directly in the environment section.
Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH 8/25 corvus: Migrate CONFIG_*_LED out of CONFIG namespace
In reply to Tom RiniThis code is only used on the corvus platform, so migrate the LED on/off code to this platform and remove it from the CONFIG namespace. In theory, this should likely be moved to the modern GPIO LED driver as a further cleanup.
--- board/siemens/corvus/board.c | 24 ++++++++++++++++++++++-- include/configs/corvus.h | 4 ---- 2 files changed, 22 insertions(+), 6 deletions(-)
board/siemens/corvus/board.c +22 -2
@@ -52,8 +52,28 @@ static void corvus_request_gpio(void)gpio_request (AT91_PIN_PD3 ,"USB1" );gpio_request (AT91_PIN_PB18 ,"SPICS1" );gpio_request (AT91_PIN_PB3 ,"SPICS0" ); -gpio_request (CONFIG_RED_LED ,"red led" ); -gpio_request (CONFIG_GREEN_LED ,"green led" ); +gpio_request (AT91_PIN_PD31 ,"red led" );/* this is the user1 led */ +gpio_request (AT91_PIN_PD0 ,"green led" );/* this is the user2 led */ +} + +void red_led_on (void ) +{ +gpio_set_value (AT91_PIN_PD31 ,1 ); +} + +void red_led_off (void ) +{ +gpio_set_value (AT91_PIN_PD31 ,0 ); +} + +void green_led_on (void ) +{ +gpio_set_value (AT91_PIN_PD0 ,0 ); +} + +void green_led_off (void ) +{ +gpio_set_value (AT91_PIN_PD0 ,1 ); }static void corvus_nand_hw_init (void )
include/configs/corvus.h +0 -4
@@ -31,10 +31,6 @@#define CONFIG_USART_BASE ATMEL_BASE_DBGU#define CONFIG_USART_ID ATMEL_ID_SYS -/* LED */ -#define CONFIG_RED_LED AT91_PIN_PD31/* this is the user1 led */ -#define CONFIG_GREEN_LED AT91_PIN_PD0/* this is the user2 led */ -/* SDRAM */ #define CONFIG_SYS_SDRAM_BASE ATMEL_BASE_CS6#define CONFIG_SYS_SDRAM_SIZE 0x08000000
Signature · 1 line
2.25.1
Re: [PATCH 08/25] corvus: Migrate CONFIG_*_LED out of CONFIG namespace
Hello Tom,
Quoted 11 lines · Tom Rini
This code is only used on the corvus platform, so migrate the LED on/off code to this platform and remove it from the CONFIG namespace. In theory, this should likely be moved to the modern GPIO LED driver as a further cleanup.
Cc Heiko Schocher <[email protected]>Signed-off-by Tom Rini <[email protected]>--- board/siemens/corvus/board.c | 24 ++++++++++++++++++++++-- include/configs/corvus.h | 4 ---- 2 files changed, 22 insertions(+), 6 deletions(-)
Thanks!
bye,
Heiko
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: [email protected]
Re: [PATCH 08/25] corvus: Migrate CONFIG_*_LED out of CONFIG namespace
In reply to Tom RiniQuoted 8 lines · Tom Rini
This code is only used on the corvus platform, so migrate the LED on/off code to this platform and remove it from the CONFIG namespace. In theory, this should likely be moved to the modern GPIO LED driver as a further cleanup.
Cc Heiko Schocher <[email protected]>Signed-off-by Tom Rini <[email protected]>Reviewed-by Heiko Schocher <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH 9/25 stm32f429-discovery: Migrate CONFIG_*_LED out of CONFIG namespace
In reply to Tom RiniThese values are only used in one file, reference them more directly.
--- board/st/stm32f429-discovery/led.c | 19 +++++++++++-------- include/configs/stm32f429-discovery.h | 3 --- 2 files changed, 11 insertions(+), 11 deletions(-)
board/st/stm32f429-discovery/led.c +11 -8
@@ -8,30 +8,33 @@#include <status_led.h> #include <asm-generic/gpio.h> +#define RED_LED 110 +#define GREEN_LED 109 +void coloured_LED_init (void ) { -gpio_request (CONFIG_RED_LED ,"red led" ); -gpio_direction_output (CONFIG_RED_LED ,0 ); -gpio_request (CONFIG_GREEN_LED ,"green led" ); -gpio_direction_output (CONFIG_GREEN_LED ,0 ); +gpio_request (RED_LED ,"red led" ); +gpio_direction_output (RED_LED ,0 ); +gpio_request (GREEN_LED ,"green led" ); +gpio_direction_output (GREEN_LED ,0 ); }void red_led_off (void ) { -gpio_set_value (CONFIG_RED_LED ,0 ); +gpio_set_value (RED_LED ,0 ); }void green_led_off (void ) { -gpio_set_value (CONFIG_GREEN_LED ,0 ); +gpio_set_value (GREEN_LED ,0 ); }void red_led_on (void ) { -gpio_set_value (CONFIG_RED_LED ,1 ); +gpio_set_value (RED_LED ,1 ); }void green_led_on (void ) { -gpio_set_value (CONFIG_GREEN_LED ,1 ); +gpio_set_value (GREEN_LED ,1 ); }
include/configs/stm32f429-discovery.h +0 -3
@@ -17,9 +17,6 @@#define CONFIG_SYS_MAX_FLASH_SECT 12 -#define CONFIG_RED_LED 110 -#define CONFIG_GREEN_LED 109 -#define CONFIG_SYS_HZ_CLOCK 1000000/* Timer is clocked at 1MHz */ #define CONFIG_SYS_CBSIZE 1024
Signature · 1 line
2.25.1
Re: [PATCH 09/25] stm32f429-discovery: Migrate CONFIG_*_LED out of CONFIG namespace
Hi Tom
Quoted 63 lines · Tom Rini
These values are only used in one file, reference them more directly.
Cc Kamil Lulko <[email protected]>Cc Patrick Delaunay <[email protected]>Cc Patrice Chotard <[email protected]>Signed-off-by Tom Rini <[email protected]>--- board/st/stm32f429-discovery/led.c | 19 +++++++++++-------- include/configs/stm32f429-discovery.h | 3 --- 2 files changed, 11 insertions(+), 11 deletions(-)board/st/stm32f429-discovery/led.c +11
-8@@ -8,30 +8,33 @@#include <status_led.h> #include <asm-generic/gpio.h> +#define RED_LED 110 +#define GREEN_LED 109 +void coloured_LED_init (void ) { -gpio_request (CONFIG_RED_LED ,"red led" ); -gpio_direction_output (CONFIG_RED_LED ,0 ); -gpio_request (CONFIG_GREEN_LED ,"green led" ); -gpio_direction_output (CONFIG_GREEN_LED ,0 ); +gpio_request (RED_LED ,"red led" ); +gpio_direction_output (RED_LED ,0 ); +gpio_request (GREEN_LED ,"green led" ); +gpio_direction_output (GREEN_LED ,0 ); }void red_led_off (void ) { -gpio_set_value (CONFIG_RED_LED ,0 ); +gpio_set_value (RED_LED ,0 ); }void green_led_off (void ) { -gpio_set_value (CONFIG_GREEN_LED ,0 ); +gpio_set_value (GREEN_LED ,0 ); }void red_led_on (void ) { -gpio_set_value (CONFIG_RED_LED ,1 ); +gpio_set_value (RED_LED ,1 ); }void green_led_on (void ) { -gpio_set_value (CONFIG_GREEN_LED ,1 ); +gpio_set_value (GREEN_LED ,1 ); }include/configs/stm32f429-discovery.h +0
-0
include/configs/stm32f429-discovery.h line 22
Quoted 9 lines
include/configs/stm32f429-discovery.h +0
-3@@ -17,9 +17,6 @@#define CONFIG_SYS_MAX_FLASH_SECT 12 -#define CONFIG_RED_LED 110 -#define CONFIG_GREEN_LED 109 -#define CONFIG_SYS_HZ_CLOCK 1000000/* Timer is clocked at 1MHz */ #define CONFIG_SYS_CBSIZE 1024
Thanks
Patrice
Re: [PATCH 09/25] stm32f429-discovery: Migrate CONFIG_*_LED out of CONFIG namespace
In reply to Tom RiniQuoted 8 lines · Tom Rini
These values are only used in one file, reference them more directly.
Cc Kamil Lulko <[email protected]>Cc Patrick Delaunay <[email protected]>Cc Patrice Chotard <[email protected]>Signed-off-by Tom Rini <[email protected]>Reviewed-by Patrice Chotard <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH 10/25 at91: Remove unused LED code
In reply to Tom RiniThese LED files (and CONFIG values) are unused today, remove the code in question.
--- arch/arm/mach-at91/arm926ejs/Makefile | 1 - arch/arm/mach-at91/arm926ejs/led.c | 47 --------------------------- board/atmel/at91sam9260ek/Makefile | 1 - board/atmel/at91sam9260ek/led.c | 22 ------------- board/atmel/at91sam9261ek/Makefile | 1 - board/atmel/at91sam9261ek/led.c | 28 ---------------- board/atmel/at91sam9263ek/Makefile | 1 - board/atmel/at91sam9263ek/led.c | 27 --------------- board/atmel/at91sam9m10g45ek/Makefile | 1 - board/atmel/at91sam9m10g45ek/led.c | 24 -------------- board/atmel/at91sam9rlek/Makefile | 1 - board/atmel/at91sam9rlek/led.c | 26 --------------- board/ronetix/pm9261/Makefile | 1 - board/ronetix/pm9261/led.c | 26 --------------- board/ronetix/pm9263/Makefile | 1 - board/ronetix/pm9263/led.c | 24 -------------- include/configs/smartweb.h | 4 --- 17 files changed, 236 deletions(-) delete mode 100644 arch/arm/mach-at91/arm926ejs/led.c delete mode 100644 board/atmel/at91sam9260ek/led.c delete mode 100644 board/atmel/at91sam9261ek/led.c delete mode 100644 board/atmel/at91sam9263ek/led.c delete mode 100644 board/atmel/at91sam9m10g45ek/led.c delete mode 100644 board/atmel/at91sam9rlek/led.c delete mode 100644 board/ronetix/pm9261/led.c delete mode 100644 board/ronetix/pm9263/led.c
arch/arm/mach-at91/arm926ejs/Makefile +0 -1
@@ -16,7 +16,6 @@ obj-$(CONFIG_AT91SAM9N12) += at91sam9n12_devices.o obj-$(CONFIG_AT91SAM9X5) += at91sam9x5_devices.o obj-$(CONFIG_SAM9X60) += sam9x60_devices.o obj-$(CONFIG_AT91_EFLASH) += eflash.o -obj-$(CONFIG_AT91_LED) += led.o obj-y += clock.o obj-y += cpu.o obj-y += reset.o
arch/arm/mach-at91/arm926ejs/led.c deleted +0 -47
47 lines not on this page · raw message
board/atmel/at91sam9260ek/Makefile +0 -1
@@ -8,4 +8,3 @@ # Lead Tech Design <www.leadtechdesign.com> obj-y += at91sam9260ek.o -obj-$(CONFIG_AT91_LED) += led.o
board/atmel/at91sam9260ek/led.c deleted +0 -22
@@ -1,22 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* -* (C) Copyright 2007-2008 -* Stelian Pop <[email protected]> -* Lead Tech Design <www.leadtechdesign.com> -*/ - -#include <common.h> -#include <init.h> -#include <asm/io.h> -#include <asm/arch/gpio.h> -#include <status_led.h> - -void coloured_LED_init (void ) -{ -/* Clock is enabled in board_early_init_f() */ -at91_set_gpio_output (CONFIG_RED_LED ,1 ); -at91_set_gpio_output (CONFIG_GREEN_LED ,1 ); - -at91_set_gpio_value (CONFIG_RED_LED ,0 ); -at91_set_gpio_value (CONFIG_GREEN_LED ,1 ); -}
board/atmel/at91sam9261ek/Makefile +0 -1
@@ -8,4 +8,3 @@ # Lead Tech Design <www.leadtechdesign.com> obj-y += at91sam9261ek.o -obj-$(CONFIG_AT91_LED) += led.o
board/atmel/at91sam9261ek/led.c deleted +0 -28
@@ -1,28 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* -* (C) Copyright 2007-2008 -* Stelian Pop <[email protected]> -* Lead Tech Design <www.leadtechdesign.com> -*/ - -#include <common.h> -#include <status_led.h> -#include <asm/arch/at91sam9261.h> -#include <asm/arch/gpio.h> -#include <asm/arch/at91_pio.h> -#include <asm/arch/clk.h> -#include <asm/io.h> - -void coloured_LED_init (void ) -{ -/* Enable clock */ -at91_periph_clk_enable (ATMEL_ID_PIOA ); - -at91_set_gpio_output (CONFIG_RED_LED ,1 ); -at91_set_gpio_output (CONFIG_GREEN_LED ,1 ); -at91_set_gpio_output (CONFIG_YELLOW_LED ,1 ); - -at91_set_gpio_value (CONFIG_RED_LED ,0 ); -at91_set_gpio_value (CONFIG_GREEN_LED ,1 ); -at91_set_gpio_value (CONFIG_YELLOW_LED ,1 ); -}
board/atmel/at91sam9263ek/Makefile +0 -1
@@ -8,4 +8,3 @@ # Lead Tech Design <www.leadtechdesign.com> obj-y += at91sam9263ek.o -obj-$(CONFIG_AT91_LED) += led.o
board/atmel/at91sam9263ek/led.c deleted +0 -27
@@ -1,27 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* -* (C) Copyright 2007-2008 -* Stelian Pop <[email protected]> -* Lead Tech Design <www.leadtechdesign.com> -*/ - -#include <common.h> -#include <status_led.h> -#include <asm/io.h> -#include <asm/arch/gpio.h> -#include <asm/arch/at91sam9263.h> -#include <asm/arch/clk.h> - -void coloured_LED_init (void ) -{ -at91_periph_clk_enable (ATMEL_ID_PIOB ); -at91_periph_clk_enable (ATMEL_ID_PIOB ); - -at91_set_gpio_output (CONFIG_RED_LED ,1 ); -at91_set_gpio_output (CONFIG_GREEN_LED ,1 ); -at91_set_gpio_output (CONFIG_YELLOW_LED ,1 ); - -at91_set_gpio_value (CONFIG_RED_LED ,0 ); -at91_set_gpio_value (CONFIG_GREEN_LED ,1 ); -at91_set_gpio_value (CONFIG_YELLOW_LED ,1 ); -}
board/atmel/at91sam9m10g45ek/Makefile +0 -1
@@ -8,4 +8,3 @@ # Lead Tech Design <www.leadtechdesign.com> obj-y += at91sam9m10g45ek.o -obj-(CONFIG_AT91_LED) += led.o
board/atmel/at91sam9m10g45ek/led.c deleted +0 -24
@@ -1,24 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* -* (C) Copyright 2007-2008 -* Stelian Pop <[email protected]> -* Lead Tech Design <www.leadtechdesign.com> -*/ - -#include <common.h> -#include <status_led.h> -#include <asm/io.h> -#include <asm/arch/at91sam9g45.h> -#include <asm/arch/clk.h> -#include <asm/arch/gpio.h> - -void coloured_LED_init (void ) -{ -at91_periph_clk_enable (ATMEL_ID_PIODE ); - -at91_set_gpio_output (CONFIG_RED_LED ,1 ); -at91_set_gpio_output (CONFIG_GREEN_LED ,1 ); - -at91_set_gpio_value (CONFIG_RED_LED ,0 ); -at91_set_gpio_value (CONFIG_GREEN_LED ,1 ); -}
board/atmel/at91sam9rlek/Makefile +0 -1
@@ -8,4 +8,3 @@ # Lead Tech Design <www.leadtechdesign.com> obj-y += at91sam9rlek.o -obj-$(CONFIG_AT91_LED) += led.o
board/atmel/at91sam9rlek/led.c deleted +0 -26
@@ -1,26 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* -* (C) Copyright 2007-2008 -* Stelian Pop <[email protected]> -* Lead Tech Design <www.leadtechdesign.com> -*/ - -#include <common.h> -#include <status_led.h> -#include <asm/arch/at91sam9rl.h> -#include <asm/arch/clk.h> -#include <asm/arch/gpio.h> -#include <asm/io.h> - -void coloured_LED_init (void ) -{ -at91_periph_clk_enable (ATMEL_ID_PIOD ); - -at91_set_gpio_output (CONFIG_RED_LED ,1 ); -at91_set_gpio_output (CONFIG_GREEN_LED ,1 ); -at91_set_gpio_output (CONFIG_YELLOW_LED ,1 ); - -at91_set_gpio_value (CONFIG_RED_LED ,0 ); -at91_set_gpio_value (CONFIG_GREEN_LED ,1 ); -at91_set_gpio_value (CONFIG_YELLOW_LED ,1 ); -}
board/ronetix/pm9261/Makefile +0 -1
@@ -9,4 +9,3 @@ # Ilko Iliev <www.ronetix.at> obj-y += pm9261.o -obj-$(CONFIG_RED_LED) += led.o
board/ronetix/pm9261/led.c deleted +0 -26
@@ -1,26 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* -* (C) Copyright 2007-2008 -* Stelian Pop <[email protected]> -* Lead Tech Design <www.leadtechdesign.com> -* Ilko Iliev <www.ronetix.at> -*/ - -#include <common.h> -#include <status_led.h> -#include <asm/gpio.h> -#include <asm/arch/clk.h> -#include <asm/arch/gpio.h> - -void coloured_LED_init (void ) -{ -at91_periph_clk_enable (ATMEL_ID_PIOC ); - -gpio_direction_output (CONFIG_RED_LED ,1 ); -gpio_direction_output (CONFIG_GREEN_LED ,1 ); -gpio_direction_output (CONFIG_YELLOW_LED ,1 ); - -gpio_set_value (CONFIG_RED_LED ,0 ); -gpio_set_value (CONFIG_GREEN_LED ,1 ); -gpio_set_value (CONFIG_YELLOW_LED ,1 ); -}
board/ronetix/pm9263/Makefile +0 -1
@@ -9,4 +9,3 @@ # Ilko Iliev <www.ronetix.at> obj-y += pm9263.o -obj-$(CONFIG_AT91_LED) += led.o
board/ronetix/pm9263/led.c deleted +0 -24
@@ -1,24 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* -* (C) Copyright 2007-2008 -* Stelian Pop <[email protected]> -* Lead Tech Design <www.leadtechdesign.com> -* Ilko Iliev <www.ronetix.at> -*/ - -#include <common.h> -#include <status_led.h> -#include <asm/gpio.h> -#include <asm/arch/clk.h> -#include <asm/arch/gpio.h> - -void coloured_LED_init (void ) -{ -at91_periph_clk_enable (ATMEL_ID_PIOB ); - -gpio_direction_output (CONFIG_RED_LED ,1 ); -gpio_direction_output (CONFIG_GREEN_LED ,1 ); - -gpio_set_value (CONFIG_RED_LED ,0 ); -gpio_set_value (CONFIG_GREEN_LED ,1 ); -}
include/configs/smartweb.h +0 -4
@@ -47,10 +47,6 @@/* setting board specific options */ #define CONFIG_SYS_AUTOLOAD "yes" -/* The LED PINs */ -#define CONFIG_RED_LED AT91_PIN_PA9 -#define CONFIG_GREEN_LED AT91_PIN_PA6 -/* * SDRAM: 1 bank, 64 MB, base address 0x20000000 * Already initialized before u-boot gets started.
Signature · 1 line
2.25.1
Re: [PATCH 10/25] at91: Remove unused LED code
Quoted 4 lines · Tom Rini
These LED files (and CONFIG values) are unused today, remove the code in question.
Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH 11/25 Convert CONFIG_CONS_SCIF0 et al to Kconfig
In reply to Tom RiniThis converts the following to Kconfig:
CONFIG_CONS_SCIF0
CONFIG_CONS_SCIF1
CONFIG_CONS_SCIF2
CONFIG_CONS_SCIF4
CONFIG_CONS_SCIFA0
--- drivers/serial/Kconfig | 21 +++++++++++++++++++++ include/configs/alt.h | 1 - include/configs/armadillo-800eva.h | 1 - include/configs/gose.h | 1 - include/configs/koelsch.h | 1 - include/configs/kzm9g.h | 1 - include/configs/lager.h | 1 - include/configs/porter.h | 1 - include/configs/r2dplus.h | 1 - include/configs/rcar-gen3-common.h | 1 - include/configs/silk.h | 1 - include/configs/stout.h | 1 - 12 files changed, 21 insertions(+), 11 deletions(-)
drivers/serial/Kconfig +21 -0
@@ -782,6 +782,27 @@ config SCIF_CONSOLE on systems with RCar or SH SoCs, say Y to this option. If unsure, say N. +choice + prompt "SCIF console port" + depends on SCIF_CONSOLE && (!DM_SERIAL || (SPL && !SPL_DM_SERIAL)) + +config CONS_SCIF0 + bool "SCIF0" + +config CONS_SCIF1 + bool "SCIF1" + +config CONS_SCIF2 + bool "SCIF2" + +config CONS_SCIF4 + bool "SCIF4" + +config CONS_SCIFA0 + bool "SCIFA0" + +endchoice + config UNIPHIER_SERIAL bool "Support for UniPhier on-chip UART" depends on ARCH_UNIPHIER
include/configs/alt.h +0 -1
@@ -42,7 +42,6 @@#define CONFIG_SPL_STACK 0xe6340000#define CONFIG_SPL_MAX_SIZE 0x4000#ifdef CONFIG_SPL_BUILD -#define CONFIG_CONS_SCIF2 #define CONFIG_SH_SCIF_CLK_FREQ 65000000#endif
include/configs/armadillo-800eva.h +0 -1
@@ -33,7 +33,6 @@#define CONFIG_SYS_BAUDRATE_TABLE { 115200 }/* SCIF */ -#define CONFIG_CONS_SCIF1 #define SCIF0_BASE 0xe6c40000#define SCIF1_BASE 0xe6c50000#define SCIF2_BASE 0xe6c60000
include/configs/gose.h +0 -1
@@ -37,7 +37,6 @@#define CONFIG_SPL_STACK 0xe6340000#define CONFIG_SPL_MAX_SIZE 0x4000#ifdef CONFIG_SPL_BUILD -#define CONFIG_CONS_SCIF0 #define CONFIG_SH_SCIF_CLK_FREQ 65000000#endif
include/configs/koelsch.h +0 -1
@@ -37,7 +37,6 @@#define CONFIG_SPL_STACK 0xe6340000#define CONFIG_SPL_MAX_SIZE 0x4000#ifdef CONFIG_SPL_BUILD -#define CONFIG_CONS_SCIF0 #define CONFIG_SH_SCIF_CLK_FREQ 65000000#endif
include/configs/kzm9g.h +0 -1
@@ -27,7 +27,6 @@#define CONFIG_SYS_BAUDRATE_TABLE { 115200 }/* SCIF */ -#define CONFIG_CONS_SCIF4 #undef CONFIG_SYS_LOADS_BAUD_CHANGE
include/configs/lager.h +0 -1
@@ -38,7 +38,6 @@#define CONFIG_SPL_STACK 0xe6340000#define CONFIG_SPL_MAX_SIZE 0x4000#ifdef CONFIG_SPL_BUILD -#define CONFIG_CONS_SCIF0 #define CONFIG_SH_SCIF_CLK_FREQ 65000000#endif
include/configs/porter.h +0 -1
@@ -42,7 +42,6 @@#define CONFIG_SPL_STACK 0xe6340000#define CONFIG_SPL_MAX_SIZE 0x4000#ifdef CONFIG_SPL_BUILD -#define CONFIG_CONS_SCIF0 #define CONFIG_SH_SCIF_CLK_FREQ 65000000#endif
include/configs/r2dplus.h +0 -1
@@ -4,7 +4,6 @@#define __LITTLE_ENDIAN__ 1/* SCIF */ -#define CONFIG_CONS_SCIF1 1/* SDRAM */ #define CONFIG_SYS_SDRAM_BASE 0x8C000000
include/configs/rcar-gen3-common.h +0 -1
@@ -60,7 +60,6 @@#define CONFIG_SPL_STACK 0xe6304000#define CONFIG_SPL_MAX_SIZE 0x7000#ifdef CONFIG_SPL_BUILD -#define CONFIG_CONS_SCIF2 #define CONFIG_SH_SCIF_CLK_FREQ 65000000#endif
include/configs/silk.h +0 -1
@@ -42,7 +42,6 @@#define CONFIG_SPL_STACK 0xe6340000#define CONFIG_SPL_MAX_SIZE 0x4000#ifdef CONFIG_SPL_BUILD -#define CONFIG_CONS_SCIF2 #define CONFIG_SH_SCIF_CLK_FREQ 65000000#endif
include/configs/stout.h +0 -1
@@ -46,7 +46,6 @@#define CONFIG_SPL_STACK 0xe6340000#define CONFIG_SPL_MAX_SIZE 0x4000#ifdef CONFIG_SPL_BUILD -#define CONFIG_CONS_SCIFA0 #define CONFIG_SH_SCIF_CLK_FREQ 52000000#endif
Signature · 1 line
2.25.1
Re: [PATCH 11/25] Convert CONFIG_CONS_SCIF0 et al to Kconfig
Quoted 8 lines · Tom Rini
This converts the following to
Kconfig:
CONFIG_CONS_SCIF0
CONFIG_CONS_SCIF1
CONFIG_CONS_SCIF2
CONFIG_CONS_SCIF4
CONFIG_CONS_SCIFA0Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH 12/25 Convert CONFIG_SH_SCIF_CLK_FREQ to Kconfig
In reply to Tom RiniThis converts the following to Kconfig:
CONFIG_SH_SCIF_CLK_FREQ
--- configs/stout_defconfig | 1 + drivers/serial/Kconfig | 5 +++++ include/configs/alt.h | 3 --- include/configs/armadillo-800eva.h | 3 --- include/configs/gose.h | 3 --- include/configs/koelsch.h | 3 --- include/configs/kzm9g.h | 1 - include/configs/lager.h | 3 --- include/configs/porter.h | 3 --- include/configs/rcar-gen3-common.h | 3 --- include/configs/silk.h | 3 --- include/configs/stout.h | 3 --- 12 files changed, 6 insertions(+), 28 deletions(-)
configs/stout_defconfig +1 -0
@@ -88,6 +88,7 @@ CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_SCIF_CONSOLE=y +CONFIG_SH_SCIF_CLK_FREQ=52000000 CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_SH_QSPI=y
drivers/serial/Kconfig +5 -0
@@ -803,6 +803,11 @@ config CONS_SCIFA0 endchoice +config SH_SCIF_CLK_FREQ + int "SCIF console clock frequency" + depends on SCIF_CONSOLE && (!DM_SERIAL || (SPL && !SPL_DM_SERIAL)) + default 65000000 + config UNIPHIER_SERIAL bool "Support for UniPhier on-chip UART" depends on ARCH_UNIPHIER
include/configs/alt.h +0 -3
@@ -41,8 +41,5 @@/* SPL support */ #define CONFIG_SPL_STACK 0xe6340000#define CONFIG_SPL_MAX_SIZE 0x4000 -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SH_SCIF_CLK_FREQ 65000000 -#endif #endif /* __ALT_H */
include/configs/armadillo-800eva.h +0 -3
@@ -67,7 +67,4 @@#define CONFIG_SH_ETHER_SH7734_MII (0x01)#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_MII -/* Board Clock */ -#define CONFIG_SH_SCIF_CLK_FREQ get_board_sys_clk() -#endif /* __ARMADILLO_800EVA_H */
include/configs/gose.h +0 -3
@@ -36,8 +36,5 @@/* SPL support */ #define CONFIG_SPL_STACK 0xe6340000#define CONFIG_SPL_MAX_SIZE 0x4000 -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SH_SCIF_CLK_FREQ 65000000 -#endif #endif /* __GOSE_H */
include/configs/koelsch.h +0 -3
@@ -36,8 +36,5 @@/* SPL support */ #define CONFIG_SPL_STACK 0xe6340000#define CONFIG_SPL_MAX_SIZE 0x4000 -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SH_SCIF_CLK_FREQ 65000000 -#endif #endif /* __KOELSCH_H */
include/configs/kzm9g.h +0 -1
@@ -66,7 +66,6 @@/* Clock */ #define CONFIG_GLOBAL_TIMER #define CONFIG_SYS_CPU_CLK (1196000000) -#define CONFIG_SH_SCIF_CLK_FREQ get_board_sys_clk()#define TMU_CLK_DIVIDER (4)/* 4 (default), 16, 64, 256 or 1024 */ #endif /* __KZM9G_H */
include/configs/lager.h +0 -3
@@ -37,8 +37,5 @@/* SPL support */ #define CONFIG_SPL_STACK 0xe6340000#define CONFIG_SPL_MAX_SIZE 0x4000 -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SH_SCIF_CLK_FREQ 65000000 -#endif #endif /* __LAGER_H */
include/configs/porter.h +0 -3
@@ -41,8 +41,5 @@/* SPL support */ #define CONFIG_SPL_STACK 0xe6340000#define CONFIG_SPL_MAX_SIZE 0x4000 -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SH_SCIF_CLK_FREQ 65000000 -#endif #endif /* __PORTER_H */
include/configs/rcar-gen3-common.h +0 -3
@@ -59,8 +59,5 @@#endif #define CONFIG_SPL_STACK 0xe6304000#define CONFIG_SPL_MAX_SIZE 0x7000 -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SH_SCIF_CLK_FREQ 65000000 -#endif #endif /* __RCAR_GEN3_COMMON_H */
include/configs/silk.h +0 -3
@@ -41,8 +41,5 @@/* SPL support */ #define CONFIG_SPL_STACK 0xe6340000#define CONFIG_SPL_MAX_SIZE 0x4000 -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SH_SCIF_CLK_FREQ 65000000 -#endif #endif /* __SILK_H */
include/configs/stout.h +0 -3
@@ -45,8 +45,5 @@/* SPL support */ #define CONFIG_SPL_STACK 0xe6340000#define CONFIG_SPL_MAX_SIZE 0x4000 -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SH_SCIF_CLK_FREQ 52000000 -#endif #endif /* __STOUT_H */
Signature · 1 line
2.25.1
Re: [PATCH 12/25] Convert CONFIG_SH_SCIF_CLK_FREQ to Kconfig
Quoted 4 lines · Tom Rini
This converts the following to
Kconfig:
CONFIG_SH_SCIF_CLK_FREQSigned-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH 13/25 spi: cadence_qspi: Migrate CONFIG_CQSPI_REF_CLK to Kconfig
In reply to Tom RiniThis is a little tricky since SoCFPGA has code to determine this as runtime. Introduce a guard variable for platforms to select if they have a static value to use. Then for ARCH_SOCFPGA, call cm_get_qspi_controller_clk_hz() and otherwise continue the previous behavior.
--- arch/arm/mach-socfpga/misc_soc64.c | 1 + configs/j7200_evm_a72_defconfig | 2 ++ configs/j7200_evm_r5_defconfig | 2 ++ configs/j721e_evm_a72_defconfig | 2 ++ configs/j721e_evm_r5_defconfig | 2 ++ configs/j721e_hs_evm_a72_defconfig | 2 ++ configs/j721e_hs_evm_r5_defconfig | 2 ++ configs/j721s2_evm_a72_defconfig | 2 ++ configs/j721s2_evm_r5_defconfig | 2 ++ configs/k2g_evm_defconfig | 2 ++ configs/k2g_hs_evm_defconfig | 2 ++ configs/stv0991_defconfig | 2 ++ drivers/spi/Kconfig | 8 ++++++++ drivers/spi/cadence_qspi.c | 4 +++- drivers/spi/cadence_qspi.h | 1 + include/configs/j721e_evm.h | 1 - include/configs/j721s2_evm.h | 1 - include/configs/k2g_evm.h | 4 ---- include/configs/socfpga_common.h | 9 --------- include/configs/socfpga_soc64_common.h | 5 ----- include/configs/stv0991.h | 8 -------- 21 files changed, 35 insertions(+), 29 deletions(-)
arch/arm/mach-socfpga/misc_soc64.c +1 -0
@@ -16,6 +16,7 @@#include <errno.h> #include <init.h> #include <log.h> +#include <mach/clock_manager.h> DECLARE_GLOBAL_DATA_PTR ;
configs/j7200_evm_a72_defconfig +2 -0
@@ -173,6 +173,8 @@ CONFIG_SOC_TI=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_CADENCE_QSPI=y +CONFIG_HAS_CQSPI_REF_CLK=y +CONFIG_CQSPI_REF_CLK=133333333 CONFIG_SYSRESET=y CONFIG_SPL_SYSRESET=y CONFIG_SYSRESET_TI_SCI=y
configs/j7200_evm_r5_defconfig +2 -0
@@ -134,6 +134,8 @@ CONFIG_SOC_TI=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_CADENCE_QSPI=y +CONFIG_HAS_CQSPI_REF_CLK=y +CONFIG_CQSPI_REF_CLK=133333333 CONFIG_SYSRESET=y CONFIG_SPL_SYSRESET=y CONFIG_SYSRESET_TI_SCI=y
configs/j721e_evm_a72_defconfig +2 -0
@@ -173,6 +173,8 @@ CONFIG_SOC_TI=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_CADENCE_QSPI=y +CONFIG_HAS_CQSPI_REF_CLK=y +CONFIG_CQSPI_REF_CLK=133333333 CONFIG_SYSRESET=y CONFIG_SPL_SYSRESET=y CONFIG_SYSRESET_TI_SCI=y
configs/j721e_evm_r5_defconfig +2 -0
@@ -127,6 +127,8 @@ CONFIG_SOC_TI=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_CADENCE_QSPI=y +CONFIG_HAS_CQSPI_REF_CLK=y +CONFIG_CQSPI_REF_CLK=133333333 CONFIG_SYSRESET=y CONFIG_SPL_SYSRESET=y CONFIG_SYSRESET_TI_SCI=y
configs/j721e_hs_evm_a72_defconfig +2 -0
@@ -145,6 +145,8 @@ CONFIG_SOC_TI=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_CADENCE_QSPI=y +CONFIG_HAS_CQSPI_REF_CLK=y +CONFIG_CQSPI_REF_CLK=133333333 CONFIG_SYSRESET=y CONFIG_SPL_SYSRESET=y CONFIG_SYSRESET_TI_SCI=y
configs/j721e_hs_evm_r5_defconfig +2 -0
@@ -114,6 +114,8 @@ CONFIG_SOC_TI=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_CADENCE_QSPI=y +CONFIG_HAS_CQSPI_REF_CLK=y +CONFIG_CQSPI_REF_CLK=133333333 CONFIG_SYSRESET=y CONFIG_SPL_SYSRESET=y CONFIG_SYSRESET_TI_SCI=y
configs/j721s2_evm_a72_defconfig +2 -0
@@ -181,6 +181,8 @@ CONFIG_SOC_TI=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_CADENCE_QSPI=y +CONFIG_HAS_CQSPI_REF_CLK=y +CONFIG_CQSPI_REF_CLK=133333333 CONFIG_SYSRESET=y CONFIG_SPL_SYSRESET=y CONFIG_SYSRESET_TI_SCI=y
configs/j721s2_evm_r5_defconfig +2 -0
@@ -138,6 +138,8 @@ CONFIG_SOC_TI=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_CADENCE_QSPI=y +CONFIG_HAS_CQSPI_REF_CLK=y +CONFIG_CQSPI_REF_CLK=133333333 CONFIG_SYSRESET=y CONFIG_SPL_SYSRESET=y CONFIG_SYSRESET_TI_SCI=y
configs/k2g_evm_defconfig +2 -0
@@ -89,6 +89,8 @@ CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_CADENCE_QSPI=y +CONFIG_HAS_CQSPI_REF_CLK=y +CONFIG_CQSPI_REF_CLK=384000000 CONFIG_DAVINCI_SPI=y CONFIG_USB=y CONFIG_DM_USB_GADGET=y
configs/k2g_hs_evm_defconfig +2 -0
@@ -73,6 +73,8 @@ CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_CADENCE_QSPI=y +CONFIG_HAS_CQSPI_REF_CLK=y +CONFIG_CQSPI_REF_CLK=384000000 CONFIG_DAVINCI_SPI=y CONFIG_USB=y CONFIG_DM_USB_GADGET=y
configs/stv0991_defconfig +2 -0
@@ -39,3 +39,5 @@ CONFIG_PHY_RESET_DELAY=10000 CONFIG_ETH_DESIGNWARE=y CONFIG_MII=y CONFIG_CADENCE_QSPI=y +CONFIG_HAS_CQSPI_REF_CLK=y +CONFIG_CQSPI_REF_CLK=3000000
drivers/spi/Kconfig +8 -0
@@ -128,6 +128,14 @@ config CADENCE_QSPI used to access the SPI NOR flash on platforms embedding this Cadence IP core. +config HAS_CQSPI_REF_CLK + bool "Cadence QSPI static reference clock" + depends on CADENCE_QSPI + +config CQSPI_REF_CLK + int "Cadence QSPI reference clock value in Hz" + depends on HAS_CQSPI_REF_CLK + config CF_SPI bool "ColdFire SPI driver" help
drivers/spi/cadence_qspi.c +3 -1
@@ -188,8 +188,10 @@ static int cadence_spi_probe(struct udevice *bus)if (plat->ref_clk_hz ==0 ) { ret =clk_get_by_index (bus,0 , &clk);if (ret) { -#ifdef CONFIG_CQSPI_REF_CLK +#ifdef CONFIG_HAS_CQSPI_REF_CLK plat->ref_clk_hz =CONFIG_CQSPI_REF_CLK ; +#elif defined(CONFIG_ARCH_SOCFPGA ) + plat->ref_clk_hz =cm_get_qspi_controller_clk_hz ();#else return ret;#endif
drivers/spi/cadence_qspi.h +1 -0
@@ -95,5 +95,6 @@ void cadence_qspi_apb_delay(void *reg_base,void cadence_qspi_apb_enter_xip (void *reg_base,char xip_dummy);void cadence_qspi_apb_readdata_capture (void *reg_base,unsigned int bypass,unsigned int delay); +unsigned int cm_get_qspi_controller_clk_hz (void );#endif /* __CADENCE_QSPI_H__ */
include/configs/j721e_evm.h +0 -1
@@ -57,7 +57,6 @@#define CONFIG_SPL_MAX_SIZE CONFIG_SYS_K3_MAX_DOWNLODABLE_IMAGE_SIZE#define CONFIG_SYS_BOOTM_LEN SZ_64M -#define CONFIG_CQSPI_REF_CLK 133333333/* HyperFlash related configuration */
include/configs/j721s2_evm.h +0 -1
@@ -58,7 +58,6 @@#define CONFIG_SPL_MAX_SIZE CONFIG_SYS_K3_MAX_DOWNLODABLE_IMAGE_SIZE#define CONFIG_SYS_BOOTM_LEN SZ_64M -#define CONFIG_CQSPI_REF_CLK 133333333/* U-Boot general configuration */ #define EXTRA_ENV_J721S2_BOARD_SETTINGS \
include/configs/k2g_evm.h +0 -4
@@ -59,10 +59,6 @@#define CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE #define PHY_ANEG_TIMEOUT 10000/* PHY needs longer aneg time */ -#ifndef CONFIG_SPL_BUILD -#define CONFIG_CQSPI_REF_CLK 384000000 -#endif -#define SPI_MTD_PARTS KEYSTONE_SPI1_MTD_PARTS#include <configs/ti_armv7_keystone2.h>
include/configs/socfpga_common.h +0 -9
@@ -121,15 +121,6 @@#define CONFIG_SYS_NAND_DATA_BASE SOCFPGA_NANDDATA_ADDRESS#endif -/* -* QSPI support -*/ -/* QSPI reference clock */ -#ifndef __ASSEMBLY__ -unsigned int cm_get_qspi_controller_clk_hz (void ); -#define CONFIG_CQSPI_REF_CLK cm_get_qspi_controller_clk_hz() -#endif -/* * USB */
include/configs/socfpga_soc64_common.h +0 -5
@@ -61,11 +61,6 @@#define MTDIDS_DEFAULT "nor0=ff705000.spi.0"#endif /* CONFIG_SPL_BUILD */ -#ifndef __ASSEMBLY__ -unsigned int cm_get_qspi_controller_clk_hz (void ); -#define CONFIG_CQSPI_REF_CLK cm_get_qspi_controller_clk_hz() -#endif -#endif /* CONFIG_CADENCE_QSPI */ /*
include/configs/stv0991.h +0 -8
@@ -31,12 +31,4 @@/* Misc configuration */ -/* -+ * QSPI support -+ */ -#ifdef CONFIG_OF_CONTROL /* QSPI is controlled via DT */ -#define CONFIG_CQSPI_REF_CLK ((30/4)/2)*1000*1000 - -#endif -#endif /* __CONFIG_H */
Signature · 1 line
2.25.1
Re: [PATCH 13/25] spi: cadence_qspi: Migrate CONFIG_CQSPI_REF_CLK to Kconfig
+Vignesh
Hi Tom,
Quoted 62 lines · Tom Rini
This is a little tricky since SoCFPGA has code to determine this as runtime. Introduce a guard variable for platforms to select if they have a static value to use. Then for
ARCH_SOCFPGA, callcm_get_qspi_controller_clk_hz()and otherwise continue the previous behavior.Cc Jagan Teki <[email protected]>Signed-off-by Tom Rini <[email protected]>--- arch/arm/mach-socfpga/misc_soc64.c | 1 + configs/j7200_evm_a72_defconfig | 2 ++ configs/j7200_evm_r5_defconfig | 2 ++ configs/j721e_evm_a72_defconfig | 2 ++ configs/j721e_evm_r5_defconfig | 2 ++ configs/j721e_hs_evm_a72_defconfig | 2 ++ configs/j721e_hs_evm_r5_defconfig | 2 ++ configs/j721s2_evm_a72_defconfig | 2 ++ configs/j721s2_evm_r5_defconfig | 2 ++ configs/k2g_evm_defconfig | 2 ++ configs/k2g_hs_evm_defconfig | 2 ++ configs/stv0991_defconfig | 2 ++ drivers/spi/Kconfig | 8 ++++++++ drivers/spi/cadence_qspi.c | 4 +++- drivers/spi/cadence_qspi.h | 1 + include/configs/j721e_evm.h | 1 - include/configs/j721s2_evm.h | 1 - include/configs/k2g_evm.h | 4 ---- include/configs/socfpga_common.h | 9 --------- include/configs/socfpga_soc64_common.h | 5 ----- include/configs/stv0991.h | 8 -------- 21 files changed, 35 insertions(+), 29 deletions(-)arch/arm/mach-socfpga/misc_soc64.c +1
-0@@ -16,6 +16,7 @@#include <errno.h> #include <init.h> #include <log.h> +#include <mach/clock_manager.h> DECLARE_GLOBAL_DATA_PTR ;configs/j7200_evm_a72_defconfig +2
-0@@ -173,6 +173,8 @@ CONFIG_SOC_TI=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_CADENCE_QSPI=y +CONFIG_HAS_CQSPI_REF_CLK=y +CONFIG_CQSPI_REF_CLK=133333333 CONFIG_SYSRESET=y CONFIG_SPL_SYSRESET=y CONFIG_SYSRESET_TI_SCI=yconfigs/j7200_evm_r5_defconfig +0
-0
configs/j7200_evm_r5_defconfig CONFIG_SOC_TI=y · line 138
Quoted 5 lines
configs/j7200_evm_r5_defconfig +2
-0@@ -134,6 +134,8 @@ CONFIG_SOC_TI=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_CADENCE_QSPI=y +CONFIG_HAS_CQSPI_REF_CLK=y +CONFIG_CQSPI_REF_CLK=133333333
This clock is configured to 166 MHz via device tree. I would prefer TI platforms to use device tree and not set CONFIG_HAS_CQSPI_REF_CLK at all. The clock _is_ 133 MHz by default but I think it is better if we just return an error when clk_get fails.
Quoted 3 lines
configs/j7200_evm_r5_defconfig +0
-0CONFIG_SYSRESET=y CONFIG_SPL_SYSRESET=y CONFIG_SYSRESET_TI_SCI=y
[...]
drivers/spi/cadence_qspi.c static int cadence_spi_probe(struct udevice *bus) · line 194
Quoted 13 lines
drivers/spi/cadence_qspi.c +3
-1@@ -188,8 +188,10 @@ static int cadence_spi_probe(struct udevice *bus)if (plat->ref_clk_hz ==0 ) { ret =clk_get_by_index (bus,0 , &clk);if (ret) { -#ifdef CONFIG_CQSPI_REF_CLK +#ifdef CONFIG_HAS_CQSPI_REF_CLK plat->ref_clk_hz =CONFIG_CQSPI_REF_CLK ; +#elif defined(CONFIG_ARCH_SOCFPGA ) + plat->ref_clk_hz =cm_get_qspi_controller_clk_hz ();
While you are here, please change all this to use if (IS_ENABLED()) instead.
Quoted 3 lines
drivers/spi/cadence_qspi.c +0
-0#else return ret;#endif
[...]
Signature · 3 lines
Regards, Pratyush Yadav Texas Instruments Inc.
Re: [PATCH 13/25] spi: cadence_qspi: Migrate CONFIG_CQSPI_REF_CLK to Kconfig
Quoted 69 lines · Pratyush Yadav
+Vignesh
Hi Tom,
Quoted 64 lines · Tom Rini
This is a little tricky since SoCFPGA has code to determine this as runtime. Introduce a guard variable for platforms to select if they have a static value to use. Then for
ARCH_SOCFPGA, callcm_get_qspi_controller_clk_hz()and otherwise continue the previous behavior.Cc Jagan Teki <[email protected]>Signed-off-by Tom Rini <[email protected]>--- arch/arm/mach-socfpga/misc_soc64.c | 1 + configs/j7200_evm_a72_defconfig | 2 ++ configs/j7200_evm_r5_defconfig | 2 ++ configs/j721e_evm_a72_defconfig | 2 ++ configs/j721e_evm_r5_defconfig | 2 ++ configs/j721e_hs_evm_a72_defconfig | 2 ++ configs/j721e_hs_evm_r5_defconfig | 2 ++ configs/j721s2_evm_a72_defconfig | 2 ++ configs/j721s2_evm_r5_defconfig | 2 ++ configs/k2g_evm_defconfig | 2 ++ configs/k2g_hs_evm_defconfig | 2 ++ configs/stv0991_defconfig | 2 ++ drivers/spi/Kconfig | 8 ++++++++ drivers/spi/cadence_qspi.c | 4 +++- drivers/spi/cadence_qspi.h | 1 + include/configs/j721e_evm.h | 1 - include/configs/j721s2_evm.h | 1 - include/configs/k2g_evm.h | 4 ---- include/configs/socfpga_common.h | 9 --------- include/configs/socfpga_soc64_common.h | 5 ----- include/configs/stv0991.h | 8 -------- 21 files changed, 35 insertions(+), 29 deletions(-)arch/arm/mach-socfpga/misc_soc64.c +1
-0@@ -16,6 +16,7 @@#include <errno.h> #include <init.h> #include <log.h> +#include <mach/clock_manager.h> DECLARE_GLOBAL_DATA_PTR ;configs/j7200_evm_a72_defconfig +2
-0@@ -173,6 +173,8 @@ CONFIG_SOC_TI=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_CADENCE_QSPI=y +CONFIG_HAS_CQSPI_REF_CLK=y +CONFIG_CQSPI_REF_CLK=133333333 CONFIG_SYSRESET=y CONFIG_SPL_SYSRESET=y CONFIG_SYSRESET_TI_SCI=yconfigs/j7200_evm_r5_defconfig +0
-0@@ -134,6 +134,8 @@ CONFIG_SOC_TI=y CONFIG_SPI=y CONFIG_DM_SPI=y
Quoted 8 lines
configs/j7200_evm_r5_defconfig CONFIG_SOC_TI=y · line 138
Quoted 3 lines
configs/j7200_evm_r5_defconfig +2
-0CONFIG_CADENCE_QSPI=y +CONFIG_HAS_CQSPI_REF_CLK=y +CONFIG_CQSPI_REF_CLK=133333333This clock is configured to 166 MHz via device tree. I would prefer TI platforms to use device tree and not set
CONFIG_HAS_CQSPI_REF_CLKat all. The clock _is_ 133 MHz by default but I think it is better if we just return an error whenclk_getfails.
For these migration patches, it's important to not include functional changes as the same time in case there's problems later on (see for example the SYS_IMMR fix I merged today). So please send a follow-up to this patch or something vs master to disable the current behavior on the TI platforms.
Quoted 4 lines
Quoted 3 lines
configs/j7200_evm_r5_defconfig +0
-0CONFIG_SYSRESET=y CONFIG_SPL_SYSRESET=y CONFIG_SYSRESET_TI_SCI=y[...]
Quoted 16 lines
drivers/spi/cadence_qspi.c static int cadence_spi_probe(struct udevice *bus) · line 194
Quoted 13 lines
drivers/spi/cadence_qspi.c +3
-1@@ -188,8 +188,10 @@ static int cadence_spi_probe(struct udevice *bus)if (plat->ref_clk_hz ==0 ) { ret =clk_get_by_index (bus,0 , &clk);if (ret) { -#ifdef CONFIG_CQSPI_REF_CLK +#ifdef CONFIG_HAS_CQSPI_REF_CLK plat->ref_clk_hz =CONFIG_CQSPI_REF_CLK ; +#elif defined(CONFIG_ARCH_SOCFPGA ) + plat->ref_clk_hz =cm_get_qspi_controller_clk_hz ();While you are here, please change all this to use if (
IS_ENABLED()) instead.
In this case IS_ENABLED() does not increase readibity of the code nor increase static code coverage testing.
Signature · 1 line
Tom
Re: [PATCH 13/25] spi: cadence_qspi: Migrate CONFIG_CQSPI_REF_CLK to Kconfig
Quoted 79 lines · Tom Rini
Quoted 69 lines · Pratyush Yadav
+Vignesh
Hi Tom,
Quoted 64 lines · Tom Rini
This is a little tricky since SoCFPGA has code to determine this as runtime. Introduce a guard variable for platforms to select if they have a static value to use. Then for
ARCH_SOCFPGA, callcm_get_qspi_controller_clk_hz()and otherwise continue the previous behavior.Cc Jagan Teki <[email protected]>Signed-off-by Tom Rini <[email protected]>--- arch/arm/mach-socfpga/misc_soc64.c | 1 + configs/j7200_evm_a72_defconfig | 2 ++ configs/j7200_evm_r5_defconfig | 2 ++ configs/j721e_evm_a72_defconfig | 2 ++ configs/j721e_evm_r5_defconfig | 2 ++ configs/j721e_hs_evm_a72_defconfig | 2 ++ configs/j721e_hs_evm_r5_defconfig | 2 ++ configs/j721s2_evm_a72_defconfig | 2 ++ configs/j721s2_evm_r5_defconfig | 2 ++ configs/k2g_evm_defconfig | 2 ++ configs/k2g_hs_evm_defconfig | 2 ++ configs/stv0991_defconfig | 2 ++ drivers/spi/Kconfig | 8 ++++++++ drivers/spi/cadence_qspi.c | 4 +++- drivers/spi/cadence_qspi.h | 1 + include/configs/j721e_evm.h | 1 - include/configs/j721s2_evm.h | 1 - include/configs/k2g_evm.h | 4 ---- include/configs/socfpga_common.h | 9 --------- include/configs/socfpga_soc64_common.h | 5 ----- include/configs/stv0991.h | 8 -------- 21 files changed, 35 insertions(+), 29 deletions(-)arch/arm/mach-socfpga/misc_soc64.c +1
-0@@ -16,6 +16,7 @@#include <errno.h> #include <init.h> #include <log.h> +#include <mach/clock_manager.h> DECLARE_GLOBAL_DATA_PTR ;configs/j7200_evm_a72_defconfig +2
-0@@ -173,6 +173,8 @@ CONFIG_SOC_TI=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_CADENCE_QSPI=y +CONFIG_HAS_CQSPI_REF_CLK=y +CONFIG_CQSPI_REF_CLK=133333333 CONFIG_SYSRESET=y CONFIG_SPL_SYSRESET=y CONFIG_SYSRESET_TI_SCI=yconfigs/j7200_evm_r5_defconfig +0
-0@@ -134,6 +134,8 @@ CONFIG_SOC_TI=y CONFIG_SPI=y CONFIG_DM_SPI=yQuoted 8 lines
configs/j7200_evm_r5_defconfig CONFIG_SOC_TI=y · line 138
Quoted 3 lines
configs/j7200_evm_r5_defconfig +2
-0CONFIG_CADENCE_QSPI=y +CONFIG_HAS_CQSPI_REF_CLK=y +CONFIG_CQSPI_REF_CLK=133333333This clock is configured to 166 MHz via device tree. I would prefer TI platforms to use device tree and not set
CONFIG_HAS_CQSPI_REF_CLKat all. The clock _is_ 133 MHz by default but I think it is better if we just return an error whenclk_getfails.
Quoted 5 lines
For these migration patches, it's important to not include functional changes as the same time in case there's problems later on (see for example the
SYS_IMMRfix I merged today). So please send a follow-up to this patch or something vs master to disable the current behavior on the TI platforms.
Okay. Makes sense.
Quoted 22 lines
Quoted 5 lines
Quoted 4 lines
configs/j7200_evm_r5_defconfig +0
-0CONFIG_SYSRESET=y CONFIG_SPL_SYSRESET=y CONFIG_SYSRESET_TI_SCI=y[...]
Quoted 16 lines
drivers/spi/cadence_qspi.c static int cadence_spi_probe(struct udevice *bus) · line 194
Quoted 13 lines
drivers/spi/cadence_qspi.c +3
-1@@ -188,8 +188,10 @@ static int cadence_spi_probe(struct udevice *bus)if (plat->ref_clk_hz ==0 ) { ret =clk_get_by_index (bus,0 , &clk);if (ret) { -#ifdef CONFIG_CQSPI_REF_CLK +#ifdef CONFIG_HAS_CQSPI_REF_CLK plat->ref_clk_hz =CONFIG_CQSPI_REF_CLK ; +#elif defined(CONFIG_ARCH_SOCFPGA ) + plat->ref_clk_hz =cm_get_qspi_controller_clk_hz ();While you are here, please change all this to use if (
IS_ENABLED()) instead.
Quoted 2 lines
In this case
IS_ENABLED()does not increase readibity of the code nor increase static code coverage testing.
I disagree. I think it definitely improves readibity. In general I find IS_ENABLED() is easier to read compared to ifdefs because the if-else flow feels more natural than the ifdef-elif flow, which has weird indentation.
Signature · 3 lines
Regards, Pratyush Yadav Texas Instruments Inc.
PATCH v2 13/25 spi: cadence_qspi: Migrate CONFIG_CQSPI_REF_CLK to Kconfig
In reply to Tom RiniThis is a little tricky since SoCFPGA has code to determine this as runtime. Introduce a guard variable for platforms to select if they have a static value to use. Then for ARCH_SOCFPGA, call cm_get_qspi_controller_clk_hz() and otherwise continue the previous behavior.
---
Changes in v2:
- Use IS_ENABLED(...) per Pratyush
--- arch/arm/mach-socfpga/misc_soc64.c | 1 + configs/j7200_evm_a72_defconfig | 2 ++ configs/j7200_evm_r5_defconfig | 2 ++ configs/j721e_evm_a72_defconfig | 2 ++ configs/j721e_evm_r5_defconfig | 2 ++ configs/j721e_hs_evm_a72_defconfig | 2 ++ configs/j721e_hs_evm_r5_defconfig | 2 ++ configs/j721s2_evm_a72_defconfig | 2 ++ configs/j721s2_evm_r5_defconfig | 2 ++ configs/k2g_evm_defconfig | 2 ++ configs/k2g_hs_evm_defconfig | 2 ++ configs/stv0991_defconfig | 2 ++ drivers/spi/Kconfig | 8 ++++++++ drivers/spi/cadence_qspi.c | 11 ++++++----- drivers/spi/cadence_qspi.h | 1 + include/configs/j721e_evm.h | 1 - include/configs/j721s2_evm.h | 1 - include/configs/k2g_evm.h | 4 ---- include/configs/socfpga_common.h | 9 --------- include/configs/socfpga_soc64_common.h | 5 ----- include/configs/stv0991.h | 8 -------- 21 files changed, 38 insertions(+), 33 deletions(-)
arch/arm/mach-socfpga/misc_soc64.c +1 -0
@@ -16,6 +16,7 @@#include <errno.h> #include <init.h> #include <log.h> +#include <mach/clock_manager.h> DECLARE_GLOBAL_DATA_PTR ;
configs/j7200_evm_a72_defconfig +2 -0
@@ -173,6 +173,8 @@ CONFIG_SOC_TI=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_CADENCE_QSPI=y +CONFIG_HAS_CQSPI_REF_CLK=y +CONFIG_CQSPI_REF_CLK=133333333 CONFIG_SYSRESET=y CONFIG_SPL_SYSRESET=y CONFIG_SYSRESET_TI_SCI=y
configs/j7200_evm_r5_defconfig +2 -0
@@ -134,6 +134,8 @@ CONFIG_SOC_TI=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_CADENCE_QSPI=y +CONFIG_HAS_CQSPI_REF_CLK=y +CONFIG_CQSPI_REF_CLK=133333333 CONFIG_SYSRESET=y CONFIG_SPL_SYSRESET=y CONFIG_SYSRESET_TI_SCI=y
configs/j721e_evm_a72_defconfig +2 -0
@@ -173,6 +173,8 @@ CONFIG_SOC_TI=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_CADENCE_QSPI=y +CONFIG_HAS_CQSPI_REF_CLK=y +CONFIG_CQSPI_REF_CLK=133333333 CONFIG_SYSRESET=y CONFIG_SPL_SYSRESET=y CONFIG_SYSRESET_TI_SCI=y
configs/j721e_evm_r5_defconfig +2 -0
@@ -127,6 +127,8 @@ CONFIG_SOC_TI=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_CADENCE_QSPI=y +CONFIG_HAS_CQSPI_REF_CLK=y +CONFIG_CQSPI_REF_CLK=133333333 CONFIG_SYSRESET=y CONFIG_SPL_SYSRESET=y CONFIG_SYSRESET_TI_SCI=y
configs/j721e_hs_evm_a72_defconfig +2 -0
@@ -145,6 +145,8 @@ CONFIG_SOC_TI=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_CADENCE_QSPI=y +CONFIG_HAS_CQSPI_REF_CLK=y +CONFIG_CQSPI_REF_CLK=133333333 CONFIG_SYSRESET=y CONFIG_SPL_SYSRESET=y CONFIG_SYSRESET_TI_SCI=y
configs/j721e_hs_evm_r5_defconfig +2 -0
@@ -114,6 +114,8 @@ CONFIG_SOC_TI=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_CADENCE_QSPI=y +CONFIG_HAS_CQSPI_REF_CLK=y +CONFIG_CQSPI_REF_CLK=133333333 CONFIG_SYSRESET=y CONFIG_SPL_SYSRESET=y CONFIG_SYSRESET_TI_SCI=y
configs/j721s2_evm_a72_defconfig +2 -0
@@ -181,6 +181,8 @@ CONFIG_SOC_TI=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_CADENCE_QSPI=y +CONFIG_HAS_CQSPI_REF_CLK=y +CONFIG_CQSPI_REF_CLK=133333333 CONFIG_SYSRESET=y CONFIG_SPL_SYSRESET=y CONFIG_SYSRESET_TI_SCI=y
configs/j721s2_evm_r5_defconfig +2 -0
@@ -138,6 +138,8 @@ CONFIG_SOC_TI=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_CADENCE_QSPI=y +CONFIG_HAS_CQSPI_REF_CLK=y +CONFIG_CQSPI_REF_CLK=133333333 CONFIG_SYSRESET=y CONFIG_SPL_SYSRESET=y CONFIG_SYSRESET_TI_SCI=y
configs/k2g_evm_defconfig +2 -0
@@ -89,6 +89,8 @@ CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_CADENCE_QSPI=y +CONFIG_HAS_CQSPI_REF_CLK=y +CONFIG_CQSPI_REF_CLK=384000000 CONFIG_DAVINCI_SPI=y CONFIG_USB=y CONFIG_DM_USB_GADGET=y
configs/k2g_hs_evm_defconfig +2 -0
@@ -73,6 +73,8 @@ CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_CADENCE_QSPI=y +CONFIG_HAS_CQSPI_REF_CLK=y +CONFIG_CQSPI_REF_CLK=384000000 CONFIG_DAVINCI_SPI=y CONFIG_USB=y CONFIG_DM_USB_GADGET=y
configs/stv0991_defconfig +2 -0
@@ -39,3 +39,5 @@ CONFIG_PHY_RESET_DELAY=10000 CONFIG_ETH_DESIGNWARE=y CONFIG_MII=y CONFIG_CADENCE_QSPI=y +CONFIG_HAS_CQSPI_REF_CLK=y +CONFIG_CQSPI_REF_CLK=3000000
drivers/spi/Kconfig +8 -0
@@ -128,6 +128,14 @@ config CADENCE_QSPI used to access the SPI NOR flash on platforms embedding this Cadence IP core. +config HAS_CQSPI_REF_CLK + bool "Cadence QSPI static reference clock" + depends on CADENCE_QSPI + +config CQSPI_REF_CLK + int "Cadence QSPI reference clock value in Hz" + depends on HAS_CQSPI_REF_CLK + config CF_SPI bool "ColdFire SPI driver" help
drivers/spi/cadence_qspi.c +6 -5
@@ -188,11 +188,12 @@ static int cadence_spi_probe(struct udevice *bus)if (plat->ref_clk_hz ==0 ) { ret =clk_get_by_index (bus,0 , &clk);if (ret) { -#ifdef CONFIG_CQSPI_REF_CLK - plat->ref_clk_hz =CONFIG_CQSPI_REF_CLK ; -#else -return ret; -#endif +if (IS_ENABLED (CONFIG_HAS_CQSPI_REF_CLK )) + plat->ref_clk_hz =CONFIG_CQSPI_REF_CLK ; +else if (IS_ENABLED (CONFIG_ARCH_SOCFPGA )) + plat->ref_clk_hz =cm_get_qspi_controller_clk_hz (); +else +return ret; }else { plat->ref_clk_hz =clk_get_rate (&clk);clk_free (&clk);
drivers/spi/cadence_qspi.h +1 -0
@@ -95,5 +95,6 @@ void cadence_qspi_apb_delay(void *reg_base,void cadence_qspi_apb_enter_xip (void *reg_base,char xip_dummy);void cadence_qspi_apb_readdata_capture (void *reg_base,unsigned int bypass,unsigned int delay); +unsigned int cm_get_qspi_controller_clk_hz (void );#endif /* __CADENCE_QSPI_H__ */
include/configs/j721e_evm.h +0 -1
@@ -57,7 +57,6 @@#define CONFIG_SPL_MAX_SIZE CONFIG_SYS_K3_MAX_DOWNLODABLE_IMAGE_SIZE#define CONFIG_SYS_BOOTM_LEN SZ_64M -#define CONFIG_CQSPI_REF_CLK 133333333/* HyperFlash related configuration */
include/configs/j721s2_evm.h +0 -1
@@ -58,7 +58,6 @@#define CONFIG_SPL_MAX_SIZE CONFIG_SYS_K3_MAX_DOWNLODABLE_IMAGE_SIZE#define CONFIG_SYS_BOOTM_LEN SZ_64M -#define CONFIG_CQSPI_REF_CLK 133333333/* U-Boot general configuration */ #define EXTRA_ENV_J721S2_BOARD_SETTINGS \
include/configs/k2g_evm.h +0 -4
@@ -59,10 +59,6 @@#define CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE #define PHY_ANEG_TIMEOUT 10000/* PHY needs longer aneg time */ -#ifndef CONFIG_SPL_BUILD -#define CONFIG_CQSPI_REF_CLK 384000000 -#endif -#define SPI_MTD_PARTS KEYSTONE_SPI1_MTD_PARTS#include <configs/ti_armv7_keystone2.h>
include/configs/socfpga_common.h +0 -9
@@ -121,15 +121,6 @@#define CONFIG_SYS_NAND_DATA_BASE SOCFPGA_NANDDATA_ADDRESS#endif -/* -* QSPI support -*/ -/* QSPI reference clock */ -#ifndef __ASSEMBLY__ -unsigned int cm_get_qspi_controller_clk_hz (void ); -#define CONFIG_CQSPI_REF_CLK cm_get_qspi_controller_clk_hz() -#endif -/* * USB */
include/configs/socfpga_soc64_common.h +0 -5
@@ -61,11 +61,6 @@#define MTDIDS_DEFAULT "nor0=ff705000.spi.0"#endif /* CONFIG_SPL_BUILD */ -#ifndef __ASSEMBLY__ -unsigned int cm_get_qspi_controller_clk_hz (void ); -#define CONFIG_CQSPI_REF_CLK cm_get_qspi_controller_clk_hz() -#endif -#endif /* CONFIG_CADENCE_QSPI */ /*
include/configs/stv0991.h +0 -8
@@ -31,12 +31,4 @@/* Misc configuration */ -/* -+ * QSPI support -+ */ -#ifdef CONFIG_OF_CONTROL /* QSPI is controlled via DT */ -#define CONFIG_CQSPI_REF_CLK ((30/4)/2)*1000*1000 - -#endif -#endif /* __CONFIG_H */
Signature · 1 line
2.25.1
Re: [v2 13/25] spi: cadence_qspi: Migrate CONFIG_CQSPI_REF_CLK to Kconfig
Quoted 11 lines · Tom Rini
This is a little tricky since SoCFPGA has code to determine this as runtime. Introduce a guard variable for platforms to select if they have a static value to use. Then for
ARCH_SOCFPGA, callcm_get_qspi_controller_clk_hz()and otherwise continue the previous behavior.Cc Jagan Teki <[email protected]>Signed-off-by Tom Rini <[email protected]>---
Changes in v2:
- UseIS_ENABLED(...)per Pratyush
Thanks.
For J721E, J7200, J721S2, and cadence_qspi
[...]
Signature · 3 lines
Regards, Pratyush Yadav Texas Instruments Inc.
Re: [v2 13/25] spi: cadence_qspi: Migrate CONFIG_CQSPI_REF_CLK to Kconfig
In reply to Tom RiniQuoted 8 lines · Tom Rini
This is a little tricky since SoCFPGA has code to determine this as runtime. Introduce a guard variable for platforms to select if they have a static value to use. Then for
ARCH_SOCFPGA, callcm_get_qspi_controller_clk_hz()and otherwise continue the previous behavior.Cc Jagan Teki <[email protected]>Signed-off-by Tom Rini <[email protected]>
OK, so there's a problem with using IS_ENABLED(..) which is that we get a failure to build in the not-enabled case over CONFIG_CQSPI_REF_CLK being unset. And then we can't use if (CONFIG_VAL(..)) because we then run in to needing it to exist for SPL as well. I'm going to go back to v1 of this particular patch.
Signature · 1 line
Tom
Re: [v2 13/25] spi: cadence_qspi: Migrate CONFIG_CQSPI_REF_CLK to Kconfig
Quoted 8 lines · Tom Rini
Quoted 6 lines · Tom Rini
This is a little tricky since SoCFPGA has code to determine this as runtime. Introduce a guard variable for platforms to select if they have a static value to use. Then for
ARCH_SOCFPGA, callcm_get_qspi_controller_clk_hz()and otherwise continue the previous behavior.
Quoted 8 lines
Quoted 2 lines
Cc Jagan Teki <[email protected]>Signed-off-by Tom Rini <[email protected]>OK, so there's a problem with using
IS_ENABLED(..)which is that we get a failure to build in the not-enabled case overCONFIG_CQSPI_REF_CLKbeing unset. And then we can't use if (CONFIG_VAL(..)) because we then run in to needing it to exist for SPL as well. I'm going to go back to v1 of this particular patch.
Interesting! I remember trying the IS_ENABLED() thing a while back, and I remember it working fine when the functions don't exist if the config is not enabled. I figured that was because of the compiler eliminating dead code. But I think here it is the preprocessor raising the error and maybe it is not so smart. Dunno.
Anyway, I am fine with reverting this to v1 for now. I'll try to look at it later if I ever get some time to spare.
Signature · 3 lines
Regards, Pratyush Yadav Texas Instruments Inc.
Re: [v2 13/25] spi: cadence_qspi: Migrate CONFIG_CQSPI_REF_CLK to Kconfig
Quoted 18 lines · Pratyush Yadav
Quoted 8 lines · Tom Rini
Quoted 6 lines · Tom Rini
This is a little tricky since SoCFPGA has code to determine this as runtime. Introduce a guard variable for platforms to select if they have a static value to use. Then for
ARCH_SOCFPGA, callcm_get_qspi_controller_clk_hz()and otherwise continue the previous behavior.Quoted 8 lines
Quoted 2 lines
Cc Jagan Teki <[email protected]>Signed-off-by Tom Rini <[email protected]>OK, so there's a problem with using
IS_ENABLED(..)which is that we get a failure to build in the not-enabled case overCONFIG_CQSPI_REF_CLKbeing unset. And then we can't use if (CONFIG_VAL(..)) because we then run in to needing it to exist for SPL as well. I'm going to go back to v1 of this particular patch.
Quoted 8 lines
Interesting! I remember trying the
IS_ENABLED()thing a while back, and I remember it working fine when the functions don't exist if the config is not enabled. I figured that was because of the compiler eliminating dead code. But I think here it is the preprocessor raising the error and maybe it is not so smart. Dunno.Anyway, I am fine with reverting this to v1 for now. I'll try to look at it later if I ever get some time to spare.
Right, dead code elimination works fine since it's a reference to function that's never called so we don't fail to link. But if we don't have a static value available, it fails to compile outright. And there wasn't a clean way I could see to use a default of 0 and have it work. But the final part was that it was TI platforms, and I think just 2 others, that even set a static value here and you said TI ones should just not set the value. So I think the next reasonable clean-up might be to just drop the static value case (and cc the board maintainers for the other users), and only support the SoCFPGA one as being special.
Signature · 1 line
Tom
Re: [PATCH 13/25] spi: cadence_qspi: Migrate CONFIG_CQSPI_REF_CLK to Kconfig
In reply to Tom RiniQuoted 8 lines · Tom Rini
This is a little tricky since SoCFPGA has code to determine this as runtime. Introduce a guard variable for platforms to select if they have a static value to use. Then for
ARCH_SOCFPGA, callcm_get_qspi_controller_clk_hz()and otherwise continue the previous behavior.Cc Jagan Teki <[email protected]>Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH 14/25 controlcenterdc: Migrate CUSTOMER_BOARD_SUPPORT to Kconfig
In reply to Tom RiniThis symbol is only possibly useful on some mvebu platforms, so move the symbol there and select it for the only current user.
--- arch/arm/mach-mvebu/Kconfig | 4 ++++ include/configs/controlcenterdc.h | 5 ----- 2 files changed, 4 insertions(+), 5 deletions(-)
arch/arm/mach-mvebu/Kconfig +4 -0
@@ -90,6 +90,9 @@ config 88F6820 bool select ARMADA_38X +config CUSTOMER_BOARD_SUPPORT + bool + choice prompt "Armada XP/375/38x/3700/7K/8K board select" optional
@@ -173,6 +176,7 @@ config TARGET_THEADORABLE config TARGET_CONTROLCENTERDC bool "Support CONTROLCENTERDC" select 88F6820 + select CUSTOMER_BOARD_SUPPORT config TARGET_X530 bool "Support Allied Telesis x530"
include/configs/controlcenterdc.h +0 -5
@@ -7,11 +7,6 @@#ifndef _CONFIG_CONTROLCENTERDC_H#define _CONFIG_CONTROLCENTERDC_H -/* -* High Level Configuration Options (easy to change) -*/ -#define CONFIG_CUSTOMER_BOARD_SUPPORT -/* * TEXT_BASE needs to be below 16MiB, since this area is scrubbed * for DDR ECC byte filling in the SPL before loading the main
Signature · 1 line
2.25.1
Re: [PATCH 14/25] controlcenterdc: Migrate CUSTOMER_BOARD_SUPPORT to Kconfig
Quoted 6 lines · Tom Rini
This symbol is only possibly useful on some mvebu platforms, so move the symbol there and select it for the only current user.
Cc Mario Six <[email protected]>Cc Stefan Roese <[email protected]>Signed-off-by Tom Rini <[email protected]>
Thanks,
Stefan
Quoted 33 lines
--- arch/arm/mach-mvebu/Kconfig | 4 ++++ include/configs/controlcenterdc.h | 5 ----- 2 files changed, 4 insertions(+), 5 deletions(-)arch/arm/mach-mvebu/Kconfig +4
-0@@ -90,6 +90,9 @@ config 88F6820 bool select ARMADA_38X +config CUSTOMER_BOARD_SUPPORT + bool + choice prompt "Armada XP/375/38x/3700/7K/8K board select" optional@@ -173,6 +176,7 @@ config TARGET_THEADORABLE config TARGET_CONTROLCENTERDC bool "Support CONTROLCENTERDC" select 88F6820 + select CUSTOMER_BOARD_SUPPORT config TARGET_X530 bool "Support Allied Telesis x530"include/configs/controlcenterdc.h +0
-0@@ -7,11 +7,6 @@#ifndef _CONFIG_CONTROLCENTERDC_H
include/configs/controlcenterdc.h line 12
Quoted 10 lines
include/configs/controlcenterdc.h +0
-5#define _CONFIG_CONTROLCENTERDC_H -/* -* High Level Configuration Options (easy to change) -*/ -#define CONFIG_CUSTOMER_BOARD_SUPPORT -/* * TEXT_BASE needs to be below 16MiB, since this area is scrubbed * for DDR ECC byte filling in the SPL before loading the main
Viele Grüße,
Stefan Roese
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]
Re: [PATCH 14/25] controlcenterdc: Migrate CUSTOMER_BOARD_SUPPORT to Kconfig
In reply to Tom RiniQuoted 7 lines · Tom Rini
This symbol is only possibly useful on some mvebu platforms, so move the symbol there and select it for the only current user.
Cc Mario Six <[email protected]>Cc Stefan Roese <[email protected]>Signed-off-by Tom Rini <[email protected]>Reviewed-by Stefan Roese <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH 15/25 tegra: Drop CONFIG_CHROMEOS_EXTRA_ENV_SETTINGS
In reply to Tom RiniThis is not currently set by any boards, so drop.
--- include/configs/tegra-common-post.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
include/configs/tegra-common-post.h +1 -6
@@ -70,10 +70,6 @@#define BOARD_EXTRA_ENV_SETTINGS #endif -#ifndef CONFIG_CHROMEOS_EXTRA_ENV_SETTINGS -#define CONFIG_CHROMEOS_EXTRA_ENV_SETTINGS -#endif -#ifdef CONFIG_ARM64 #define FDT_HIGH "ffffffffffffffff"#define INITRD_HIGH "ffffffffffffffff"
@@ -88,8 +84,7 @@"fdt_high=" FDT_HIGH "\0" \"initrd_high=" INITRD_HIGH "\0" \BOOTENV \ -BOARD_EXTRA_ENV_SETTINGS \ - CONFIG_CHROMEOS_EXTRA_ENV_SETTINGS + BOARD_EXTRA_ENV_SETTINGS#if defined(CONFIG_TEGRA20_SFLASH ) || defined(CONFIG_TEGRA20_SLINK ) || defined(CONFIG_TEGRA114_SPI )#define CONFIG_TEGRA_SPI
Signature · 1 line
2.25.1
Re: [PATCH 15/25] tegra: Drop CONFIG_CHROMEOS_EXTRA_ENV_SETTINGS
Quoted 3 lines · Tom Rini
This is not currently set by any boards, so drop.
Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH 16/25 microblaze: Migrate DCACHE/ICACHE to Kconfig
In reply to Tom RiniMove these two options to the arch Kconfig file.
--- arch/microblaze/Kconfig | 8 ++++++++ include/configs/microblaze-generic.h | 3 --- 2 files changed, 8 insertions(+), 3 deletions(-)
arch/microblaze/Kconfig +8 -0
@@ -25,6 +25,14 @@ config TARGET_MICROBLAZE_GENERIC endchoice +config DCACHE + bool "Enable dcache support" + default y + +config ICACHE + bool "Enable icache support" + default y + source "board/xilinx/Kconfig" source "board/xilinx/microblaze-generic/Kconfig"
include/configs/microblaze-generic.h +0 -3
@@ -30,9 +30,6 @@# define CONFIG_SYS_MAX_FLASH_SECT 2048#endif -#define CONFIG_ICACHE -#define CONFIG_DCACHE -#ifndef XILINX_DCACHE_BYTE_SIZE #define XILINX_DCACHE_BYTE_SIZE 32768#endif
Signature · 1 line
2.25.1
Re: [PATCH 16/25] microblaze: Migrate DCACHE/ICACHE to Kconfig
Quoted 33 lines · Tom Rini
Move these two options to the arch
Kconfigfile.Cc Michal Simek <[email protected]>Signed-off-by Tom Rini <[email protected]>--- arch/microblaze/Kconfig | 8 ++++++++ include/configs/microblaze-generic.h | 3 --- 2 files changed, 8 insertions(+), 3 deletions(-)arch/microblaze/Kconfig +8
-0@@ -25,6 +25,14 @@ config TARGET_MICROBLAZE_GENERIC endchoice +config DCACHE + bool "Enable dcache support" + default y + +config ICACHE + bool "Enable icache support" + default y + source "board/xilinx/Kconfig" source "board/xilinx/microblaze-generic/Kconfig"include/configs/microblaze-generic.h +0
-0
include/configs/microblaze-generic.h line 35
Quoted 9 lines
include/configs/microblaze-generic.h +0
-3@@ -30,9 +30,6 @@# define CONFIG_SYS_MAX_FLASH_SECT 2048#endif -#define CONFIG_ICACHE -#define CONFIG_DCACHE -#ifndef XILINX_DCACHE_BYTE_SIZE #define XILINX_DCACHE_BYTE_SIZE 32768#endif
Thanks,
Michal
Re: [PATCH 16/25] microblaze: Migrate DCACHE/ICACHE to Kconfig
In reply to Tom RiniQuoted 5 lines · Tom Rini
Move these two options to the arch
Kconfigfile.Cc Michal Simek <[email protected]>Signed-off-by Tom Rini <[email protected]>Acked-by Michal Simek <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH 17/25 ls1021atwr: Use DEBUG and not CONFIG_DEBUG
In reply to Tom RiniWe use 'DEBUG' and not 'CONFIG_DEBUG' tree-wide for debug code that is left in, and not wrapped by some other regular debugging type print macro.
--- board/freescale/ls1021atwr/ls1021atwr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
board/freescale/ls1021atwr/ls1021atwr.c +1 -1
@@ -107,7 +107,7 @@ static void cpld_show(void)in_8 (&cpld_data->pcba_ver) &VERSION_MASK , in_8(&cpld_data->vbank) & BANK_MASK); -#ifdef CONFIG_DEBUG +#ifdef DEBUG printf ("soft_mux_on =%x\n" ,in_8 (&cpld_data->soft_mux_on)); printf("cfg_rcw_src1 =%x\n",
Signature · 1 line
2.25.1
Re: [PATCH 17/25] ls1021atwr: Use DEBUG and not CONFIG_DEBUG
Quoted 6 lines · Tom Rini
We use 'DEBUG' and not '
CONFIG_DEBUG' tree-wide for debug code that is left in, and not wrapped by some other regular debugging type print macro.Cc Alison Wang <[email protected]>Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH 18/25 nds32: Migrate CONFIG_DEBUG_LED to Kconfig
In reply to Tom RiniMove this value to the board Kconfig file.
--- arch/nds32/include/asm/arch-ag101/ag101.h | 3 --- arch/nds32/include/asm/arch-ag102/ag102.h | 2 -- board/AndesTech/adp-ag101p/Kconfig | 4 ++++ 3 files changed, 4 insertions(+), 5 deletions(-)
arch/nds32/include/asm/arch-ag101/ag101.h +0 -3
@@ -43,9 +43,6 @@/* External AHB slave2 (FUSBH200) */ #define CONFIG_EXT_AHBSLAVE02_BASE 0x92000000 -/* DEBUG LED */ -#define CONFIG_DEBUG_LED 0x902FFFFC -/* APB Device definitions */ /* Power Management Unit */
arch/nds32/include/asm/arch-ag102/ag102.h +0 -2
@@ -72,8 +72,6 @@/* PWM - Pulse Width Modulator Controller */ #define CONFIG_FTPWM010_BASE 0x94F00000 -/* Debug LED */ -#define CONFIG_DEBUG_LED 0x902FFFFC/* Power Management Unit */ #define CONFIG_FTPMU010_BASE 0x98100000
board/AndesTech/adp-ag101p/Kconfig +4 -0
@@ -1,5 +1,9 @@ if TARGET_ADP_AG101P +config DEBUG_LED + hex + default 0x902FFFFC + config SYS_CPU default "n1213"
Signature · 1 line
2.25.1
Re: [PATCH 18/25] nds32: Migrate CONFIG_DEBUG_LED to Kconfig
Quoted 3 lines · Tom Rini
Move this value to the board
Kconfigfile.Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH 19/25 powerpc: mpc83xx: Migrate DEFAULT_IMMR to Kconfig
In reply to Tom RiniAs no platforms override this value, set it for all mpc83xx platforms.
--- arch/powerpc/cpu/mpc83xx/Kconfig | 4 ++++ include/mpc83xx.h | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-)
arch/powerpc/cpu/mpc83xx/Kconfig +4 -0
@@ -1,6 +1,10 @@ menu "mpc83xx CPU" depends on MPC83xx +config DEFAULT_IMMR + hex + default 0xFF400000 + config E300 def_bool y
include/mpc83xx.h +0 -4
@@ -21,10 +21,6 @@/* * IMMRBAR - Internal Memory Register Base Address */ -#ifndef CONFIG_DEFAULT_IMMR -/* Default IMMR base address */ -#define CONFIG_DEFAULT_IMMR 0xFF400000 -#endif /* Register offset to immr */ #define IMMRBAR 0x0000#define IMMRBAR_BASE_ADDR 0xFFF00000/* Base addr. mask */
Signature · 1 line
2.25.1
Re: [PATCH 19/25] powerpc: mpc83xx: Migrate DEFAULT_IMMR to Kconfig
Quoted 5 lines · Tom Rini
As no platforms override this value, set it for all mpc83xx platforms.
Cc Mario Six <[email protected]>Cc Wolfgang Denk <[email protected]>Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH 20/25 galileo: Remove CONFIG_DESIGNWARE_ETH reference
In reply to Tom RiniThis platform has CONFIG_ETH_DESIGNWARE set already, which is the correct value for the driver in question. Remove this incorrect line.
--- include/configs/galileo.h | 1 - 1 file changed, 1 deletion(-)
include/configs/galileo.h +0 -1
@@ -22,7 +22,6 @@"stderr=serial\0" /* 10/100M Ethernet support */ -#define CONFIG_DESIGNWARE_ETH #define CONFIG_DW_ALTDESCRIPTOR/* Environment configuration */
Signature · 1 line
2.25.1
Re: [PATCH 20/25] galileo: Remove CONFIG_DESIGNWARE_ETH reference
Quoted 4 lines · Tom Rini
This platform has
CONFIG_ETH_DESIGNWAREset already, which is the correct value for the driver in question. Remove this incorrect line.Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH 21/25 Convert CONFIG_DIMM_SLOTS_PER_CTLR to Kconfig
In reply to Tom RiniThis converts the following to Kconfig:
CONFIG_DIMM_SLOTS_PER_CTLR
--- configs/T2080QDS_NAND_defconfig | 1 + configs/T2080QDS_SDCARD_defconfig | 1 + configs/T2080QDS_SECURE_BOOT_defconfig | 1 + configs/T2080QDS_SPIFLASH_defconfig | 1 + configs/T2080QDS_SRIO_PCIE_BOOT_defconfig | 1 + configs/T2080QDS_defconfig | 1 + configs/ls1028aqds_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1028aqds_tfa_defconfig | 1 + configs/ls1028aqds_tfa_lpuart_defconfig | 1 + configs/ls2080aqds_SECURE_BOOT_defconfig | 1 + configs/ls2080aqds_defconfig | 1 + configs/ls2080aqds_nand_defconfig | 1 + configs/ls2080aqds_qspi_defconfig | 1 + configs/ls2080aqds_sdcard_defconfig | 1 + configs/ls2080ardb_SECURE_BOOT_defconfig | 1 + configs/ls2080ardb_defconfig | 1 + configs/ls2080ardb_nand_defconfig | 1 + configs/ls2081ardb_defconfig | 1 + configs/ls2088aqds_tfa_defconfig | 1 + configs/ls2088ardb_qspi_SECURE_BOOT_defconfig | 1 + configs/ls2088ardb_qspi_defconfig | 1 + configs/ls2088ardb_tfa_SECURE_BOOT_defconfig | 1 + configs/ls2088ardb_tfa_defconfig | 1 + configs/lx2160aqds_tfa_SECURE_BOOT_defconfig | 1 + configs/lx2160aqds_tfa_defconfig | 1 + configs/lx2160ardb_tfa_SECURE_BOOT_defconfig | 1 + configs/lx2160ardb_tfa_defconfig | 1 + configs/lx2160ardb_tfa_stmm_defconfig | 1 + configs/lx2162aqds_tfa_SECURE_BOOT_defconfig | 1 + configs/lx2162aqds_tfa_defconfig | 1 + configs/lx2162aqds_tfa_verified_boot_defconfig | 1 + drivers/ddr/fsl/Kconfig | 4 ++++ include/configs/MPC8548CDS.h | 2 -- include/configs/P1010RDB.h | 2 -- include/configs/P2041RDB.h | 2 -- include/configs/T102xRDB.h | 1 - include/configs/T104xRDB.h | 2 -- include/configs/T208xQDS.h | 1 - include/configs/T208xRDB.h | 1 - include/configs/T4240RDB.h | 2 -- include/configs/corenet_ds.h | 2 -- include/configs/km/pg-wcom-ls102xa.h | 2 -- include/configs/kmcent2.h | 2 -- include/configs/kontron_sl28.h | 1 - include/configs/ls1012a2g5rdb.h | 1 - include/configs/ls1012afrdm.h | 1 - include/configs/ls1012afrwy.h | 1 - include/configs/ls1012aqds.h | 1 - include/configs/ls1012ardb.h | 1 - include/configs/ls1021aqds.h | 1 - include/configs/ls1028aqds.h | 3 --- include/configs/ls1028ardb.h | 2 -- include/configs/ls1043aqds.h | 1 - include/configs/ls1043ardb.h | 1 - include/configs/ls1046afrwy.h | 2 -- include/configs/ls1046aqds.h | 1 - include/configs/ls1046ardb.h | 1 - include/configs/ls1088aqds.h | 2 -- include/configs/ls1088ardb.h | 1 - include/configs/ls2080aqds.h | 1 - include/configs/ls2080ardb.h | 1 - include/configs/lx2160a_common.h | 1 - include/configs/p1_p2_rdb_pc.h | 2 -- include/configs/socrates.h | 2 -- include/configs/ten64.h | 2 -- scripts/config_whitelist.txt | 1 - 66 files changed, 35 insertions(+), 50 deletions(-)
configs/T2080QDS_NAND_defconfig +1 -0
@@ -63,6 +63,7 @@ CONFIG_DM=y CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y +CONFIG_DIMM_SLOTS_PER_CTLR=2 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_DM_I2C=y
configs/T2080QDS_SDCARD_defconfig +1 -0
@@ -61,6 +61,7 @@ CONFIG_DM=y CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y +CONFIG_DIMM_SLOTS_PER_CTLR=2 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_DM_I2C=y
configs/T2080QDS_SECURE_BOOT_defconfig +1 -0
@@ -46,6 +46,7 @@ CONFIG_ETHPRIME="FM1@DTSEC3" CONFIG_DM=y CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_DYNAMIC_DDR_CLK_FREQ=y +CONFIG_DIMM_SLOTS_PER_CTLR=2 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_DM_I2C=y
configs/T2080QDS_SPIFLASH_defconfig +1 -0
@@ -64,6 +64,7 @@ CONFIG_DM=y CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y +CONFIG_DIMM_SLOTS_PER_CTLR=2 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_DM_I2C=y
configs/T2080QDS_SRIO_PCIE_BOOT_defconfig +1 -0
@@ -44,6 +44,7 @@ CONFIG_DM=y CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y +CONFIG_DIMM_SLOTS_PER_CTLR=2 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_DM_I2C=y
configs/T2080QDS_defconfig +1 -0
@@ -47,6 +47,7 @@ CONFIG_DM=y CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y +CONFIG_DIMM_SLOTS_PER_CTLR=2 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_DM_I2C=y
configs/ls1028aqds_tfa_SECURE_BOOT_defconfig +1 -0
@@ -49,6 +49,7 @@ CONFIG_SATA=y CONFIG_SCSI_AHCI=y CONFIG_SATA_CEVA=y # CONFIG_DDR_SPD is not set +CONFIG_DIMM_SLOTS_PER_CTLR=2 CONFIG_MPC8XXX_GPIO=y CONFIG_DM_I2C=y CONFIG_I2C_SET_DEFAULT_BUS_NUM=y
configs/ls1028aqds_tfa_defconfig +1 -0
@@ -55,6 +55,7 @@ CONFIG_SCSI_AHCI=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y # CONFIG_DDR_SPD is not set +CONFIG_DIMM_SLOTS_PER_CTLR=2 CONFIG_MPC8XXX_GPIO=y CONFIG_DM_I2C=y CONFIG_I2C_SET_DEFAULT_BUS_NUM=y
configs/ls1028aqds_tfa_lpuart_defconfig +1 -0
@@ -54,6 +54,7 @@ CONFIG_SCSI_AHCI=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y # CONFIG_DDR_SPD is not set +CONFIG_DIMM_SLOTS_PER_CTLR=2 CONFIG_MPC8XXX_GPIO=y CONFIG_DM_I2C=y CONFIG_I2C_SET_DEFAULT_BUS_NUM=y
configs/ls2080aqds_SECURE_BOOT_defconfig +1 -0
@@ -46,6 +46,7 @@ CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y +CONFIG_DIMM_SLOTS_PER_CTLR=2 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_SYS_I2C_LEGACY=y
configs/ls2080aqds_defconfig +1 -0
@@ -49,6 +49,7 @@ CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y +CONFIG_DIMM_SLOTS_PER_CTLR=2 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_SYS_I2C_LEGACY=y
configs/ls2080aqds_nand_defconfig +1 -0
@@ -60,6 +60,7 @@ CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y +CONFIG_DIMM_SLOTS_PER_CTLR=2 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_SYS_I2C_LEGACY=y
configs/ls2080aqds_qspi_defconfig +1 -0
@@ -50,6 +50,7 @@ CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y +CONFIG_DIMM_SLOTS_PER_CTLR=2 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_SYS_I2C_LEGACY=y
configs/ls2080aqds_sdcard_defconfig +1 -0
@@ -56,6 +56,7 @@ CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y +CONFIG_DIMM_SLOTS_PER_CTLR=2 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_SYS_I2C_LEGACY=y
configs/ls2080ardb_SECURE_BOOT_defconfig +1 -0
@@ -50,6 +50,7 @@ CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_DDR_CLK_FREQ=133333333 +CONFIG_DIMM_SLOTS_PER_CTLR=2 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_SYS_I2C_LEGACY=y
configs/ls2080ardb_defconfig +1 -0
@@ -53,6 +53,7 @@ CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y CONFIG_DDR_CLK_FREQ=133333333 +CONFIG_DIMM_SLOTS_PER_CTLR=2 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_SYS_I2C_LEGACY=y
configs/ls2080ardb_nand_defconfig +1 -0
@@ -63,6 +63,7 @@ CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y CONFIG_DDR_CLK_FREQ=133333333 +CONFIG_DIMM_SLOTS_PER_CTLR=2 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_SYS_I2C_LEGACY=y
configs/ls2081ardb_defconfig +1 -0
@@ -52,6 +52,7 @@ CONFIG_SCSI_AHCI=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y CONFIG_DDR_CLK_FREQ=133333333 +CONFIG_DIMM_SLOTS_PER_CTLR=2 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_SYS_I2C_LEGACY=y
configs/ls2088aqds_tfa_defconfig +1 -0
@@ -58,6 +58,7 @@ CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y +CONFIG_DIMM_SLOTS_PER_CTLR=2 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_MPC8XXX_GPIO=y
configs/ls2088ardb_qspi_SECURE_BOOT_defconfig +1 -0
@@ -48,6 +48,7 @@ CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_DDR_CLK_FREQ=133333333 +CONFIG_DIMM_SLOTS_PER_CTLR=2 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_MPC8XXX_GPIO=y
configs/ls2088ardb_qspi_defconfig +1 -0
@@ -55,6 +55,7 @@ CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y CONFIG_DDR_CLK_FREQ=133333333 +CONFIG_DIMM_SLOTS_PER_CTLR=2 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_MPC8XXX_GPIO=y
configs/ls2088ardb_tfa_SECURE_BOOT_defconfig +1 -0
@@ -53,6 +53,7 @@ CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_DDR_CLK_FREQ=133333333 +CONFIG_DIMM_SLOTS_PER_CTLR=2 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_MPC8XXX_GPIO=y
configs/ls2088ardb_tfa_defconfig +1 -0
@@ -60,6 +60,7 @@ CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y CONFIG_DDR_CLK_FREQ=133333333 +CONFIG_DIMM_SLOTS_PER_CTLR=2 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_MPC8XXX_GPIO=y
configs/lx2160aqds_tfa_SECURE_BOOT_defconfig +1 -0
@@ -56,6 +56,7 @@ CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y +CONFIG_DIMM_SLOTS_PER_CTLR=2 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_MPC8XXX_GPIO=y
configs/lx2160aqds_tfa_defconfig +1 -0
@@ -63,6 +63,7 @@ CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y +CONFIG_DIMM_SLOTS_PER_CTLR=2 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_MPC8XXX_GPIO=y
configs/lx2160ardb_tfa_SECURE_BOOT_defconfig +1 -0
@@ -54,6 +54,7 @@ CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y +CONFIG_DIMM_SLOTS_PER_CTLR=2 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_MPC8XXX_GPIO=y
configs/lx2160ardb_tfa_defconfig +1 -0
@@ -62,6 +62,7 @@ CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y +CONFIG_DIMM_SLOTS_PER_CTLR=2 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_MPC8XXX_GPIO=y
configs/lx2160ardb_tfa_stmm_defconfig +1 -0
@@ -62,6 +62,7 @@ CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y +CONFIG_DIMM_SLOTS_PER_CTLR=2 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_MPC8XXX_GPIO=y
configs/lx2162aqds_tfa_SECURE_BOOT_defconfig +1 -0
@@ -58,6 +58,7 @@ CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y +CONFIG_DIMM_SLOTS_PER_CTLR=2 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_MPC8XXX_GPIO=y
configs/lx2162aqds_tfa_defconfig +1 -0
@@ -65,6 +65,7 @@ CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y +CONFIG_DIMM_SLOTS_PER_CTLR=2 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_MPC8XXX_GPIO=y
configs/lx2162aqds_tfa_verified_boot_defconfig +1 -0
@@ -66,6 +66,7 @@ CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y +CONFIG_DIMM_SLOTS_PER_CTLR=2 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_MPC8XXX_GPIO=y
drivers/ddr/fsl/Kconfig +4 -0
@@ -53,6 +53,10 @@ config CHIP_SELECTS_PER_CTRL int "Number of chip selects per controller" default 4 +config DIMM_SLOTS_PER_CTLR + int "Number of DIMM slots per controller" + default 1 + config SYS_FSL_DDR_VER int default 50 if SYS_FSL_DDR_VER_50
include/configs/MPC8548CDS.h +0 -2
@@ -47,8 +47,6 @@#define CONFIG_SYS_DDR_SDRAM_BASE 0x00000000/* DDR is system memory*/ #define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE -#define CONFIG_DIMM_SLOTS_PER_CTLR 1 -/* I2C addresses of SPD EEPROMs */ #define SPD_EEPROM_ADDRESS 0x51/* CTLR 0 DIMM 0 */
include/configs/P1010RDB.h +0 -2
@@ -161,8 +161,6 @@ extern unsigned long get_sdram_size(void);#define CONFIG_SYS_DDR_SDRAM_BASE 0x00000000#define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE -#define CONFIG_DIMM_SLOTS_PER_CTLR 1 -/* DDR3 Controller Settings */ #define CONFIG_SYS_DDR_CS0_BNDS 0x0000003f#define CONFIG_SYS_DDR_CS0_CONFIG 0x80014302
include/configs/P2041RDB.h +0 -2
@@ -91,8 +91,6 @@#define CONFIG_SYS_DDR_SDRAM_BASE 0x00000000#define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE -#define CONFIG_DIMM_SLOTS_PER_CTLR 1 -#define CONFIG_SYS_SPD_BUS_NUM 0#define SPD_EEPROM_ADDRESS 0x52#define CONFIG_SYS_SDRAM_SIZE 4096/* for fixed parameter use */
include/configs/T102xRDB.h +0 -1
@@ -145,7 +145,6 @@#define CONFIG_VERY_BIG_RAM #define CONFIG_SYS_DDR_SDRAM_BASE 0x00000000#define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE -#define CONFIG_DIMM_SLOTS_PER_CTLR 1#if defined(CONFIG_TARGET_T1024RDB )#define CONFIG_SYS_SPD_BUS_NUM 0#define SPD_EEPROM_ADDRESS 0x51
include/configs/T104xRDB.h +0 -2
@@ -127,8 +127,6 @@#define CONFIG_SYS_DDR_SDRAM_BASE 0x00000000#define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE -#define CONFIG_DIMM_SLOTS_PER_CTLR 1 -#define CONFIG_SYS_SPD_BUS_NUM 0#define SPD_EEPROM_ADDRESS 0x51
include/configs/T208xQDS.h +0 -1
@@ -116,7 +116,6 @@#define CONFIG_VERY_BIG_RAM #define CONFIG_SYS_DDR_SDRAM_BASE 0x00000000#define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE -#define CONFIG_DIMM_SLOTS_PER_CTLR 2#define CONFIG_SYS_SPD_BUS_NUM 0#define CONFIG_SYS_SDRAM_SIZE 2048/* for fixed parameter use */ #define SPD_EEPROM_ADDRESS1 0x51
include/configs/T208xRDB.h +0 -1
@@ -111,7 +111,6 @@#define CONFIG_VERY_BIG_RAM #define CONFIG_SYS_DDR_SDRAM_BASE 0x00000000#define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE -#define CONFIG_DIMM_SLOTS_PER_CTLR 1#define CONFIG_SYS_SPD_BUS_NUM 0#define CONFIG_SYS_SDRAM_SIZE 2048/* for fixed parameter use */ #define SPD_EEPROM_ADDRESS1 0x51
include/configs/T4240RDB.h +0 -2
@@ -92,8 +92,6 @@#define CONFIG_SYS_DDR_SDRAM_BASE 0x00000000#define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE -#define CONFIG_DIMM_SLOTS_PER_CTLR 1 -/* * IFC Definitions */
include/configs/corenet_ds.h +0 -2
@@ -94,8 +94,6 @@#define CONFIG_SYS_DDR_SDRAM_BASE 0x00000000#define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE -#define CONFIG_DIMM_SLOTS_PER_CTLR 1 -#define CONFIG_SYS_SPD_BUS_NUM 1#define SPD_EEPROM_ADDRESS1 0x51#define SPD_EEPROM_ADDRESS2 0x52
include/configs/km/pg-wcom-ls102xa.h +0 -2
@@ -22,8 +22,6 @@#define CONFIG_SYS_DDR_SDRAM_BASE 0x80000000UL#define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE -#define CONFIG_DIMM_SLOTS_PER_CTLR 1 -#define CONFIG_SYS_SPD_BUS_NUM 0#define SPD_EEPROM_ADDRESS 0x54
include/configs/kmcent2.h +0 -2
@@ -173,8 +173,6 @@#define CONFIG_SYS_DDR_SDRAM_BASE 0x00000000#define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE -#define CONFIG_DIMM_SLOTS_PER_CTLR 1 -#define CONFIG_SYS_SPD_BUS_NUM 0#define SPD_EEPROM_ADDRESS 0x54#define CONFIG_SYS_SDRAM_SIZE 4096/* for fixed parameter use */
include/configs/kontron_sl28.h +0 -1
@@ -19,7 +19,6 @@#define CONFIG_MEM_INIT_VALUE 0xdeadbeef#define CONFIG_VERY_BIG_RAM -#define CONFIG_DIMM_SLOTS_PER_CTLR 1#define CONFIG_SYS_DDR_SDRAM_BASE 0x80000000#define CONFIG_SYS_FSL_DDR_SDRAM_BASE_PHY 0#define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE
include/configs/ls1012a2g5rdb.h +0 -1
@@ -9,7 +9,6 @@#include "ls1012a_common.h" /* DDR */ -#define CONFIG_DIMM_SLOTS_PER_CTLR 1#define CONFIG_SYS_SDRAM_SIZE 0x40000000/* SATA */
include/configs/ls1012afrdm.h +0 -1
@@ -9,7 +9,6 @@#include "ls1012a_common.h" /* DDR */ -#define CONFIG_DIMM_SLOTS_PER_CTLR 1#define CONFIG_SYS_SDRAM_SIZE 0x20000000#ifndef CONFIG_SPL_BUILD
include/configs/ls1012afrwy.h +0 -1
@@ -13,7 +13,6 @@#define BOARD_REV_C 0x00080000#define BOARD_REV_MASK 0x001A0000/* DDR */ -#define CONFIG_DIMM_SLOTS_PER_CTLR 1#define SYS_SDRAM_SIZE_512 0x20000000#define SYS_SDRAM_SIZE_1024 0x40000000
include/configs/ls1012aqds.h +0 -1
@@ -10,7 +10,6 @@#include "ls1012a_common.h" /* DDR */ -#define CONFIG_DIMM_SLOTS_PER_CTLR 1#define CONFIG_SYS_SDRAM_SIZE 0x40000000/*
include/configs/ls1012ardb.h +0 -1
@@ -10,7 +10,6 @@#include "ls1012a_common.h" /* DDR */ -#define CONFIG_DIMM_SLOTS_PER_CTLR 1#define CONFIG_SYS_SDRAM_SIZE 0x40000000/*
include/configs/ls1021aqds.h +0 -1
@@ -49,7 +49,6 @@#ifndef CONFIG_SYS_FSL_DDR4 #define CONFIG_SYS_DDR_RAW_TIMING #endif -#define CONFIG_DIMM_SLOTS_PER_CTLR 1#define CONFIG_SYS_DDR_SDRAM_BASE 0x80000000UL#define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE
include/configs/ls1028aqds.h +0 -3
@@ -10,9 +10,6 @@#define COUNTER_FREQUENCY_REAL (get_board_sys_clk() / 4) -/* DDR */ -#define CONFIG_DIMM_SLOTS_PER_CTLR 2 -#define CONFIG_QIXIS_I2C_ACCESS /*
include/configs/ls1028ardb.h +0 -2
@@ -14,8 +14,6 @@/* Store environment at top of flash */ -#define CONFIG_DIMM_SLOTS_PER_CTLR 1 -#define CONFIG_QIXIS_I2C_ACCESS /*
include/configs/ls1043aqds.h +0 -1
@@ -10,7 +10,6 @@#define CONFIG_LAYERSCAPE_NS_ACCESS -#define CONFIG_DIMM_SLOTS_PER_CTLR 1/* Physical Memory Map */ #define SPD_EEPROM_ADDRESS 0x51
include/configs/ls1043ardb.h +0 -1
@@ -10,7 +10,6 @@#define CONFIG_LAYERSCAPE_NS_ACCESS -#define CONFIG_DIMM_SLOTS_PER_CTLR 1/* Physical Memory Map */ #define CONFIG_SYS_SPD_BUS_NUM 0
include/configs/ls1046afrwy.h +0 -2
@@ -10,8 +10,6 @@#define CONFIG_LAYERSCAPE_NS_ACCESS -#define CONFIG_DIMM_SLOTS_PER_CTLR 1 -#define CONFIG_SYS_UBOOT_BASE 0x40100000/*
include/configs/ls1046aqds.h +0 -1
@@ -10,7 +10,6 @@#define CONFIG_LAYERSCAPE_NS_ACCESS -#define CONFIG_DIMM_SLOTS_PER_CTLR 1/* Physical Memory Map */ #define SPD_EEPROM_ADDRESS 0x51
include/configs/ls1046ardb.h +0 -1
@@ -11,7 +11,6 @@#define CONFIG_LAYERSCAPE_NS_ACCESS -#define CONFIG_DIMM_SLOTS_PER_CTLR 1/* Physical Memory Map */ #define SPD_EEPROM_ADDRESS 0x51
include/configs/ls1088aqds.h +0 -2
@@ -18,8 +18,6 @@#define COUNTER_FREQUENCY_REAL (get_board_sys_clk()/4)#define COUNTER_FREQUENCY 25000000/* 25MHz */ -#define CONFIG_DIMM_SLOTS_PER_CTLR 1 -#define CONFIG_MEM_INIT_VALUE 0xdeadbeef#define SPD_EEPROM_ADDRESS 0x51#define CONFIG_SYS_SPD_BUS_NUM 0
include/configs/ls1088ardb.h +0 -1
@@ -26,7 +26,6 @@#endif #define SPD_EEPROM_ADDRESS 0x51#define CONFIG_SYS_SPD_BUS_NUM 0/* SPD on I2C bus 0 */ -#define CONFIG_DIMM_SLOTS_PER_CTLR 1#if !defined(CONFIG_QSPI_BOOT ) && !defined(CONFIG_SD_BOOT_QSPI )
include/configs/ls2080aqds.h +0 -1
@@ -26,7 +26,6 @@#define SPD_EEPROM_ADDRESS6 0x56/* dummy address */ #define SPD_EEPROM_ADDRESS SPD_EEPROM_ADDRESS1#define CONFIG_SYS_SPD_BUS_NUM 0/* SPD on I2C bus 0 */ -#define CONFIG_DIMM_SLOTS_PER_CTLR 2#ifdef CONFIG_SYS_FSL_HAS_DP_DDR #define CONFIG_DP_DDR_DIMM_SLOTS_PER_CTLR 1#endif
include/configs/ls2080ardb.h +0 -1
@@ -36,7 +36,6 @@#define SPD_EEPROM_ADDRESS6 0x56/* dummy address */ #define SPD_EEPROM_ADDRESS SPD_EEPROM_ADDRESS1#define CONFIG_SYS_SPD_BUS_NUM 0/* SPD on I2C bus 0 */ -#define CONFIG_DIMM_SLOTS_PER_CTLR 2#ifdef CONFIG_SYS_FSL_HAS_DP_DDR #define CONFIG_DP_DDR_DIMM_SLOTS_PER_CTLR 1#endif
include/configs/lx2160a_common.h +0 -1
@@ -33,7 +33,6 @@#define SPD_EEPROM_ADDRESS6 0x56#define SPD_EEPROM_ADDRESS SPD_EEPROM_ADDRESS1#define CONFIG_SYS_SPD_BUS_NUM 0/* SPD on I2C bus 0 */ -#define CONFIG_DIMM_SLOTS_PER_CTLR 2#define CONFIG_SYS_MONITOR_LEN (936 * 1024)/* Miscellaneous configurable options */
include/configs/p1_p2_rdb_pc.h +0 -2
@@ -158,8 +158,6 @@#define CONFIG_SYS_DDR_SDRAM_BASE 0x00000000#define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE -#define CONFIG_DIMM_SLOTS_PER_CTLR 1 -/* Default settings for DDR3 */ #ifndef CONFIG_TARGET_P2020RDB #define CONFIG_SYS_DDR_CS0_BNDS 0x0000003f
include/configs/socrates.h +0 -2
@@ -59,8 +59,6 @@#define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE#define CONFIG_VERY_BIG_RAM -#define CONFIG_DIMM_SLOTS_PER_CTLR 1 -/* I2C addresses of SPD EEPROMs */ #define SPD_EEPROM_ADDRESS 0x50/* CTLR 0 DIMM 0 */
include/configs/ten64.h +0 -2
@@ -11,8 +11,6 @@#define COUNTER_FREQUENCY 25000000/* 25MHz */ -#define CONFIG_DIMM_SLOTS_PER_CTLR 1 -#define CONFIG_SYS_LS_MC_BOOT_TIMEOUT_MS 5000#define QSPI_NOR_BOOTCOMMAND "run distro_bootcmd"
scripts/config_whitelist.txt +0 -1
@@ -42,7 +42,6 @@ CONFIG_DFU_ALT_BOOT_EMMC CONFIG_DFU_ALT_BOOT_SD CONFIG_DFU_ALT_SYSTEM CONFIG_DFU_ENV_SETTINGS -CONFIG_DIMM_SLOTS_PER_CTLR CONFIG_DISCOVER_PHY CONFIG_DM9000_BASE CONFIG_DM9000_BYTE_SWAPPED
Signature · 1 line
2.25.1
Re: [PATCH 21/25] Convert CONFIG_DIMM_SLOTS_PER_CTLR to Kconfig
Quoted 4 lines · Tom Rini
This converts the following to
Kconfig:
CONFIG_DIMM_SLOTS_PER_CTLRSigned-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH 22/25 Convert CONFIG_FSL_QIXIS et al to Kconfig
In reply to Tom RiniThis converts the following to Kconfig:
CONFIG_FSL_QIXIS
CONFIG_QIXIS_I2C_ACCESS
--- board/freescale/common/Kconfig | 8 ++++++++ configs/T2080QDS_NAND_defconfig | 2 ++ configs/T2080QDS_SDCARD_defconfig | 2 ++ configs/T2080QDS_SECURE_BOOT_defconfig | 2 ++ configs/T2080QDS_SPIFLASH_defconfig | 2 ++ configs/T2080QDS_SRIO_PCIE_BOOT_defconfig | 2 ++ configs/T2080QDS_defconfig | 2 ++ configs/ls1012aqds_qspi_defconfig | 1 + configs/ls1012aqds_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1012aqds_tfa_defconfig | 1 + configs/ls1021aqds_ddr4_nor_defconfig | 2 ++ configs/ls1021aqds_ddr4_nor_lpuart_defconfig | 2 ++ configs/ls1021aqds_nand_defconfig | 2 ++ configs/ls1021aqds_nor_SECURE_BOOT_defconfig | 2 ++ configs/ls1021aqds_nor_defconfig | 2 ++ configs/ls1021aqds_nor_lpuart_defconfig | 2 ++ configs/ls1021aqds_qspi_defconfig | 1 + configs/ls1021aqds_sdcard_ifc_defconfig | 2 ++ configs/ls1021aqds_sdcard_qspi_defconfig | 1 + configs/ls1028aqds_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1028aqds_tfa_defconfig | 1 + configs/ls1028aqds_tfa_lpuart_defconfig | 1 + configs/ls1028ardb_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1028ardb_tfa_defconfig | 1 + configs/ls1043aqds_defconfig | 2 ++ configs/ls1043aqds_lpuart_defconfig | 2 ++ configs/ls1043aqds_nand_defconfig | 2 ++ configs/ls1043aqds_nor_ddr3_defconfig | 2 ++ configs/ls1043aqds_qspi_defconfig | 1 + configs/ls1043aqds_sdcard_ifc_defconfig | 2 ++ configs/ls1043aqds_sdcard_qspi_defconfig | 1 + configs/ls1043aqds_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1043aqds_tfa_defconfig | 1 + configs/ls1046aqds_SECURE_BOOT_defconfig | 2 ++ configs/ls1046aqds_defconfig | 2 ++ configs/ls1046aqds_lpuart_defconfig | 2 ++ configs/ls1046aqds_nand_defconfig | 2 ++ configs/ls1046aqds_qspi_defconfig | 1 + configs/ls1046aqds_sdcard_ifc_defconfig | 2 ++ configs/ls1046aqds_sdcard_qspi_defconfig | 1 + configs/ls1046aqds_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1046aqds_tfa_defconfig | 1 + configs/ls1088aqds_defconfig | 1 + configs/ls1088aqds_qspi_SECURE_BOOT_defconfig | 1 + configs/ls1088aqds_qspi_defconfig | 1 + configs/ls1088aqds_sdcard_ifc_defconfig | 1 + configs/ls1088aqds_sdcard_qspi_defconfig | 1 + configs/ls1088aqds_tfa_defconfig | 1 + configs/ls1088ardb_qspi_SECURE_BOOT_defconfig | 1 + configs/ls1088ardb_qspi_defconfig | 1 + configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig | 1 + configs/ls1088ardb_sdcard_qspi_defconfig | 1 + configs/ls1088ardb_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1088ardb_tfa_defconfig | 1 + configs/ls2080aqds_SECURE_BOOT_defconfig | 2 ++ configs/ls2080aqds_defconfig | 2 ++ configs/ls2080aqds_nand_defconfig | 1 + configs/ls2080aqds_qspi_defconfig | 1 + configs/ls2080aqds_sdcard_defconfig | 1 + configs/ls2080ardb_SECURE_BOOT_defconfig | 2 ++ configs/ls2080ardb_defconfig | 2 ++ configs/ls2080ardb_nand_defconfig | 2 ++ configs/ls2081ardb_defconfig | 1 + configs/ls2088aqds_tfa_defconfig | 2 ++ configs/ls2088ardb_tfa_SECURE_BOOT_defconfig | 2 ++ configs/ls2088ardb_tfa_defconfig | 2 ++ configs/lx2160aqds_tfa_SECURE_BOOT_defconfig | 1 + configs/lx2160aqds_tfa_defconfig | 1 + configs/lx2160ardb_tfa_SECURE_BOOT_defconfig | 1 + configs/lx2160ardb_tfa_defconfig | 1 + configs/lx2160ardb_tfa_stmm_defconfig | 1 + configs/lx2162aqds_tfa_SECURE_BOOT_defconfig | 1 + configs/lx2162aqds_tfa_defconfig | 1 + configs/lx2162aqds_tfa_verified_boot_defconfig | 1 + include/configs/T208xQDS.h | 1 - include/configs/ls1012aqds.h | 2 -- include/configs/ls1021aqds.h | 5 ----- include/configs/ls1028aqds.h | 3 --- include/configs/ls1028ardb.h | 3 --- include/configs/ls1043aqds.h | 2 -- include/configs/ls1046aqds.h | 2 -- include/configs/ls1088aqds.h | 4 ---- include/configs/ls1088ardb.h | 7 ------- include/configs/ls2080aqds.h | 2 -- include/configs/ls2080ardb.h | 8 -------- include/configs/lx2160a_common.h | 2 -- 86 files changed, 112 insertions(+), 41 deletions(-)
board/freescale/common/Kconfig +8 -0
@@ -99,3 +99,11 @@ config VOL_MONITOR_ISL68233_SET functionality. It is used by the common VID driver. endif + +config FSL_QIXIS + bool "Enable QIXIS support" + +config QIXIS_I2C_ACCESS + bool "Access to QIXIS is over i2c" + depends on FSL_QIXIS + default y
configs/T2080QDS_NAND_defconfig +2 -0
@@ -11,6 +11,8 @@ CONFIG_VID=y CONFIG_VID_FLS_ENV="t208xqds_vdd_mv" CONFIG_VOL_MONITOR_IR36021_READ=y CONFIG_VOL_MONITOR_IR36021_SET=y +CONFIG_FSL_QIXIS=y +# CONFIG_QIXIS_I2C_ACCESS is not set CONFIG_SPL_SERIAL=y CONFIG_SPL_DRIVERS_MISC=y CONFIG_SPL=y
configs/T2080QDS_SDCARD_defconfig +2 -0
@@ -11,6 +11,8 @@ CONFIG_VID=y CONFIG_VID_FLS_ENV="t208xqds_vdd_mv" CONFIG_VOL_MONITOR_IR36021_READ=y CONFIG_VOL_MONITOR_IR36021_SET=y +CONFIG_FSL_QIXIS=y +# CONFIG_QIXIS_I2C_ACCESS is not set CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y CONFIG_SPL_DRIVERS_MISC=y
configs/T2080QDS_SECURE_BOOT_defconfig +2 -0
@@ -8,6 +8,8 @@ CONFIG_VID=y CONFIG_VID_FLS_ENV="t208xqds_vdd_mv" CONFIG_VOL_MONITOR_IR36021_READ=y CONFIG_VOL_MONITOR_IR36021_SET=y +CONFIG_FSL_QIXIS=y +# CONFIG_QIXIS_I2C_ACCESS is not set CONFIG_MPC85xx=y CONFIG_TARGET_T2080QDS=y CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
configs/T2080QDS_SPIFLASH_defconfig +2 -0
@@ -12,6 +12,8 @@ CONFIG_VID=y CONFIG_VID_FLS_ENV="t208xqds_vdd_mv" CONFIG_VOL_MONITOR_IR36021_READ=y CONFIG_VOL_MONITOR_IR36021_SET=y +CONFIG_FSL_QIXIS=y +# CONFIG_QIXIS_I2C_ACCESS is not set CONFIG_SPL_SERIAL=y CONFIG_SPL_DRIVERS_MISC=y CONFIG_SPL=y
configs/T2080QDS_SRIO_PCIE_BOOT_defconfig +2 -0
@@ -7,6 +7,8 @@ CONFIG_VID=y CONFIG_VID_FLS_ENV="t208xqds_vdd_mv" CONFIG_VOL_MONITOR_IR36021_READ=y CONFIG_VOL_MONITOR_IR36021_SET=y +CONFIG_FSL_QIXIS=y +# CONFIG_QIXIS_I2C_ACCESS is not set CONFIG_MPC85xx=y CONFIG_TARGET_T2080QDS=y CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
configs/T2080QDS_defconfig +2 -0
@@ -8,6 +8,8 @@ CONFIG_VID=y CONFIG_VID_FLS_ENV="t208xqds_vdd_mv" CONFIG_VOL_MONITOR_IR36021_READ=y CONFIG_VOL_MONITOR_IR36021_SET=y +CONFIG_FSL_QIXIS=y +# CONFIG_QIXIS_I2C_ACCESS is not set CONFIG_MPC85xx=y CONFIG_TARGET_T2080QDS=y CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
configs/ls1012aqds_qspi_defconfig +1 -0
@@ -8,6 +8,7 @@ CONFIG_ENV_OFFSET=0x300000 CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1012a-qds" +CONFIG_FSL_QIXIS=y CONFIG_FSL_LS_PPA=y CONFIG_QSPI_AHB_INIT=y CONFIG_AHCI=y
configs/ls1012aqds_tfa_SECURE_BOOT_defconfig +1 -0
@@ -8,6 +8,7 @@ CONFIG_ENV_SIZE=0x2000 CONFIG_NXP_ESBC=y CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1012a-qds" +CONFIG_FSL_QIXIS=y CONFIG_QSPI_AHB_INIT=y CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
configs/ls1012aqds_tfa_defconfig +1 -0
@@ -9,6 +9,7 @@ CONFIG_ENV_OFFSET=0x500000 CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1012a-qds" +CONFIG_FSL_QIXIS=y CONFIG_QSPI_AHB_INIT=y CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
configs/ls1021aqds_ddr4_nor_defconfig +2 -0
@@ -12,6 +12,8 @@ CONFIG_SYS_I2C_MXC_I2C3=y CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds-duart" CONFIG_FSL_USE_PCA9547_MUX=y +CONFIG_FSL_QIXIS=y +# CONFIG_QIXIS_I2C_ACCESS is not set CONFIG_AHCI=y CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0x9fffffff
configs/ls1021aqds_ddr4_nor_lpuart_defconfig +2 -0
@@ -12,6 +12,8 @@ CONFIG_SYS_I2C_MXC_I2C3=y CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds-lpuart" CONFIG_FSL_USE_PCA9547_MUX=y +CONFIG_FSL_QIXIS=y +# CONFIG_QIXIS_I2C_ACCESS is not set CONFIG_AHCI=y CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0x9fffffff
configs/ls1021aqds_nand_defconfig +2 -0
@@ -16,6 +16,8 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds-duart" CONFIG_SPL_TEXT_BASE=0x10000000 CONFIG_FSL_USE_PCA9547_MUX=y +CONFIG_FSL_QIXIS=y +# CONFIG_QIXIS_I2C_ACCESS is not set CONFIG_SPL_SERIAL=y CONFIG_SPL_DRIVERS_MISC=y CONFIG_SPL=y
configs/ls1021aqds_nor_SECURE_BOOT_defconfig +2 -0
@@ -12,6 +12,8 @@ CONFIG_SYS_I2C_MXC_I2C3=y CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds-duart" CONFIG_FSL_USE_PCA9547_MUX=y +CONFIG_FSL_QIXIS=y +# CONFIG_QIXIS_I2C_ACCESS is not set CONFIG_AHCI=y CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0x9fffffff
configs/ls1021aqds_nor_defconfig +2 -0
@@ -12,6 +12,8 @@ CONFIG_SYS_I2C_MXC_I2C3=y CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds-duart" CONFIG_FSL_USE_PCA9547_MUX=y +CONFIG_FSL_QIXIS=y +# CONFIG_QIXIS_I2C_ACCESS is not set CONFIG_AHCI=y CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0x9fffffff
configs/ls1021aqds_nor_lpuart_defconfig +2 -0
@@ -12,6 +12,8 @@ CONFIG_SYS_I2C_MXC_I2C3=y CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds-lpuart" CONFIG_FSL_USE_PCA9547_MUX=y +CONFIG_FSL_QIXIS=y +# CONFIG_QIXIS_I2C_ACCESS is not set CONFIG_AHCI=y CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0x9fffffff
configs/ls1021aqds_qspi_defconfig +1 -0
@@ -13,6 +13,7 @@ CONFIG_SYS_I2C_MXC_I2C3=y CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds-duart" CONFIG_FSL_USE_PCA9547_MUX=y +CONFIG_FSL_QIXIS=y CONFIG_AHCI=y CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0x9fffffff
configs/ls1021aqds_sdcard_ifc_defconfig +2 -0
@@ -16,6 +16,8 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds-duart" CONFIG_SPL_TEXT_BASE=0x10000000 CONFIG_FSL_USE_PCA9547_MUX=y +CONFIG_FSL_QIXIS=y +# CONFIG_QIXIS_I2C_ACCESS is not set CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y CONFIG_SPL_DRIVERS_MISC=y
configs/ls1021aqds_sdcard_qspi_defconfig +1 -0
@@ -16,6 +16,7 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds-duart" CONFIG_SPL_TEXT_BASE=0x10000000 CONFIG_FSL_USE_PCA9547_MUX=y +CONFIG_FSL_QIXIS=y CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y CONFIG_SPL_DRIVERS_MISC=y
configs/ls1028aqds_tfa_SECURE_BOOT_defconfig +1 -0
@@ -10,6 +10,7 @@ CONFIG_ENV_SIZE=0x2000 CONFIG_NXP_ESBC=y CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1028a-qds-duart" +CONFIG_FSL_QIXIS=y CONFIG_FSPI_AHB_EN_4BYTE=y CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
configs/ls1028aqds_tfa_defconfig +1 -0
@@ -11,6 +11,7 @@ CONFIG_ENV_OFFSET=0x500000 CONFIG_ENV_SECT_SIZE=0x20000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1028a-qds-duart" +CONFIG_FSL_QIXIS=y CONFIG_FSPI_AHB_EN_4BYTE=y CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
configs/ls1028aqds_tfa_lpuart_defconfig +1 -0
@@ -10,6 +10,7 @@ CONFIG_ENV_OFFSET=0x500000 CONFIG_ENV_SECT_SIZE=0x20000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1028a-qds-lpuart" +CONFIG_FSL_QIXIS=y CONFIG_FSPI_AHB_EN_4BYTE=y CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
configs/ls1028ardb_tfa_SECURE_BOOT_defconfig +1 -0
@@ -10,6 +10,7 @@ CONFIG_ENV_SIZE=0x2000 CONFIG_NXP_ESBC=y CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1028a-rdb" +CONFIG_FSL_QIXIS=y CONFIG_FSPI_AHB_EN_4BYTE=y CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
configs/ls1028ardb_tfa_defconfig +1 -0
@@ -11,6 +11,7 @@ CONFIG_ENV_OFFSET=0x500000 CONFIG_ENV_SECT_SIZE=0x20000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1028a-rdb" +CONFIG_FSL_QIXIS=y CONFIG_FSPI_AHB_EN_4BYTE=y CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
configs/ls1043aqds_defconfig +2 -0
@@ -16,6 +16,8 @@ CONFIG_VID=y CONFIG_VID_FLS_ENV="ls1043aqds_vdd_mv" CONFIG_VOL_MONITOR_INA220=y CONFIG_VOL_MONITOR_IR36021_SET=y +CONFIG_FSL_QIXIS=y +# CONFIG_QIXIS_I2C_ACCESS is not set CONFIG_FSL_LS_PPA=y CONFIG_AHCI=y CONFIG_SYS_MEMTEST_START=0x80000000
configs/ls1043aqds_lpuart_defconfig +2 -0
@@ -16,6 +16,8 @@ CONFIG_VID=y CONFIG_VID_FLS_ENV="ls1043aqds_vdd_mv" CONFIG_VOL_MONITOR_INA220=y CONFIG_VOL_MONITOR_IR36021_SET=y +CONFIG_FSL_QIXIS=y +# CONFIG_QIXIS_I2C_ACCESS is not set CONFIG_FSL_LS_PPA=y CONFIG_AHCI=y CONFIG_SYS_MEMTEST_START=0x80000000
configs/ls1043aqds_nand_defconfig +2 -0
@@ -19,6 +19,8 @@ CONFIG_VID=y CONFIG_VID_FLS_ENV="ls1043aqds_vdd_mv" CONFIG_VOL_MONITOR_INA220=y CONFIG_VOL_MONITOR_IR36021_SET=y +CONFIG_FSL_QIXIS=y +# CONFIG_QIXIS_I2C_ACCESS is not set CONFIG_FSL_LS_PPA=y CONFIG_SPL_SERIAL=y CONFIG_SPL_DRIVERS_MISC=y
configs/ls1043aqds_nor_ddr3_defconfig +2 -0
@@ -16,6 +16,8 @@ CONFIG_VID=y CONFIG_VID_FLS_ENV="ls1043aqds_vdd_mv" CONFIG_VOL_MONITOR_INA220=y CONFIG_VOL_MONITOR_IR36021_SET=y +CONFIG_FSL_QIXIS=y +# CONFIG_QIXIS_I2C_ACCESS is not set CONFIG_FSL_LS_PPA=y CONFIG_AHCI=y CONFIG_SYS_MEMTEST_START=0x80000000
configs/ls1043aqds_qspi_defconfig +1 -0
@@ -17,6 +17,7 @@ CONFIG_VID=y CONFIG_VID_FLS_ENV="ls1043aqds_vdd_mv" CONFIG_VOL_MONITOR_INA220=y CONFIG_VOL_MONITOR_IR36021_SET=y +CONFIG_FSL_QIXIS=y CONFIG_FSL_LS_PPA=y CONFIG_AHCI=y CONFIG_SYS_MEMTEST_START=0x80000000
configs/ls1043aqds_sdcard_ifc_defconfig +2 -0
@@ -19,6 +19,8 @@ CONFIG_VID=y CONFIG_VID_FLS_ENV="ls1043aqds_vdd_mv" CONFIG_VOL_MONITOR_INA220=y CONFIG_VOL_MONITOR_IR36021_SET=y +CONFIG_FSL_QIXIS=y +# CONFIG_QIXIS_I2C_ACCESS is not set CONFIG_FSL_LS_PPA=y CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y
configs/ls1043aqds_sdcard_qspi_defconfig +1 -0
@@ -19,6 +19,7 @@ CONFIG_VID=y CONFIG_VID_FLS_ENV="ls1043aqds_vdd_mv" CONFIG_VOL_MONITOR_INA220=y CONFIG_VOL_MONITOR_IR36021_SET=y +CONFIG_FSL_QIXIS=y CONFIG_FSL_LS_PPA=y CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y
configs/ls1043aqds_tfa_SECURE_BOOT_defconfig +1 -0
@@ -17,6 +17,7 @@ CONFIG_VID=y CONFIG_VID_FLS_ENV="ls1043aqds_vdd_mv" CONFIG_VOL_MONITOR_INA220=y CONFIG_VOL_MONITOR_IR36021_SET=y +CONFIG_FSL_QIXIS=y CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y CONFIG_AHCI=y
configs/ls1043aqds_tfa_defconfig +1 -0
@@ -18,6 +18,7 @@ CONFIG_VID=y CONFIG_VID_FLS_ENV="ls1043aqds_vdd_mv" CONFIG_VOL_MONITOR_INA220=y CONFIG_VOL_MONITOR_IR36021_SET=y +CONFIG_FSL_QIXIS=y CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y CONFIG_AHCI=y
configs/ls1046aqds_SECURE_BOOT_defconfig +2 -0
@@ -16,6 +16,8 @@ CONFIG_VID=y CONFIG_VID_FLS_ENV="ls1046aqds_vdd_mv" CONFIG_VOL_MONITOR_INA220=y CONFIG_VOL_MONITOR_IR36021_SET=y +CONFIG_FSL_QIXIS=y +# CONFIG_QIXIS_I2C_ACCESS is not set CONFIG_FSL_LS_PPA=y CONFIG_AHCI=y CONFIG_SYS_MEMTEST_START=0x80000000
configs/ls1046aqds_defconfig +2 -0
@@ -16,6 +16,8 @@ CONFIG_VID=y CONFIG_VID_FLS_ENV="ls1046aqds_vdd_mv" CONFIG_VOL_MONITOR_INA220=y CONFIG_VOL_MONITOR_IR36021_SET=y +CONFIG_FSL_QIXIS=y +# CONFIG_QIXIS_I2C_ACCESS is not set CONFIG_FSL_LS_PPA=y CONFIG_AHCI=y CONFIG_SYS_MEMTEST_START=0x80000000
configs/ls1046aqds_lpuart_defconfig +2 -0
@@ -16,6 +16,8 @@ CONFIG_VID=y CONFIG_VID_FLS_ENV="ls1046aqds_vdd_mv" CONFIG_VOL_MONITOR_INA220=y CONFIG_VOL_MONITOR_IR36021_SET=y +CONFIG_FSL_QIXIS=y +# CONFIG_QIXIS_I2C_ACCESS is not set CONFIG_FSL_LS_PPA=y CONFIG_AHCI=y CONFIG_SYS_MEMTEST_START=0x80000000
configs/ls1046aqds_nand_defconfig +2 -0
@@ -19,6 +19,8 @@ CONFIG_VID=y CONFIG_VID_FLS_ENV="ls1046aqds_vdd_mv" CONFIG_VOL_MONITOR_INA220=y CONFIG_VOL_MONITOR_IR36021_SET=y +CONFIG_FSL_QIXIS=y +# CONFIG_QIXIS_I2C_ACCESS is not set CONFIG_FSL_LS_PPA=y CONFIG_SPL_SERIAL=y CONFIG_SPL_DRIVERS_MISC=y
configs/ls1046aqds_qspi_defconfig +1 -0
@@ -17,6 +17,7 @@ CONFIG_VID=y CONFIG_VID_FLS_ENV="ls1046aqds_vdd_mv" CONFIG_VOL_MONITOR_INA220=y CONFIG_VOL_MONITOR_IR36021_SET=y +CONFIG_FSL_QIXIS=y CONFIG_FSL_LS_PPA=y CONFIG_AHCI=y CONFIG_SYS_MEMTEST_START=0x80000000
configs/ls1046aqds_sdcard_ifc_defconfig +2 -0
@@ -19,6 +19,8 @@ CONFIG_VID=y CONFIG_VID_FLS_ENV="ls1046aqds_vdd_mv" CONFIG_VOL_MONITOR_INA220=y CONFIG_VOL_MONITOR_IR36021_SET=y +CONFIG_FSL_QIXIS=y +# CONFIG_QIXIS_I2C_ACCESS is not set CONFIG_FSL_LS_PPA=y CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y
configs/ls1046aqds_sdcard_qspi_defconfig +1 -0
@@ -19,6 +19,7 @@ CONFIG_VID=y CONFIG_VID_FLS_ENV="ls1046aqds_vdd_mv" CONFIG_VOL_MONITOR_INA220=y CONFIG_VOL_MONITOR_IR36021_SET=y +CONFIG_FSL_QIXIS=y CONFIG_FSL_LS_PPA=y CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y
configs/ls1046aqds_tfa_SECURE_BOOT_defconfig +1 -0
@@ -17,6 +17,7 @@ CONFIG_VID=y CONFIG_VID_FLS_ENV="ls1046aqds_vdd_mv" CONFIG_VOL_MONITOR_INA220=y CONFIG_VOL_MONITOR_IR36021_SET=y +CONFIG_FSL_QIXIS=y CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y CONFIG_AHCI=y
configs/ls1046aqds_tfa_defconfig +1 -0
@@ -18,6 +18,7 @@ CONFIG_VID=y CONFIG_VID_FLS_ENV="ls1046aqds_vdd_mv" CONFIG_VOL_MONITOR_INA220=y CONFIG_VOL_MONITOR_IR36021_SET=y +CONFIG_FSL_QIXIS=y CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y CONFIG_AHCI=y
configs/ls1088aqds_defconfig +1 -0
@@ -14,6 +14,7 @@ CONFIG_SPL_VID=y CONFIG_VID_FLS_ENV="ls1088aqds_vdd_mv" CONFIG_VOL_MONITOR_LTC3882_READ=y CONFIG_VOL_MONITOR_LTC3882_SET=y +CONFIG_FSL_QIXIS=y CONFIG_FSL_LS_PPA=y CONFIG_AHCI=y CONFIG_SYS_MEMTEST_START=0x80000000
configs/ls1088aqds_qspi_SECURE_BOOT_defconfig +1 -0
@@ -14,6 +14,7 @@ CONFIG_SPL_VID=y CONFIG_VID_FLS_ENV="ls1088aqds_vdd_mv" CONFIG_VOL_MONITOR_LTC3882_READ=y CONFIG_VOL_MONITOR_LTC3882_SET=y +CONFIG_FSL_QIXIS=y CONFIG_FSL_LS_PPA=y CONFIG_QSPI_AHB_INIT=y CONFIG_AHCI=y
configs/ls1088aqds_qspi_defconfig +1 -0
@@ -15,6 +15,7 @@ CONFIG_SPL_VID=y CONFIG_VID_FLS_ENV="ls1088aqds_vdd_mv" CONFIG_VOL_MONITOR_LTC3882_READ=y CONFIG_VOL_MONITOR_LTC3882_SET=y +CONFIG_FSL_QIXIS=y CONFIG_FSL_LS_PPA=y CONFIG_QSPI_AHB_INIT=y CONFIG_AHCI=y
configs/ls1088aqds_sdcard_ifc_defconfig +1 -0
@@ -17,6 +17,7 @@ CONFIG_SPL_VID=y CONFIG_VID_FLS_ENV="ls1088aqds_vdd_mv" CONFIG_VOL_MONITOR_LTC3882_READ=y CONFIG_VOL_MONITOR_LTC3882_SET=y +CONFIG_FSL_QIXIS=y CONFIG_FSL_LS_PPA=y CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y
configs/ls1088aqds_sdcard_qspi_defconfig +1 -0
@@ -17,6 +17,7 @@ CONFIG_SPL_VID=y CONFIG_VID_FLS_ENV="ls1088aqds_vdd_mv" CONFIG_VOL_MONITOR_LTC3882_READ=y CONFIG_VOL_MONITOR_LTC3882_SET=y +CONFIG_FSL_QIXIS=y CONFIG_FSL_LS_PPA=y CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y
configs/ls1088aqds_tfa_defconfig +1 -0
@@ -17,6 +17,7 @@ CONFIG_SPL_VID=y CONFIG_VID_FLS_ENV="ls1088aqds_vdd_mv" CONFIG_VOL_MONITOR_LTC3882_READ=y CONFIG_VOL_MONITOR_LTC3882_SET=y +CONFIG_FSL_QIXIS=y CONFIG_QSPI_AHB_INIT=y CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
configs/ls1088ardb_qspi_SECURE_BOOT_defconfig +1 -0
@@ -14,6 +14,7 @@ CONFIG_SPL_VID=y CONFIG_VID_FLS_ENV="ls1088ardb_vdd_mv" CONFIG_VOL_MONITOR_LTC3882_READ=y CONFIG_VOL_MONITOR_LTC3882_SET=y +CONFIG_FSL_QIXIS=y CONFIG_FSL_LS_PPA=y CONFIG_QSPI_AHB_INIT=y CONFIG_AHCI=y
configs/ls1088ardb_qspi_defconfig +1 -0
@@ -15,6 +15,7 @@ CONFIG_SPL_VID=y CONFIG_VID_FLS_ENV="ls1088ardb_vdd_mv" CONFIG_VOL_MONITOR_LTC3882_READ=y CONFIG_VOL_MONITOR_LTC3882_SET=y +CONFIG_FSL_QIXIS=y CONFIG_FSL_LS_PPA=y CONFIG_QSPI_AHB_INIT=y CONFIG_AHCI=y
configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig +1 -0
@@ -17,6 +17,7 @@ CONFIG_SPL_VID=y CONFIG_VID_FLS_ENV="ls1088ardb_vdd_mv" CONFIG_VOL_MONITOR_LTC3882_READ=y CONFIG_VOL_MONITOR_LTC3882_SET=y +CONFIG_FSL_QIXIS=y CONFIG_FSL_LS_PPA=y CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y
configs/ls1088ardb_sdcard_qspi_defconfig +1 -0
@@ -17,6 +17,7 @@ CONFIG_SPL_VID=y CONFIG_VID_FLS_ENV="ls1088ardb_vdd_mv" CONFIG_VOL_MONITOR_LTC3882_READ=y CONFIG_VOL_MONITOR_LTC3882_SET=y +CONFIG_FSL_QIXIS=y CONFIG_FSL_LS_PPA=y CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y
configs/ls1088ardb_tfa_SECURE_BOOT_defconfig +1 -0
@@ -16,6 +16,7 @@ CONFIG_SPL_VID=y CONFIG_VID_FLS_ENV="ls1088ardb_vdd_mv" CONFIG_VOL_MONITOR_LTC3882_READ=y CONFIG_VOL_MONITOR_LTC3882_SET=y +CONFIG_FSL_QIXIS=y CONFIG_QSPI_AHB_INIT=y CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
configs/ls1088ardb_tfa_defconfig +1 -0
@@ -17,6 +17,7 @@ CONFIG_SPL_VID=y CONFIG_VID_FLS_ENV="ls1088ardb_vdd_mv" CONFIG_VOL_MONITOR_LTC3882_READ=y CONFIG_VOL_MONITOR_LTC3882_SET=y +CONFIG_FSL_QIXIS=y CONFIG_QSPI_AHB_INIT=y CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
configs/ls2080aqds_SECURE_BOOT_defconfig +2 -0
@@ -8,6 +8,8 @@ CONFIG_ENV_SIZE=0x2000 CONFIG_NXP_ESBC=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls2080a-qds" CONFIG_FSL_USE_PCA9547_MUX=y +CONFIG_FSL_QIXIS=y +# CONFIG_QIXIS_I2C_ACCESS is not set CONFIG_FSL_LS_PPA=y CONFIG_AHCI=y # CONFIG_SYS_MALLOC_F is not set
configs/ls2080aqds_defconfig +2 -0
@@ -8,6 +8,8 @@ CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x20000 CONFIG_DEFAULT_DEVICE_TREE="fsl-ls2080a-qds" CONFIG_FSL_USE_PCA9547_MUX=y +CONFIG_FSL_QIXIS=y +# CONFIG_QIXIS_I2C_ACCESS is not set CONFIG_FSL_LS_PPA=y CONFIG_AHCI=y # CONFIG_SYS_MALLOC_F is not set
configs/ls2080aqds_nand_defconfig +1 -0
@@ -11,6 +11,7 @@ CONFIG_ENV_OFFSET=0xE0000 CONFIG_DEFAULT_DEVICE_TREE="fsl-ls2080a-qds" CONFIG_SPL_TEXT_BASE=0x1800a000 CONFIG_FSL_USE_PCA9547_MUX=y +CONFIG_FSL_QIXIS=y CONFIG_SPL_SERIAL=y CONFIG_SPL_DRIVERS_MISC=y CONFIG_SPL=y
configs/ls2080aqds_qspi_defconfig +1 -0
@@ -9,6 +9,7 @@ CONFIG_ENV_OFFSET=0x300000 CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_DEFAULT_DEVICE_TREE="fsl-ls2080a-qds" CONFIG_FSL_USE_PCA9547_MUX=y +CONFIG_FSL_QIXIS=y CONFIG_AHCI=y CONFIG_REMAKE_ELF=y CONFIG_MP=y
configs/ls2080aqds_sdcard_defconfig +1 -0
@@ -11,6 +11,7 @@ CONFIG_ENV_OFFSET=0x300000 CONFIG_DEFAULT_DEVICE_TREE="fsl-ls2080a-qds" CONFIG_SPL_TEXT_BASE=0x1800a000 CONFIG_FSL_USE_PCA9547_MUX=y +CONFIG_FSL_QIXIS=y CONFIG_FSL_LS_PPA=y CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y
configs/ls2080ardb_SECURE_BOOT_defconfig +2 -0
@@ -12,6 +12,8 @@ CONFIG_VID=y CONFIG_VID_FLS_ENV="ls2080ardb_vdd_mv" CONFIG_VOL_MONITOR_IR36021_READ=y CONFIG_VOL_MONITOR_IR36021_SET=y +CONFIG_FSL_QIXIS=y +# CONFIG_QIXIS_I2C_ACCESS is not set CONFIG_FSL_LS_PPA=y CONFIG_AHCI=y # CONFIG_SYS_MALLOC_F is not set
configs/ls2080ardb_defconfig +2 -0
@@ -12,6 +12,8 @@ CONFIG_VID=y CONFIG_VID_FLS_ENV="ls2080ardb_vdd_mv" CONFIG_VOL_MONITOR_IR36021_READ=y CONFIG_VOL_MONITOR_IR36021_SET=y +CONFIG_FSL_QIXIS=y +# CONFIG_QIXIS_I2C_ACCESS is not set CONFIG_FSL_LS_PPA=y CONFIG_AHCI=y # CONFIG_SYS_MALLOC_F is not set
configs/ls2080ardb_nand_defconfig +2 -0
@@ -15,6 +15,8 @@ CONFIG_VID=y CONFIG_VID_FLS_ENV="ls2080ardb_vdd_mv" CONFIG_VOL_MONITOR_IR36021_READ=y CONFIG_VOL_MONITOR_IR36021_SET=y +CONFIG_FSL_QIXIS=y +# CONFIG_QIXIS_I2C_ACCESS is not set CONFIG_SPL_SERIAL=y CONFIG_SPL_DRIVERS_MISC=y CONFIG_SPL=y
configs/ls2081ardb_defconfig +1 -0
@@ -13,6 +13,7 @@ CONFIG_VID=y CONFIG_VID_FLS_ENV="ls2080ardb_vdd_mv" CONFIG_VOL_MONITOR_IR36021_READ=y CONFIG_VOL_MONITOR_IR36021_SET=y +CONFIG_FSL_QIXIS=y CONFIG_FSL_LS_PPA=y CONFIG_QSPI_AHB_INIT=y CONFIG_AHCI=y
configs/ls2088aqds_tfa_defconfig +2 -0
@@ -11,6 +11,8 @@ CONFIG_ENV_SECT_SIZE=0x20000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls2080a-qds" CONFIG_FSL_USE_PCA9547_MUX=y +CONFIG_FSL_QIXIS=y +# CONFIG_QIXIS_I2C_ACCESS is not set CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y CONFIG_AHCI=y
configs/ls2088ardb_tfa_SECURE_BOOT_defconfig +2 -0
@@ -15,6 +15,8 @@ CONFIG_VID=y CONFIG_VID_FLS_ENV="ls2080ardb_vdd_mv" CONFIG_VOL_MONITOR_IR36021_READ=y CONFIG_VOL_MONITOR_IR36021_SET=y +CONFIG_FSL_QIXIS=y +# CONFIG_QIXIS_I2C_ACCESS is not set CONFIG_QSPI_AHB_INIT=y CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
configs/ls2088ardb_tfa_defconfig +2 -0
@@ -16,6 +16,8 @@ CONFIG_VID=y CONFIG_VID_FLS_ENV="ls2080ardb_vdd_mv" CONFIG_VOL_MONITOR_IR36021_READ=y CONFIG_VOL_MONITOR_IR36021_SET=y +CONFIG_FSL_QIXIS=y +# CONFIG_QIXIS_I2C_ACCESS is not set CONFIG_QSPI_AHB_INIT=y CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
configs/lx2160aqds_tfa_SECURE_BOOT_defconfig +1 -0
@@ -17,6 +17,7 @@ CONFIG_SPL_VID=y CONFIG_VID_FLS_ENV="lx2160aqds_vdd_mv" CONFIG_VOL_MONITOR_LTC3882_READ=y CONFIG_VOL_MONITOR_LTC3882_SET=y +CONFIG_FSL_QIXIS=y CONFIG_FSPI_AHB_EN_4BYTE=y CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
configs/lx2160aqds_tfa_defconfig +1 -0
@@ -18,6 +18,7 @@ CONFIG_SPL_VID=y CONFIG_VID_FLS_ENV="lx2160aqds_vdd_mv" CONFIG_VOL_MONITOR_LTC3882_READ=y CONFIG_VOL_MONITOR_LTC3882_SET=y +CONFIG_FSL_QIXIS=y CONFIG_FSPI_AHB_EN_4BYTE=y CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
configs/lx2160ardb_tfa_SECURE_BOOT_defconfig +1 -0
@@ -17,6 +17,7 @@ CONFIG_SPL_VID=y CONFIG_VID_FLS_ENV="lx2160ardb_vdd_mv" CONFIG_VOL_MONITOR_LTC3882_READ=y CONFIG_VOL_MONITOR_LTC3882_SET=y +CONFIG_FSL_QIXIS=y CONFIG_EMC2305=y CONFIG_FSPI_AHB_EN_4BYTE=y CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
configs/lx2160ardb_tfa_defconfig +1 -0
@@ -18,6 +18,7 @@ CONFIG_SPL_VID=y CONFIG_VID_FLS_ENV="lx2160ardb_vdd_mv" CONFIG_VOL_MONITOR_LTC3882_READ=y CONFIG_VOL_MONITOR_LTC3882_SET=y +CONFIG_FSL_QIXIS=y CONFIG_EMC2305=y CONFIG_FSPI_AHB_EN_4BYTE=y CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
configs/lx2160ardb_tfa_stmm_defconfig +1 -0
@@ -18,6 +18,7 @@ CONFIG_SPL_VID=y CONFIG_VID_FLS_ENV="lx2160ardb_vdd_mv" CONFIG_VOL_MONITOR_LTC3882_READ=y CONFIG_VOL_MONITOR_LTC3882_SET=y +CONFIG_FSL_QIXIS=y CONFIG_EMC2305=y CONFIG_FSPI_AHB_EN_4BYTE=y CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
configs/lx2162aqds_tfa_SECURE_BOOT_defconfig +1 -0
@@ -17,6 +17,7 @@ CONFIG_SPL_VID=y CONFIG_VID_FLS_ENV="lx2162aqds_vdd_mv" CONFIG_VOL_MONITOR_LTC3882_READ=y CONFIG_VOL_MONITOR_LTC3882_SET=y +CONFIG_FSL_QIXIS=y CONFIG_FSPI_AHB_EN_4BYTE=y CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
configs/lx2162aqds_tfa_defconfig +1 -0
@@ -18,6 +18,7 @@ CONFIG_SPL_VID=y CONFIG_VID_FLS_ENV="lx2162aqds_vdd_mv" CONFIG_VOL_MONITOR_LTC3882_READ=y CONFIG_VOL_MONITOR_LTC3882_SET=y +CONFIG_FSL_QIXIS=y CONFIG_FSPI_AHB_EN_4BYTE=y CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
configs/lx2162aqds_tfa_verified_boot_defconfig +1 -0
@@ -18,6 +18,7 @@ CONFIG_SPL_VID=y CONFIG_VID_FLS_ENV="lx2162aqds_vdd_mv" CONFIG_VOL_MONITOR_LTC3882_READ=y CONFIG_VOL_MONITOR_LTC3882_SET=y +CONFIG_FSL_QIXIS=y CONFIG_FSPI_AHB_EN_4BYTE=y CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
include/configs/T208xQDS.h +0 -1
@@ -166,7 +166,6 @@#define CONFIG_SYS_FLASH_BANKS_LIST {CONFIG_SYS_FLASH_BASE_PHYS \ + 0x8000000, CONFIG_SYS_FLASH_BASE_PHYS} -#define CONFIG_FSL_QIXIS /* use common QIXIS code */ #define QIXIS_BASE 0xffdf0000#define QIXIS_LBMAP_SWITCH 6#define QIXIS_LBMAP_MASK 0x0f
include/configs/ls1012aqds.h +0 -2
@@ -15,10 +15,8 @@/* * QIXIS Definitions */ -#define CONFIG_FSL_QIXIS #ifdef CONFIG_FSL_QIXIS -#define CONFIG_QIXIS_I2C_ACCESS #define CONFIG_SYS_I2C_FPGA_ADDR 0x66#define QIXIS_LBMAP_BRDCFG_REG 0x04#define QIXIS_LBMAP_SWITCH 6
include/configs/ls1021aqds.h +0 -5
@@ -10,10 +10,6 @@#define CONFIG_SYS_INIT_RAM_ADDR OCRAM_BASE_ADDR#define CONFIG_SYS_INIT_RAM_SIZE OCRAM_SIZE -#if defined(CONFIG_QSPI_BOOT ) || defined(CONFIG_SD_BOOT_QSPI ) -#define CONFIG_QIXIS_I2C_ACCESS -#endif -#ifdef CONFIG_SD_BOOT #define CONFIG_SPL_MAX_SIZE 0x1a000#define CONFIG_SPL_STACK 0x1001d000
@@ -145,7 +141,6 @@/* * QIXIS Definitions */ -#define CONFIG_FSL_QIXIS #ifdef CONFIG_FSL_QIXIS #define QIXIS_BASE 0x7fb00000
include/configs/ls1028aqds.h +0 -3
@@ -10,12 +10,9 @@#define COUNTER_FREQUENCY_REAL (get_board_sys_clk() / 4) -#define CONFIG_QIXIS_I2C_ACCESS -/* * QIXIS Definitions */ -#define CONFIG_FSL_QIXIS #ifdef CONFIG_FSL_QIXIS #define QIXIS_BASE 0x7fb00000
include/configs/ls1028ardb.h +0 -3
@@ -14,12 +14,9 @@/* Store environment at top of flash */ -#define CONFIG_QIXIS_I2C_ACCESS -/* * QIXIS Definitions */ -#define CONFIG_FSL_QIXIS #ifdef CONFIG_FSL_QIXIS #define QIXIS_BASE 0x7fb00000
include/configs/ls1043aqds.h +0 -2
@@ -134,13 +134,11 @@#if defined(CONFIG_TFABOOT ) || \ defined(CONFIG_QSPI_BOOT ) || defined(CONFIG_SD_BOOT_QSPI ) -#define CONFIG_QIXIS_I2C_ACCESS #endif /* * QIXIS Definitions */ -#define CONFIG_FSL_QIXIS #ifdef CONFIG_FSL_QIXIS #define QIXIS_BASE 0x7fb00000
include/configs/ls1046aqds.h +0 -2
@@ -151,13 +151,11 @@#if defined(CONFIG_TFABOOT ) || \ defined(CONFIG_QSPI_BOOT ) || defined(CONFIG_SD_BOOT_QSPI ) -#define CONFIG_QIXIS_I2C_ACCESS #endif /* * QIXIS Definitions */ -#define CONFIG_FSL_QIXIS #ifdef CONFIG_FSL_QIXIS #define QIXIS_BASE 0x7fb00000
include/configs/ls1088aqds.h +0 -4
@@ -9,10 +9,7 @@#include "ls1088a_common.h" #if defined(CONFIG_QSPI_BOOT ) || defined(CONFIG_SD_BOOT_QSPI ) -#define CONFIG_QIXIS_I2C_ACCESS #define SYS_NO_FLASH -#else -#define CONFIG_QIXIS_I2C_ACCESS #endif #define COUNTER_FREQUENCY_REAL (get_board_sys_clk()/4)
@@ -116,7 +113,6 @@#define CONFIG_SYS_MAX_NAND_DEVICE 1#define CONFIG_MTD_NAND_VERIFY_WRITE -#define CONFIG_FSL_QIXIS #define CONFIG_SYS_I2C_FPGA_ADDR 0x66#define QIXIS_LBMAP_SWITCH 6#define QIXIS_QMAP_MASK 0xe0
include/configs/ls1088ardb.h +0 -7
@@ -10,9 +10,6 @@#if defined(CONFIG_TFABOOT ) || \ defined(CONFIG_QSPI_BOOT ) || defined(CONFIG_SD_BOOT_QSPI ) -#ifndef CONFIG_SPL_BUILD -#define CONFIG_QIXIS_I2C_ACCESS -#endif #define SYS_NO_FLASH #endif
@@ -104,10 +101,6 @@#define CONFIG_SYS_MAX_NAND_DEVICE 1#define CONFIG_MTD_NAND_VERIFY_WRITE -#ifndef SPL_NO_QIXIS -#define CONFIG_FSL_QIXIS -#endif -#define CONFIG_SYS_I2C_FPGA_ADDR 0x66#define QIXIS_BRDCFG4_OFFSET 0x54#define QIXIS_LBMAP_SWITCH 2
include/configs/ls2080aqds.h +0 -2
@@ -10,7 +10,6 @@#include "ls2080a_common.h" #ifdef CONFIG_FSL_QSPI -#define CONFIG_QIXIS_I2C_ACCESS #define CONFIG_SYS_I2C_IFDR_DIV 0x7e#endif
@@ -122,7 +121,6 @@#define CONFIG_SYS_MAX_NAND_DEVICE 1#define CONFIG_MTD_NAND_VERIFY_WRITE -#define CONFIG_FSL_QIXIS /* use common QIXIS code */ #define QIXIS_LBMAP_SWITCH 0x06#define QIXIS_LBMAP_MASK 0x0f#define QIXIS_LBMAP_SHIFT 0
include/configs/ls2080ardb.h +0 -8
@@ -9,12 +9,6 @@#include "ls2080a_common.h" -#ifdef CONFIG_FSL_QSPI -#ifdef CONFIG_TARGET_LS2081ARDB -#define CONFIG_QIXIS_I2C_ACCESS -#endif -#endif -#define I2C_MUX_CH_VOL_MONITOR 0xa#define I2C_VOL_MONITOR_ADDR 0x38
@@ -124,7 +118,6 @@#define CONFIG_SYS_MAX_NAND_DEVICE 1#define CONFIG_MTD_NAND_VERIFY_WRITE -#define CONFIG_FSL_QIXIS /* use common QIXIS code */ #define QIXIS_LBMAP_SWITCH 0x06#define QIXIS_LBMAP_MASK 0x0f#define QIXIS_LBMAP_SHIFT 0
@@ -210,7 +203,6 @@#define CONFIG_SYS_LS_MC_BOOT_TIMEOUT_MS 5000#ifdef CONFIG_TARGET_LS2081ARDB -#define CONFIG_FSL_QIXIS /* use common QIXIS code */ #define QIXIS_QMAP_MASK 0x07#define QIXIS_QMAP_SHIFT 5#define QIXIS_LBMAP_DFLTBANK 0x00
include/configs/lx2160a_common.h +0 -2
@@ -90,8 +90,6 @@#define CONFIG_SYS_EEPROM_BUS_NUM 0/* Qixis */ -#define CONFIG_FSL_QIXIS -#define CONFIG_QIXIS_I2C_ACCESS #define CONFIG_SYS_I2C_FPGA_ADDR 0x66/* PCI */
Signature · 1 line
2.25.1
Re: [PATCH 22/25] Convert CONFIG_FSL_QIXIS et al to Kconfig
Quoted 5 lines · Tom Rini
This converts the following to
Kconfig:
CONFIG_FSL_QIXIS
CONFIG_QIXIS_I2C_ACCESSSigned-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH 23/25 m53menlo: Drop CONFIG_DISCOVER_PHY
In reply to Tom RiniThis is not used in code, drop.
--- include/configs/m53menlo.h | 1 - 1 file changed, 1 deletion(-)
include/configs/m53menlo.h +0 -1
@@ -71,7 +71,6 @@#ifdef CONFIG_CMD_NET #define IMX_FEC_BASE FEC_BASE_ADDR#define CONFIG_FEC_MXC_PHYADDR 0x0 -#define CONFIG_DISCOVER_PHY #endif #define CONFIG_SYS_RTC_BUS_NUM 1/* I2C2 */
Signature · 1 line
2.25.1
Re: [PATCH 23/25] m53menlo: Drop CONFIG_DISCOVER_PHY
Quoted 3 lines · Tom Rini
This is not used in code, drop.
Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH 24/25 siemens-am33x-common: Drop CONFIG_DMA_COHERENT*
In reply to Tom RiniThese values are not used in the code, remove them.
--- include/configs/siemens-am33x-common.h | 3 --- 1 file changed, 3 deletions(-)
include/configs/siemens-am33x-common.h +0 -3
@@ -15,9 +15,6 @@#include <asm/arch/omap.h> -#define CONFIG_DMA_COHERENT -#define CONFIG_DMA_COHERENT_SIZE (1 << 20) -/* commands to include */ #ifndef CONFIG_SPL_BUILD
Signature · 1 line
2.25.1
Re: [PATCH 24/25] siemens-am33x-common: Drop CONFIG_DMA_COHERENT*
Quoted 3 lines · Tom Rini
These values are not used in the code, remove them.
Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH 25/25 arm: fsl-layerscape: Migrate more DP-DDR options to Kconfig
In reply to Tom RiniBased on current usage, migrate a number of DP-DDR related options to Kconfig.
--- README | 3 --- arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 25 +++++++++++++++++++++++ include/configs/ls2080a_common.h | 10 --------- 3 files changed, 25 insertions(+), 13 deletions(-)
README +0 -3
@@ -487,9 +487,6 @@ The following options need to be configured: CONFIG_SYS_FSL_OTHER_DDR_NUM_CTRLS Number of controllers used for other than main memory. - CONFIG_SYS_FSL_HAS_DP_DDR - Defines the SoC has DP-DDR used for DPAA. - CONFIG_SYS_FSL_SEC_BE Defines the SEC controller register space as Big Endian
arch/arm/cpu/armv8/fsl-layerscape/Kconfig +25 -0
@@ -502,6 +502,31 @@ config SYS_FSL_HAS_CCN508 config SYS_FSL_HAS_DP_DDR bool + help + Defines the SoC has DP-DDR used for DPAA. + +config DP_DDR_CTRL + int + depends on SYS_FSL_HAS_DP_DDR + default 2 if ARCH_LS2080A + +config DP_DDR_NUM_CTRLS + int + depends on SYS_FSL_HAS_DP_DDR + default 1 if ARCH_LS2080A + +config SYS_DP_DDR_BASE + hex + depends on SYS_FSL_HAS_DP_DDR + default 0x6000000000 if ARCH_LS2080A + +config SYS_DP_DDR_BASE_PHY + int + depends on SYS_FSL_HAS_DP_DDR + default 0 if ARCH_LS2080A + help + DDR controller uses this value as the base address for binding. + It is mapped to CONFIG_SYS_DP_DDR_BASE for core to access. config SYS_FSL_SRDS_1 bool
include/configs/ls2080a_common.h +0 -10
@@ -40,16 +40,6 @@#define CPU_RELEASE_ADDR secondary_boot_addr#define CONFIG_SYS_FSL_OTHER_DDR_NUM_CTRLS -#ifdef CONFIG_SYS_FSL_HAS_DP_DDR -#define CONFIG_SYS_DP_DDR_BASE 0x6000000000ULL -/* -* DDR controller use 0 as the base address for binding. -* It is mapped to CONFIG_SYS_DP_DDR_BASE for core to access. -*/ -#define CONFIG_SYS_DP_DDR_BASE_PHY 0 -#define CONFIG_DP_DDR_CTRL 2 -#define CONFIG_DP_DDR_NUM_CTRLS 1 -#endif /* Generic Timer Definitions */ /*
Signature · 1 line
2.25.1
Re: [PATCH 25/25] arm: fsl-layerscape: Migrate more DP-DDR options to Kconfig
Quoted 6 lines · Tom Rini
Based on current usage, migrate a number of DP-DDR related options to
Kconfig.Cc Priyanka Jain <[email protected]>Cc Rajesh Bhagat <[email protected]>Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
Quoted 6 lines · Tom Rini
This converts the following to
Kconfig:
CONFIG_BOARD_SIZE_LIMITTo do this, introduce
CONFIG_HAS_BOARD_SIZE_LIMIT.Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom