summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-06-29mach-rockchip: make_fit_atf.py: support OP-TEE tee.bin v1 formatJerome Forissier
This commit adds support for the OP-TEE 'tee.bin' v1 format for Rockchip platforms. Since OP-TEE 3.8.0, tee.bin contains meta-data in a proprietary format in addition to the ELF data. They are essential information for proper initialization of the TEE core, such as the size of the memory region covered by the TEE or a compact representation of runtime relocation data when ASLR is enabled. With OP-TEE 3.8.0 onwards, 'tee.elf' MUST NOT be used and 'tee.bin' MUST be used instead. Ignoring this recommendation can lead to crashes as described in [3]. Link: [1] https://github.com/OP-TEE/optee_os/commit/5dd1570ac5b0f6563b1a9c074533a19107b8222d Link: [2] https://github.com/OP-TEE/optee_os/blob/3.17.0/scripts/gen_tee_bin.py#L275-L302 Link: [3] https://github.com/OP-TEE/optee_os/issues/4542 Signed-off-by: Jerome Forissier <[email protected]> Tested-by: Peter Griffin <[email protected]> Reviewed-by: Kever Yang <[email protected]> Acked-by: Alper Nebi Yasak <[email protected]>
2022-06-29rockchip: rk3328: nanopi-r2s: Use the sdcard for the envEmmanuel Vadot
The NanoPi-R2S doesn't have eMMC so use the sdcard as the device to save the environment variables Signed-off-by: Emmanuel Vadot <[email protected]> Reviewed-by: Kever Yang <[email protected]>
2022-06-29arm: dts: rockchip: rk3288: move dma-controller nodesJohan Jonker
In order to better compare the Linux rk3288.dtsi version with the u-boot version move the dma-controller nodes to the DT root. Signed-off-by: Johan Jonker <[email protected]> Reviewed-by: Kever Yang <[email protected]>
2022-06-29arm: dts: rockchip: rk3288: sort mipi hdmi lvds and dp nodesJohan Jonker
In order to better compare the Linux rk3288.dtsi version with the u-boot version sort the mipi,hdmi,lvds and dp nodes. Changed: Rename mipi_dsi label. Rename dp nodename. Signed-off-by: Johan Jonker <[email protected]> Reviewed-by: Kever Yang <[email protected]>
2022-06-29arm: dts: rockchip: rk3288: bulk convert gpios to their constant counterpartsJohan Jonker
Bulk convert rk3288 DT gpios to their constant counterparts. Partial Linux sync for the rk3288.dtsi file. ARM: dts: rockchip: bulk convert gpios to their constant counterparts https://lore.kernel.org/all/[email protected]/ sed -i -f script.sed rk3288.dtsi ================================ /rockchip,pins *=/bcheck b # to end of script :append-next-line N :check /^[^;]*$/bappend-next-line s/<RK_GPIO\([0-9]\) /<\1 /g s/<\([^ ][^ ]* *\)0 /<\1RK_PA0 /g s/<\([^ ][^ ]* *\)1 /<\1RK_PA1 /g s/<\([^ ][^ ]* *\)2 /<\1RK_PA2 /g s/<\([^ ][^ ]* *\)3 /<\1RK_PA3 /g s/<\([^ ][^ ]* *\)4 /<\1RK_PA4 /g s/<\([^ ][^ ]* *\)5 /<\1RK_PA5 /g s/<\([^ ][^ ]* *\)6 /<\1RK_PA6 /g s/<\([^ ][^ ]* *\)7 /<\1RK_PA7 /g s/<\([^ ][^ ]* *\)8 /<\1RK_PB0 /g s/<\([^ ][^ ]* *\)9 /<\1RK_PB1 /g s/<\([^ ][^ ]* *\)10 /<\1RK_PB2 /g s/<\([^ ][^ ]* *\)11 /<\1RK_PB3 /g s/<\([^ ][^ ]* *\)12 /<\1RK_PB4 /g s/<\([^ ][^ ]* *\)13 /<\1RK_PB5 /g s/<\([^ ][^ ]* *\)14 /<\1RK_PB6 /g s/<\([^ ][^ ]* *\)15 /<\1RK_PB7 /g s/<\([^ ][^ ]* *\)16 /<\1RK_PC0 /g s/<\([^ ][^ ]* *\)17 /<\1RK_PC1 /g s/<\([^ ][^ ]* *\)18 /<\1RK_PC2 /g s/<\([^ ][^ ]* *\)19 /<\1RK_PC3 /g s/<\([^ ][^ ]* *\)20 /<\1RK_PC4 /g s/<\([^ ][^ ]* *\)21 /<\1RK_PC5 /g s/<\([^ ][^ ]* *\)22 /<\1RK_PC6 /g s/<\([^ ][^ ]* *\)23 /<\1RK_PC7 /g s/<\([^ ][^ ]* *\)24 /<\1RK_PD0 /g s/<\([^ ][^ ]* *\)25 /<\1RK_PD1 /g s/<\([^ ][^ ]* *\)26 /<\1RK_PD2 /g s/<\([^ ][^ ]* *\)27 /<\1RK_PD3 /g s/<\([^ ][^ ]* *\)28 /<\1RK_PD4 /g s/<\([^ ][^ ]* *\)29 /<\1RK_PD5 /g s/<\([^ ][^ ]* *\)30 /<\1RK_PD6 /g s/<\([^ ][^ ]* *\)31 /<\1RK_PD7 /g s/<\([^ ][^ ]* *[^ ][^ ]* *\)0 /<\1RK_FUNC_GPIO /g s/<\([^ ][^ ]* *[^ ][^ ]* *\)RK_FUNC_\([1-9]\) /<\1\2 /g Signed-off-by: Johan Jonker <[email protected]> Reviewed-by: Kever Yang <[email protected]>
2022-06-29arm: dts: rockchip: remove usb-phy fallback string for rk3188Johan Jonker
With the conversion of rockchip-usb-phy.yaml a long time used fallback string for rk3066a/rk3188 was added. The linux driver doesn't do much with the GRF phy address range, however the u-boot driver rockchip_usb2_phy.c does. The bits in GRF_UOC0_CON2 for rk3066a/rk3188 and rk3288 for example don't match. Remove the usb-phy fallback string for rk3188 to prevent possible strange side effects. Signed-off-by: Johan Jonker <[email protected]> Reviewed-by: Kever Yang <[email protected]>
2022-06-29rockchip: board: change condition board_usb_init() in functionJohan Jonker
Change define condition in board_usb_init() function to allow rk3066/rk3188 to use the USB PHY driver. Signed-off-by: Johan Jonker <[email protected]> Reviewed-by: Kever Yang <[email protected]>
2022-06-29rockchip: usb: phy: add rk3066/rk3188 supportJohan Jonker
Add rk3066a/rk3188 support to rockchip_usb2_phy.c They don't have completely identical usb phy registers, so separate comapatible strings and data. Signed-off-by: Johan Jonker <[email protected]> Reviewed-by: Kever Yang <[email protected]>
2022-06-29rockchip: usb: gadget: add rk3066 product idPaweł Jarosz
Product id of rk3066 usb otg is 0x300a. Signed-off-by: Paweł Jarosz <[email protected]> Signed-off-by: Johan Jonker <[email protected]> Reviewed-by: Kever Yang <[email protected]>
2022-06-29rockchip: include: configs: remove unused configs for tag and sizeJohan Jonker
The configs ROCKCHIP_CHIP_TAG and ROCKCHIP_MAX_INIT_SIZE were originally added with rksd.c, rkspi.c and rkcommon.c in mind, but are no longer in use and replaced by struct spl_info, so remove unused configs for tag and size. Signed-off-by: Johan Jonker <[email protected]> Reviewed-by: Kever Yang <[email protected]>
2022-06-29phycore-rk3288: Avoid enabling partition support in SPLSimon Glass
This is not needed or used, and adds code size. Drop it. Signed-off-by: Simon Glass <[email protected]> Reviewed-by: Kever Yang <[email protected]>
2022-06-28gw_ventana: Migrate to using CONFIG_EXTRA_ENV_TEXTTom Rini
Move the environment text over from being set via CONFIG_EXTRA_ENV_SETTINGS in include/configs/gw_ventana.h and over to plain text in board/gateworks/gw_ventana/gw_ventana.env. This lets us drop CONFIG_EXTRA_ENV_SETTINGS_COMMON as everything resides in a single environment file now. Cc: Tim Harvey <[email protected]> Signed-off-by: Tom Rini <[email protected]> Acked-by: Tim Harvey <[email protected]>
2022-06-28Complete migration of MTDPARTS_DEFAULT / MTDIDS_DEFAULT, include in environmentTom Rini
- Ensure that everyone setting mtdids= and mtdparts= is doing so via the CONFIG options. - If the CONFIG options are set, ensure that the default environment sets mtdparts / mtdids. Signed-off-by: Tom Rini <[email protected]>
2022-06-28Rename CONFIG_SYS_AUTOLAOD to CONFIG_SYS_DISABLE_AUTOLOADTom Rini
The "autoload" environment variable is always checked with env_get_yesno as it can be set to any form of no. The default behavior of env_get_yesno is to return -1 on variables that are not set, which acts as true in general (we test for non-zero return). To convert CONFIG_SYS_AUTOLOAD to Kconfig, given that it was almost always used to set autoload to no, first rename to CONFIG_SYS_DISABLE_AUTOLOAD for consistency sake. Then, make it so that if enabled we set autoload=0 in the default environment. Migrate all platforms which set CONFIG_SYS_AUTOLOAD to non-true or that set autoload to false in their default environment to using CONFIG_SYS_DISABLE_AUTOLOAD Signed-off-by: Tom Rini <[email protected]>
2022-06-28opos6uldev: Migrate to using CONFIG_EXTRA_ENV_TEXTTom Rini
Move the environment text over from being set via CONFIG_EXTRA_ENV_SETTINGS in include/configs/opos6uldev.h and over to plain text in board/armadeus/opos6uldev/opos6uldev.env. This lets us manage env_version without a CONFIG variable. Cc: Sébastien Szymanski <[email protected]> Signed-off-by: Tom Rini <[email protected]>
2022-06-28Convert CONFIG_ENV_RANGE to KconfigTom Rini
This converts the following to Kconfig: CONFIG_ENV_RANGE Now that this is in Kconfig we can enforce a minimum size and so remove the check in C code to ensure range is larger than size. Signed-off-by: Tom Rini <[email protected]>
2022-06-28dragonboard410c: Migrate to using CONFIG_EXTRA_ENV_TEXTTom Rini
With the exception of distro_boot support, we can move all of the rest of the environment changes to come from CONFIG_EXTRA_ENV_TEXT and in turn remove CONFIG_ENV_REFLASH. Cc: Ramon Fried <[email protected]> Signed-off-by: Tom Rini <[email protected]>
2022-06-28env: Remove include/generated/env.* under "make clean"Tom Rini
When running "make clean" we want to remove env.in and well as env.txt. Cc: Simon Glass <[email protected]> Signed-off-by: Tom Rini <[email protected]>
2022-06-28env: Do not make CONFIG_EXTRA_ENV_TEXT and CONFIG_EXTRA_ENV_SETTINGS conflictTom Rini
Largely, the use of CONFIG_EXTRA_ENV_SETTINGS can be migrated directly to come from CONFIG_EXTRA_ENV_TEXT. The biggest case that cannot easily be migrated is distro_bootcmd support. Rather than block migration on this, remove the #error here so that we can being moving forward. Cc: Joe Hershberger <[email protected]> Cc: Wolfgang Denk <[email protected]> Cc: Simon Glass <[email protected]> Signed-off-by: Tom Rini <[email protected]>
2022-06-28Convert CONFIG_SYS_USB_FAT_BOOT_PARTITION to KconfigTom Rini
This converts the following to Kconfig: CONFIG_SYS_USB_FAT_BOOT_PARTITION Signed-off-by: Tom Rini <[email protected]>
2022-06-28Convert CONFIG_USB_MAX_CONTROLLER_COUNT to KconfigTom Rini
This converts the following to Kconfig: CONFIG_USB_MAX_CONTROLLER_COUNT Signed-off-by: Tom Rini <[email protected]>
2022-06-28common: usb: Update logic for usb.o, usb_hub.o and usb_storage.oTom Rini
Now that we have consistently named symbols to enable USB host or gadget controller support in SPL or full U-Boot, we do not need to unconditionally build USB files nor depend on non-SPL symbols to know when to build these common files. Signed-off-by: Tom Rini <[email protected]>
2022-06-28mx6memcal: Remove SPL_USB_HOSTTom Rini
As this particular platform is intended to be loaded and run a specific set of routines in SPL, we do not need the ability to further use the USB as a host device in SPL. Disable this support. Cc: Eric Nelson <[email protected]> Signed-off-by: Tom Rini <[email protected]> Acked-by: Eric Nelson <[email protected]>
2022-06-28usb: Remove non-DM code in ehci-fsl and xhciTom Rini
The DM_USB migration deadline has passed and this is not used in SPL. Remove this now unused code. Signed-off-by: Tom Rini <[email protected]>
2022-06-28Convert CONFIG_FPGA_STRATIX_V to KconfigTom Rini
This converts the following to Kconfig: CONFIG_FPGA_STRATIX_V Signed-off-by: Tom Rini <[email protected]>
2022-06-28fpga: Remove CONFIG_FPGA_COUNTTom Rini
This define is only currently used in a single board, and always set to one. Define this within the board code and remove other references. Signed-off-by: Tom Rini <[email protected]>
2022-06-28Convert CONFIG_ENV_MIN_ENTRIES et al to KconfigTom Rini
This converts the following to Kconfig: CONFIG_ENV_MIN_ENTRIES CONFIG_ENV_MAX_ENTRIES Cc: Michal Simek <[email protected]> Signed-off-by: Tom Rini <[email protected]>
2022-06-28Globally remove most CONFIG_SPL_BUILD tests from config headersTom Rini
With the exception of how PowerPC handles SPL and TPL (which has its own issues), we cannot safely hide options under CONFIG_SPL_BUILD. Largely remove the places that have this test today. Signed-off-by: Tom Rini <[email protected]>
2022-06-28Convert CONFIG_SYS_MPC85XX_NO_RESETVEC to KconfigTom Rini
This converts the following to Kconfig: CONFIG_SYS_MPC85XX_NO_RESETVEC Signed-off-by: Tom Rini <[email protected]>
2022-06-28Remove CONFIG_SPL_RAW_IMAGE_ARM_TRUSTED_FIRMWARE and ↵Tom Rini
CONFIG_SPL_ABORT_ON_RAW_IMAGE These symbols do not exist in mainline, remove them. Signed-off-by: Tom Rini <[email protected]>
2022-06-28siemens: Move CONFIG_FACTORYSET to KconfigTom Rini
Introduce board/siemens/common/Kconfig and have it hold FACTORYSET to start with. Use select for this on the boards that need it. Cc: Anatolij Gustschin <[email protected]> Cc: Samuel Egli <[email protected]> Signed-off-by: Tom Rini <[email protected]>
2022-06-28video: Migrate exynos display options to KconfigTom Rini
Following how it's done for the majority of drivers, add a new VIDEO_EXYNOS option and Kconfig file under drivers/video/exynos and list the current options there. Cc: Anatolij Gustschin <[email protected]> Cc: Jaehoon Chung <[email protected]> Cc: Minkyu Kang <[email protected]> Signed-off-by: Tom Rini <[email protected]> Reviewed-by: Minkyu Kang <[email protected]>
2022-06-28arm: samsung: Migrate a number of symbols to KconfigTom Rini
- In a number of cases, use CONFIG_ARCH_EXYNOS[45] rather than CONFIG_EXYNOS[45] - In other cases, test for CONFIG_ARCH_EXYNOS or CONFIG_ARCH_S5PC1XX - Migrate specific SoC CONFIG values to Kconfig - Use CONFIG_TARGET_x rather than CONFIG_x - Migrate other CONFIG_EXYNOS_x symbols to Kconfig - Reference CONFIG_EXYNOS_RELOCATE_CODE_BASE directly as EXYNOS_RELOCATE_CODE_BASE - Rename CONFIG_S5P_PA_SYSRAM to CONFIG_SMP_PEN_ADDR to match the rest of U-Boot usage. Cc: Minkyu Kang <[email protected]> Signed-off-by: Tom Rini <[email protected]>
2022-06-28arm: exynos: Remove old pwm backlight driverTom Rini
Remove the unused older exynos pwm backlight driver. Signed-off-by: Tom Rini <[email protected]> Reviewed-by: Minkyu Kang <[email protected]>
2022-06-28arm: samsung: Remove dead LCD codeTom Rini
Since bb5930d5c97f ("exynos: video: Convert several boards to driver model for video") there have been no callers of any of the exynos_lcd_* family of functions. Remove these from the boards, and then remove unused logo and related code as well. Signed-off-by: Tom Rini <[email protected]> Reviewed-by: Minkyu Kang <[email protected]>
2022-06-28block: ide: Remove ide_preinit functionTom Rini
The only platform currently that defines an ide_preinit function has an empty one that immediately returns. Remove this hook. Signed-off-by: Tom Rini <[email protected]>
2022-06-28ata: sata_sil: Remove useless BLK guard in sata_sil.hTom Rini
Now that the driver only supports CONFIG_BLK, remove the useless guard in sata_sil.h. Signed-off-by: Tom Rini <[email protected]>
2022-06-28Convert CONFIG_LBA48 et al to KconfigTom Rini
This converts the following to Kconfig: CONFIG_LBA48 CONFIG_SYS_64BIT_LBA Signed-off-by: Tom Rini <[email protected]>
2022-06-28Convert CONFIG_FSL_SATA_V2 to KconfigTom Rini
This converts the following to Kconfig: CONFIG_FSL_SATA_V2 Signed-off-by: Tom Rini <[email protected]>
2022-06-28ata: fsl_sata: Remove legacy non-BLK codeTom Rini
The migration deadline for this has passed and all boards have been updated, remove this legacy code and references for it. Signed-off-by: Tom Rini <[email protected]>
2022-06-28ata: dwc_ahsata: Remove legacy non-CONFIG_AHCI codeTom Rini
The migration deadline for this has passed and all boards have been updated, remove this legacy code and references for it. Signed-off-by: Tom Rini <[email protected]>
2022-06-28xtensa: Switch to using CONFIG_XTENSA for building device treesTom Rini
The only use of CONFIG_XTFPGA was to build all of the in-tree device trees. Switch to using CONFIG_XTENSA instead of a non-Kconfig symbol. Signed-off-by: Tom Rini <[email protected]>
2022-06-28vpl: Ensure all VPL symbols in Kconfig have some VPL dependencyTom Rini
Tighten up symbol dependencies in a number of places. Ensure that a VPL specific option has at least a direct dependency on VPL. In places where it's clear that we depend on something more specific, use that dependency instead. Reported-by: Pali Rohár <[email protected]> Signed-off-by: Tom Rini <[email protected]>
2022-06-28tpl: Ensure all TPL symbols in Kconfig have some TPL dependencyTom Rini
Tighten up symbol dependencies in a number of places. Ensure that a TPL specific option has at least a direct dependency on TPL. In places where it's clear that we depend on something more specific, use that dependency instead. Reported-by: Pali Rohár <[email protected]> Signed-off-by: Tom Rini <[email protected]>
2022-06-28spl: Move SPL_LDSCRIPT defaults to one placeTom Rini
We want to keep all of the default values for SPL_LDSCRIPT in the same place both for overall clarity as well as not polluting unrelated config files. Signed-off-by: Tom Rini <[email protected]>
2022-06-28usb: ehci-mx5: Remove non-DM codeTom Rini
The deadline for DM_USB migration has passed and all users have been migrated. Remove now unused code. Signed-off-by: Tom Rini <[email protected]>
2022-06-28usb: ehci-mxc: RemoveTom Rini
There are no platforms enabling this driver, remove. Signed-off-by: Tom Rini <[email protected]>
2022-06-28PowerPC: Remove some unused USB codeTom Rini
These particular code paths aren't used anymore, remove. Signed-off-by: Tom Rini <[email protected]>
2022-06-28Convert CONFIG_TEGRA_GPU to KconfigTom Rini
This converts the following to Kconfig: CONFIG_TEGRA_GPU Signed-off-by: Tom Rini <[email protected]>
2022-06-28usb: xhci-fsl: Remove non-DM codeTom Rini
The deadline for DM_USB migration has passed and all users have been migrated. Remove now unused code. Signed-off-by: Tom Rini <[email protected]>