]> git.dujemihanovic.xyz Git - u-boot.git/log
u-boot.git
2 years agoConvert CONFIG_NEVER_ASSERT_ODT_TO_CPU to Kconfig
Tom Rini [Sun, 4 Dec 2022 15:03:28 +0000 (10:03 -0500)]
Convert CONFIG_NEVER_ASSERT_ODT_TO_CPU to Kconfig

This converts the following to Kconfig:
    CONFIG_NEVER_ASSERT_ODT_TO_CPU

Signed-off-by: Tom Rini <trini@konsulko.com>
2 years agork32xx: Use standard TPL linker script
Tom Rini [Sun, 4 Dec 2022 15:03:27 +0000 (10:03 -0500)]
rk32xx: Use standard TPL linker script

As of 2f41ade79e59 ("linker: Modify linker scripts to be more generic")
we can use the same linker script for SPL and TPL and not have to make
use of #undef tricks. Remove these last remnants.

Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
2 years agoexynos: Rework legacy PWM usage
Tom Rini [Sun, 4 Dec 2022 15:03:26 +0000 (10:03 -0500)]
exynos: Rework legacy PWM usage

The way that the timer support is currently done for exynos/nexell
platforms relies on the legacy PWM infrastructure, and that needs to be
updated. However, we really cannot safely undef CONFIG_DM_PWM to build
the timer.c file without warnings. For now, rename the relevant legacy
functions to be prefixed with s5p_ and add prototypes to the arch pwm.h
files.

Cc: Minkyu Kang <mk7.kang@samsung.com>
Cc: Jaehoon Chung <jh80.chung@samsung.com>
Cc: Dzmitry Sankouski <dsankouski@gmail.com>
Cc: Stefan Bosch <stefan_b@posteo.net>
Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
2 years agoMerge branch '2022-12-21-CONFIG-migration-work' into next
Tom Rini [Thu, 22 Dec 2022 15:33:04 +0000 (10:33 -0500)]
Merge branch '2022-12-21-CONFIG-migration-work' into next

- Bring in the second to last big batch of CONFIG migrations and
  renames. Of note here we fix a few inconsistencies around the baudrate
  tables on some SoCs and now are consistent in hostname/etc handling in
  the environment.

2 years agoT104xRDB: Remove non-TARGET_T1042D4RDB variants
Tom Rini [Fri, 2 Dec 2022 21:42:51 +0000 (16:42 -0500)]
T104xRDB: Remove non-TARGET_T1042D4RDB variants

At this point only the TARGET_T1042D4RDB variant of this is supported in
tree, so remove the remaining parts of the other platforms.

Signed-off-by: Tom Rini <trini@konsulko.com>
2 years agonxp: Rename CONFIG_U_BOOT_HDR_SIZE to FSL_U_BOOT_HDR_SIZE
Tom Rini [Fri, 2 Dec 2022 21:42:50 +0000 (16:42 -0500)]
nxp: Rename CONFIG_U_BOOT_HDR_SIZE to FSL_U_BOOT_HDR_SIZE

This is always defined to 16K, so we move this over to
include/fsl_validate.h to start with. Next, we rename this from CONFIG_
to FSL_. Coalesce the various comments around this definition to be in
fsl_validate.h as well to explain the usage.

Signed-off-by: Tom Rini <trini@konsulko.com>
2 years agousb: Remove CONFIG_USBD_HS
Tom Rini [Fri, 2 Dec 2022 21:42:49 +0000 (16:42 -0500)]
usb: Remove CONFIG_USBD_HS

This define is not enabled by the only platform which currently enables
the legacy option of CONFIG_USB_DEVICE. We can drop this code.

Signed-off-by: Tom Rini <trini@konsulko.com>
2 years agonet: vsc9953: Remove this driver
Tom Rini [Fri, 2 Dec 2022 21:42:48 +0000 (16:42 -0500)]
net: vsc9953: Remove this driver

No platforms enable this driver as there's no T1040D4RDB nor T1040RDB
support at this time.  Remove.

Signed-off-by: Tom Rini <trini@konsulko.com>
2 years agonet: Remove more legacy functions
Tom Rini [Fri, 2 Dec 2022 21:42:47 +0000 (16:42 -0500)]
net: Remove more legacy functions

Remove some of the board and arch specific non-DM_ETH helper code.

Signed-off-by: Tom Rini <trini@konsulko.com>
2 years agoConvert CONFIG_THOR_RESET_OFF to Kconfig
Tom Rini [Fri, 2 Dec 2022 21:42:46 +0000 (16:42 -0500)]
Convert CONFIG_THOR_RESET_OFF to Kconfig

This converts the following to Kconfig:
   CONFIG_THOR_RESET_OFF

Signed-off-by: Tom Rini <trini@konsulko.com>
2 years agoConvert CONFIG_TEGRA_ENABLE_UARTA et al to Kconfig
Tom Rini [Fri, 2 Dec 2022 21:42:45 +0000 (16:42 -0500)]
Convert CONFIG_TEGRA_ENABLE_UARTA et al to Kconfig

This converts the following to Kconfig:
   CONFIG_TEGRA_ENABLE_UARTA
   CONFIG_TEGRA_ENABLE_UARTB
   CONFIG_TEGRA_ENABLE_UARTC
   CONFIG_TEGRA_ENABLE_UARTD
   CONFIG_TEGRA_SPI
   CONFIG_TEGRA_UARTA_GPU
   CONFIG_TEGRA_UARTA_SDIO1
   CONFIG_TEGRA_VDD_CORE_TPS62361B_SET3
   CONFIG_TEGRA_VDD_CORE_TPS62366A_SET1

Signed-off-by: Tom Rini <trini@konsulko.com>
2 years agoConvert CONFIG_STANDALONE_LOAD_ADDR to Kconfig
Tom Rini [Fri, 2 Dec 2022 21:42:44 +0000 (16:42 -0500)]
Convert CONFIG_STANDALONE_LOAD_ADDR to Kconfig

This converts the following to Kconfig:
   CONFIG_STANDALONE_LOAD_ADDR

Signed-off-by: Tom Rini <trini@konsulko.com>
2 years agosandbox: Finish migration to Kconfig
Tom Rini [Fri, 2 Dec 2022 21:42:43 +0000 (16:42 -0500)]
sandbox: Finish migration to Kconfig

Stop using CONFIG_SANDBOX_ARCH and use CONFIG_SANDBOX instead. For the
SPI related defines, set them directly in Kconfig. This now empties
arch/sandbox/include/asm/config.h.

Cc: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
2 years agopowerpc: Migrate CONFIG_PPC_SPINTABLE_COMPATIBLE to Kconfig
Tom Rini [Fri, 2 Dec 2022 21:42:42 +0000 (16:42 -0500)]
powerpc: Migrate CONFIG_PPC_SPINTABLE_COMPATIBLE to Kconfig

Move this symbol to Kconfig, and preserve the current behavior. The
help text here comes from where the relevant code is implemented and it
is quite likely at this point in time we could either disable this
option or at least make it configurable.

Signed-off-by: Tom Rini <trini@konsulko.com>
2 years agoarm: ti814x: Remove remaining support code
Tom Rini [Fri, 2 Dec 2022 21:42:41 +0000 (16:42 -0500)]
arm: ti814x: Remove remaining support code

When the ti814x_evm config was removed most, but not all, of the
relevant support code was remove.  Get rid of what was missed.

Fixes: 50b532686849 ("ti814x: Remove platform")
Signed-off-by: Tom Rini <trini@konsulko.com>
2 years agoConvert CONFIG_PEN_ADDR_BIG_ENDIAN to Kconfig
Tom Rini [Fri, 2 Dec 2022 21:42:40 +0000 (16:42 -0500)]
Convert CONFIG_PEN_ADDR_BIG_ENDIAN to Kconfig

This converts the following to Kconfig:
   CONFIG_PEN_ADDR_BIG_ENDIAN

Signed-off-by: Tom Rini <trini@konsulko.com>
2 years agoConvert CONFIG_OVERWRITE_ETHADDR_ONCE to Kconfig
Tom Rini [Fri, 2 Dec 2022 21:42:39 +0000 (16:42 -0500)]
Convert CONFIG_OVERWRITE_ETHADDR_ONCE to Kconfig

This converts the following to Kconfig:
   CONFIG_OVERWRITE_ETHADDR_ONCE

Signed-off-by: Tom Rini <trini@konsulko.com>
2 years agoetamin: Rework CONFIG_NAND_CS_INIT
Tom Rini [Fri, 2 Dec 2022 21:42:38 +0000 (16:42 -0500)]
etamin: Rework CONFIG_NAND_CS_INIT

Enable this in the board Kconfig file, but then check for it via
CONFIG_IS_ENABLED so that it will only be true in the non-SPL case, as
is done today.  As part of this we move some defines local to where
they are used as it's board specific.

Cc: Samuel Egli <samuel.egli@siemens.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
2 years agoConvert CONFIG_MXC_NAND_HWECC to Kconfig
Tom Rini [Fri, 2 Dec 2022 21:42:37 +0000 (16:42 -0500)]
Convert CONFIG_MXC_NAND_HWECC to Kconfig

This converts the following to Kconfig:
   CONFIG_MXC_NAND_HWECC

Signed-off-by: Tom Rini <trini@konsulko.com>
2 years agoConvert CONFIG_MONITOR_IS_IN_RAM to Kconfig
Tom Rini [Fri, 2 Dec 2022 21:42:36 +0000 (16:42 -0500)]
Convert CONFIG_MONITOR_IS_IN_RAM to Kconfig

This converts the following to Kconfig:
   CONFIG_MONITOR_IS_IN_RAM

As part of this, reword some of the documentation slightly to reflect
that this is in Kconfig and not a define now.

Signed-off-by: Tom Rini <trini@konsulko.com>
2 years agoddr: fsl: Remove CONFIG_MEM_INIT_VALUE
Tom Rini [Fri, 2 Dec 2022 21:42:35 +0000 (16:42 -0500)]
ddr: fsl: Remove CONFIG_MEM_INIT_VALUE

The way all of the memory init code here works is that we pass
0xDEADBEEF around for the initial value (as it's a well known 'poison'
value and so easily recognized in debuggers, etc). The only point of
this CONFIG symbol was to pass in a different value for that purpose.
Drop this symbol and cleanup the code slightly.

Signed-off-by: Tom Rini <trini@konsulko.com>
2 years agomalta: Rename CONFIG_MALTA to CONFIG_TARGET_MALTA
Tom Rini [Fri, 2 Dec 2022 21:42:34 +0000 (16:42 -0500)]
malta: Rename CONFIG_MALTA to CONFIG_TARGET_MALTA

Fixup this last remnant of CONFIG_MALTA.

Cc: Paul Burton <paul.burton@mips.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
2 years agoConvert CONFIG_L2_CACHE to Kconfig
Tom Rini [Fri, 2 Dec 2022 21:42:33 +0000 (16:42 -0500)]
Convert CONFIG_L2_CACHE to Kconfig

This converts the following to Kconfig:
   CONFIG_L2_CACHE

Signed-off-by: Tom Rini <trini@konsulko.com>
2 years agoConvert CONFIG_KSNET_NETCP_V1_0 et al to Kconfig
Tom Rini [Fri, 2 Dec 2022 21:42:32 +0000 (16:42 -0500)]
Convert CONFIG_KSNET_NETCP_V1_0 et al to Kconfig

This converts the following to Kconfig:
   CONFIG_KSNET_NETCP_V1_0
   CONFIG_KSNET_NETCP_V1_5

Signed-off-by: Tom Rini <trini@konsulko.com>
2 years agoglobal: Remove unused CONFIG symbols
Tom Rini [Fri, 2 Dec 2022 21:42:31 +0000 (16:42 -0500)]
global: Remove unused CONFIG symbols

This removes the following unreferenced CONFIG symbols:
   CONFIG_FDTADDR
   CONFIG_FDTFILE
   CONFIG_FLASH_SECTOR_SIZE
   CONFIG_FSL_CPLD
   CONFIG_HDMI_ENCODER_I2C_ADDR
   CONFIG_I2C_MVTWSI
   CONFIG_I2C_RTC_ADDR
   CONFIG_IRAM_END
   CONFIG_IRAM_SIZE
   CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE
   CONFIG_L1_INIT_RAM
   CONFIG_MACB_SEARCH_PHY
   CONFIG_MIU_2BIT_21_7_INTERLEAVED
   CONFIG_MTD_NAND_VERIFY_WRITE
   CONFIG_MVGBE_PORTS
   CONFIG_NETDEV
   CONFIG_NUM_DSP_CPUS
   CONFIG_PHY_BASE_ADR
   CONFIG_PHY_INTERFACE_MODE
   CONFIG_PSRAM_SCFG
   CONFIG_RAMBOOT_SPIFLASH
   CONFIG_RAMBOOT_TEXT_BASE
   CONFIG_RD_LVL
   CONFIG_ROCKCHIP_SDHCI_MAX_FREQ
   CONFIG_SETUP_INITRD_TAG
   CONFIG_SH_QSPI_BASE
   CONFIG_SMDK5420
   CONFIG_SOCRATES
   CONFIG_SPI_ADDR
   CONFIG_SPI_FLASH_QUAD
   CONFIG_SPI_FLASH_SIZE
   CONFIG_SPI_HALF_DUPLEX
   CONFIG_SPI_N25Q256A_RESET
   CONFIG_TEGRA_SLINK_CTRLS
   CONFIG_TPM_TIS_BASE_ADDRESS
   CONFIG_UBOOT_SECTOR_COUNT
   CONFIG_UBOOT_SECTOR_START
   CONFIG_VAR_SIZE_SPL
   CONFIG_VERY_BIG_RAM

And also:
   BL1_SIZE
   PHY_NO
   RESERVE_BLOCK_SIZE

Signed-off-by: Tom Rini <trini@konsulko.com>
2 years agoi2c: Remove CONFIG_I2C_MULTI_BUS
Tom Rini [Fri, 2 Dec 2022 21:42:30 +0000 (16:42 -0500)]
i2c: Remove CONFIG_I2C_MULTI_BUS

This functionality is part of the legacy I2C subsystem and is currently
unused anywhere.  Remove the remaining references.

Signed-off-by: Tom Rini <trini@konsulko.com>
2 years agoenv: eeprom: Remove CONFIG_I2C_ENV_EEPROM_BUS support
Tom Rini [Fri, 2 Dec 2022 21:42:29 +0000 (16:42 -0500)]
env: eeprom: Remove CONFIG_I2C_ENV_EEPROM_BUS support

This functionality is currently unused, and has not been migrated to
using DM_I2C, even. Drop this.

Signed-off-by: Tom Rini <trini@konsulko.com>
2 years agoarm: samsung: Rename CONFIG_G_DNL_*_NUM variables
Tom Rini [Fri, 2 Dec 2022 21:42:28 +0000 (16:42 -0500)]
arm: samsung: Rename CONFIG_G_DNL_*_NUM variables

Following how g_dnl_bind_fixup is used on other platforms, rename the
unchanging defines used here to be prefixed with EXYNOS rather than
Samsung, and define them here.

Cc: Minkyu Kang <mk7.kang@samsung.com>
Cc: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
2 years agoConvert CONFIG_HOSTNAME et al to Kconfig
Tom Rini [Fri, 2 Dec 2022 21:42:27 +0000 (16:42 -0500)]
Convert CONFIG_HOSTNAME et al to Kconfig

This converts the following to Kconfig:
   CONFIG_GATEWAYIP
   CONFIG_HOSTNAME
   CONFIG_IPADDR
   CONFIG_NETMASK
   CONFIG_ROOTPATH
   CONFIG_SERVERIP
   CONFIG_UBOOTPATH

To do this, we introduce a CONFIG_USE_ form of each of the above and
change include/env_default.h to test for that to be set before setting a
value. Further, we don't want to stringify the IP address related values
as they are now properly strings via Kconfig.

Signed-off-by: Tom Rini <trini@konsulko.com>
2 years agoConvert CONFIG_POWER_PCA9450 to Kconfig
Tom Rini [Fri, 2 Dec 2022 21:42:26 +0000 (16:42 -0500)]
Convert CONFIG_POWER_PCA9450 to Kconfig

This converts the following to Kconfig:
   CONFIG_POWER_PCA9450

Signed-off-by: Tom Rini <trini@konsulko.com>
2 years agomeson64: Fix missing CFG_SYS_BAUDRATE_TABLE migration
Tom Rini [Fri, 2 Dec 2022 21:42:25 +0000 (16:42 -0500)]
meson64: Fix missing CFG_SYS_BAUDRATE_TABLE migration

CONFIG_SYS_BAUDRATE_TABLE has already been migrated to CFG_SYS but this
instance was missed, correct.

Signed-off-by: Tom Rini <trini@konsulko.com>
2 years agoCONFIG_SYS_MPC8xxx_GUTS_ADDR: Migrate to CFG_SYS
Tom Rini [Fri, 2 Dec 2022 21:42:24 +0000 (16:42 -0500)]
CONFIG_SYS_MPC8xxx_GUTS_ADDR: Migrate to CFG_SYS

Due to whitespace, CONFIG_SYS_MPC8xxx_GUTS_ADDR wasn't migrated to
CFG_SYS previously. Do this now.

Signed-off-by: Tom Rini <trini@konsulko.com>
2 years agoenv: nvram: Drop CONFIG_SYS_NVRAM_ACCESS_ROUTINE
Tom Rini [Fri, 2 Dec 2022 21:42:23 +0000 (16:42 -0500)]
env: nvram: Drop CONFIG_SYS_NVRAM_ACCESS_ROUTINE

This option is unused anywhere and likely untested for quite a long
while. Drop this support code.

Signed-off-by: Tom Rini <trini@konsulko.com>
2 years agoConvert CONFIG_FSL_ESDHC_PIN_MUX to Kconfig
Tom Rini [Fri, 2 Dec 2022 21:42:22 +0000 (16:42 -0500)]
Convert CONFIG_FSL_ESDHC_PIN_MUX to Kconfig

This converts the following to Kconfig:
   CONFIG_FSL_ESDHC_PIN_MUX

Signed-off-by: Tom Rini <trini@konsulko.com>
2 years agoConvert CONFIG_FLASH_SPANSION_S29WS_N et al to Kconfig
Tom Rini [Fri, 2 Dec 2022 21:42:21 +0000 (16:42 -0500)]
Convert CONFIG_FLASH_SPANSION_S29WS_N et al to Kconfig

This converts the following to Kconfig:

   CONFIG_FLASH_SPANSION_S29WS_N
   CONFIG_FLASH_VERIFY
   CONFIG_FSL_FM_10GEC_REGULAR_NOTATION
   CONFIG_FSL_ISBC_KEY_EXT
   CONFIG_FSL_TRUST_ARCH_v1
   CONFIG_FSL_SDHC_V2_3
   CONFIG_MAX_DSP_CPUS
   CONFIG_MIU_2BIT_INTERLEAVED
   CONFIG_SERIAL_BOOT
   CONFIG_SPI_BOOTING
   CONFIG_X86EMU_RAW_IO

Signed-off-by: Tom Rini <trini@konsulko.com>
2 years agoConvert CONFIG_FLASH_SHOW_PROGRESS to Kconfig
Tom Rini [Fri, 2 Dec 2022 21:42:20 +0000 (16:42 -0500)]
Convert CONFIG_FLASH_SHOW_PROGRESS to Kconfig

This converts the following to Kconfig:
   CONFIG_FLASH_SHOW_PROGRESS

Signed-off-by: Tom Rini <trini@konsulko.com>
2 years agofec_mxc: Remove CONFIG_FEC_FIXED_SPEED support
Tom Rini [Fri, 2 Dec 2022 21:42:19 +0000 (16:42 -0500)]
fec_mxc: Remove CONFIG_FEC_FIXED_SPEED support

This option is only used on one platform currently. However, with PHYLIB
enabled, which this platform also does, this option is not checked and
the functional use case is handled. Remove this code.

Signed-off-by: Tom Rini <trini@konsulko.com>
2 years agoConvert CONFIG_DM9000_BYTE_SWAPPED et al to Kconfig
Tom Rini [Fri, 2 Dec 2022 21:42:18 +0000 (16:42 -0500)]
Convert CONFIG_DM9000_BYTE_SWAPPED et al to Kconfig

This converts the following to Kconfig:
   CONFIG_DM9000_BYTE_SWAPPED
   CONFIG_DM9000_NO_SROM
   CONFIG_DM9000_USE_16BIT
   CONFIG_DM9000_DEBUG
   CONFIG_MXC_GPT_HCLK
   CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC

Signed-off-by: Tom Rini <trini@konsulko.com>
2 years agoenv: Rework ENV_IS_EMBEDDED and related logic slightly
Tom Rini [Fri, 2 Dec 2022 21:42:17 +0000 (16:42 -0500)]
env: Rework ENV_IS_EMBEDDED and related logic slightly

- Drop CONFIG_BUILD_ENVCRC as this is never set directly but instead
  means ENV_IS_EMBEDDED, so reference that in code and rename the Makefile
  usage to BUILD_ENVCRC.
- Remove extra-$(CONFIG_ENV_IS_EMBEDDED) line as it could never be true,
  and likely why there is an extra- line for CONFIG_ENV_IS_IN_FLASH (the
  only use case today of embedded environments).
- With these slight changes we can then see that using the calculated
  symbol of ENV_IS_EMBEDDED is the right thing to use in any code which
  needs to know this situation and can remove CONFIG_ENV_IS_EMBEDDED
  entirely.

Signed-off-by: Tom Rini <trini@konsulko.com>
2 years agoConvert CONFIG_HSMMC2_8BIT to Kconfig
Tom Rini [Fri, 2 Dec 2022 21:42:16 +0000 (16:42 -0500)]
Convert CONFIG_HSMMC2_8BIT to Kconfig

This converts the following to Kconfig:
   CONFIG_HSMMC2_8BIT

Signed-off-by: Tom Rini <trini@konsulko.com>
2 years agoarm: trats2: Set mmcdev directly
Tom Rini [Fri, 2 Dec 2022 21:42:15 +0000 (16:42 -0500)]
arm: trats2: Set mmcdev directly

Only this platform sets mmcdev via CONFIG_MMC_DEFAULT_DEV so we
hard-code that default directly.

Signed-off-by: Tom Rini <trini@konsulko.com>
2 years agox530: Remove unused symbols
Tom Rini [Fri, 2 Dec 2022 21:42:14 +0000 (16:42 -0500)]
x530: Remove unused symbols

The symbols CONFIG_UBI_PART and CONFIG_UBIFS_VOLUME are not referenced
anywhere, drop them.

Signed-off-by: Tom Rini <trini@konsulko.com>
2 years agop1_p2_rdb: Remove unused environment sections
Tom Rini [Fri, 2 Dec 2022 21:42:13 +0000 (16:42 -0500)]
p1_p2_rdb: Remove unused environment sections

The CONFIG_USB_FAT_BOOT, CONFIG_USB_EXT2_BOOT and CONFIG_NORBOOT defines
are not referenced anywhere, so remove them.

Signed-off-by: Tom Rini <trini@konsulko.com>
2 years agoarm: exynos5: Migrate USB_BOOTING to Kconfig
Tom Rini [Fri, 2 Dec 2022 21:42:12 +0000 (16:42 -0500)]
arm: exynos5: Migrate USB_BOOTING to Kconfig

This symbol is enabled for all exynos5 platforms, move to Kconfig and
select it.

Cc: Jaehoon Chung <jh80.chung@samsung.com>
Cc: Minkyu Kang <mk7.kang@samsung.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
2 years agousb: Update USB_STORAGE dependencies
Tom Rini [Fri, 2 Dec 2022 21:42:11 +0000 (16:42 -0500)]
usb: Update USB_STORAGE dependencies

As it's no longer possible to have !DM_USB set, we can remove these
dependencies.

Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
2 years agoMerge tag 'v2023.01-rc4' into next
Tom Rini [Mon, 19 Dec 2022 14:29:55 +0000 (09:29 -0500)]
Merge tag 'v2023.01-rc4' into next

Prepare v2023.01-rc4

Signed-off-by: Tom Rini <trini@konsulko.com>
2 years agoPrepare v2023.01-rc4
Tom Rini [Mon, 19 Dec 2022 13:45:26 +0000 (08:45 -0500)]
Prepare v2023.01-rc4

Signed-off-by: Tom Rini <trini@konsulko.com>
2 years agoMerge tag 'u-boot-rockchip-20221219' of https://source.denx.de/u-boot/custodians...
Tom Rini [Mon, 19 Dec 2022 13:33:24 +0000 (08:33 -0500)]
Merge tag 'u-boot-rockchip-20221219' of https://source.denx.de/u-boot/custodians/u-boot-rockchip

- Only call binman when TPL available;
- rk3128 DTS fix;
- Fix GPT table corruption for rk3399 puma ;
- Fix i2c for rk3399 Pinebookpro;
- Enable UEFI capsule update for RockPi4;

2 years agorockpi4: capsule: Enable UEFI capsule update on RockPi4 boards
Sughosh Ganu [Thu, 10 Nov 2022 09:19:17 +0000 (14:49 +0530)]
rockpi4: capsule: Enable UEFI capsule update on RockPi4 boards

Enable the UEFI capsule update functionality on the RockPi4B and
RockPi4C boards. Support is being enabled for updating the idbloader
and u-boot firmware images residing on GPT partitioned uSD card
storage device.

Signed-off-by: Sughosh Ganu <sughosh.ganu@linaro.org>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
2 years agorockpi4: board: Add firmware image information for capsule updates
Sughosh Ganu [Thu, 10 Nov 2022 09:19:16 +0000 (14:49 +0530)]
rockpi4: board: Add firmware image information for capsule updates

Add information that will be needed for enabling the UEFI capsule
update feature on the RockPi4 boards. With the feature enabled, it
would be possible to update the idbloader and u-boot.itb images on the
RockPi4B and RockPi4C variants.

Signed-off-by: Sughosh Ganu <sughosh.ganu@linaro.org>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
2 years agorockchip: capsule: Add functions for supporting capsule updates
Sughosh Ganu [Thu, 10 Nov 2022 09:19:15 +0000 (14:49 +0530)]
rockchip: capsule: Add functions for supporting capsule updates

Add functions needed to support the UEFI capsule update feature on
rockchip boards. Currently, the feature is being enabled on the
RockPi4 boards with firmware images residing on GPT partitioned
storage media.

Signed-off-by: Sughosh Ganu <sughosh.ganu@linaro.org>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
2 years agophy: rockchip: handle clock without enable function
John Keeping [Tue, 6 Dec 2022 12:48:55 +0000 (12:48 +0000)]
phy: rockchip: handle clock without enable function

If a clock doesn't supply the enable hook, clk_enable() will return
-ENOSYS.  In this case the clock is always enabled so there is no error
and the phy initialisation should continue.

Signed-off-by: John Keeping <john@metanate.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
2 years agorockchip: Pinebook Pro: Do not initialize i2c before relocation
Michal Suchanek [Sat, 3 Dec 2022 12:31:29 +0000 (13:31 +0100)]
rockchip: Pinebook Pro: Do not initialize i2c before relocation

The i2c locks up when initialized before relocation, and it stays broken
in Linux as well breaking the ability to boot Linux.

The i2c bus and pmic was not actually used in pre-reloc before
commit ad607512f575 ("power: pmic: rk8xx: Support sysreset shutdown method")

The cause is not known.

This is board-specific, other boards that do not add the option to
include the i2c bus in pre-reloc DT are not affected.

Signed-off-by: Michal Suchanek <msuchanek@suse.de>
Reviewed-by: Peter Robinson <pbrobinson@gmail.com>
Tested-by: Peter Robinson <pbrobinson@gmail.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
2 years agorockchip: puma: fix GPT table corruption when saving U-Boot environment
Quentin Schulz [Tue, 25 Oct 2022 10:58:02 +0000 (12:58 +0200)]
rockchip: puma: fix GPT table corruption when saving U-Boot environment

The GPT table is taking the first 34 sectors, which amounts to 0x4400
bytes. Saving the environment below this address in storage will corrupt
the GPT table.

While technically the table ends at 0x4400, some tools (e.g. bmaptool)
are rounding everything to the logical block size (0x1000), so it is
safer to make it point to 0x5000 so that the environment could still
persist when flashing a sparse image with bmaptool or similar tools.

Obviously, the default 0x4000 environment size does not work anymore, so
let's set it to 0x3000 so it does fill the gap between the GPT table
(rounded to 0x1000) and the start of the idbloader.img.

Fixes: 56f580d3eb8d ("rockchip: dts: rk3399-puma: put environment (in MMC/SD configurations) before SPL")
Cc: Quentin Schulz <foss+uboot@0leil.net>
Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
2 years agoarm: dts: rockchip: enable ums/rockusb command for ROCK Pi 4
FUKAUMI Naoki [Wed, 19 Oct 2022 07:12:52 +0000 (07:12 +0000)]
arm: dts: rockchip: enable ums/rockusb command for ROCK Pi 4

this patch add USB mass storage function and Rockusb function for
Radxa ROCK Pi 4 series.

Signed-off-by: FUKAUMI Naoki <naoki@radxa.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
2 years agoconfigs:rockchip:roc-rk3399-pc:Enable more configs
Manoj Sai [Thu, 15 Sep 2022 07:23:19 +0000 (12:53 +0530)]
configs:rockchip:roc-rk3399-pc:Enable more configs

This patch enables the following:

1) use preboot configuration to enable usb devices.

2) Enable USB configs so keyboards and other USB devices work,
   update the number of ports of the usb root hub.

   - with this addition the updated USB device Tree:

1  Hub (12 Mb/s, 0mA)
U-Boot Root Hub
1  Hub (12 Mb/s, 0mA)
|   U-Boot Root Hub
|
+-2  Hub (12 Mb/s, 100mA)
USB 2.0 Hub [MTT]

1  Hub (5 Gb/s, 0mA)
U-Boot XHCI Host Controller

3) enable crypto RNG support.

4) Change SPI speed and frequency:
    - increase the maximum SPI slave device speed,
      SPI flash max frequency for the environment from 10Mhz to 30MHz.

    - performance stats for speed update from 10MHz to 30MHz:

     with 10Mhz speed update:
      => sf update 0x300000 0x800000 0x400000
         4194304 bytes written, 0 bytes skipped in 36.819s, speed 119837 B/s

        with 30Mhz speed update:
      => sf update 0x300000 0x800000 0x400000
         4194304 bytes written, 0 bytes skipped in 20.319s, speed 220752 B/s

Signed-off-by: Manoj Sai <abbaraju.manojsai@amarulasolutions.com>
Signed-off-by: Da Xue <da.xue@libretech.co>
Signed-off-by: dsx724 <da@lessconfused.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
2 years agoarm: dts: rockchip: rk3128: fix clocks, compatible and phys
Johan Jonker [Fri, 9 Sep 2022 20:20:07 +0000 (22:20 +0200)]
arm: dts: rockchip: rk3128: fix clocks, compatible and phys

Fix rk3128 clocks, compatible and phys, so that they match the bindings.

Signed-off-by: Johan Jonker <jbx6244@gmail.com>
2 years agoarm: dts: rockchip: rk3128: fix DT node names
Johan Jonker [Fri, 9 Sep 2022 20:19:24 +0000 (22:19 +0200)]
arm: dts: rockchip: rk3128: fix DT node names

The rk3128 DT node names should be generic.
Rename them to the pattern defined in the DT bindings.

Signed-off-by: Johan Jonker <jbx6244@gmail.com>
2 years agoarm: dts: rockchip: move all rk3128 u-boot specific properties in separate dtsi files
Johan Jonker [Fri, 9 Sep 2022 20:19:06 +0000 (22:19 +0200)]
arm: dts: rockchip: move all rk3128 u-boot specific properties in separate dtsi files

Move all rk3128 u-boot specific properties in separate dtsi files.
Sort emmc node.

Signed-off-by: Johan Jonker <jbx6244@gmail.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
2 years agoarm: dts: rockchip: rk3128: bulk convert gpios to their constant counterparts
Johan Jonker [Fri, 9 Sep 2022 20:18:55 +0000 (22:18 +0200)]
arm: dts: rockchip: rk3128: bulk convert gpios to their constant counterparts

Bulk convert rk3128 DT gpios to their constant counterparts.

sed -i -f script.sed rk3128.dtsi
sed -i -f script.sed rk3128-evb.dts

================================

/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 <jbx6244@gmail.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
2 years agorockchip: rk3128-cru: sync the clock dt-binding header from Linux
Johan Jonker [Fri, 9 Sep 2022 20:18:45 +0000 (22:18 +0200)]
rockchip: rk3128-cru: sync the clock dt-binding header from Linux

In order to update the DT for rk3128
sync the clock dt-binding header.
This is the state as of v6.0 in Linux.

Signed-off-by: Johan Jonker <jbx6244@gmail.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
2 years agorockchip: enable fdt overlays for ROCK Pi 4 series
FUKAUMI Naoki [Sat, 10 Sep 2022 01:47:24 +0000 (01:47 +0000)]
rockchip: enable fdt overlays for ROCK Pi 4 series

add CONFIG_OF_LIBFDT_OVERLAY=y to support fdt overlays.

Signed-off-by: FUKAUMI Naoki <naoki@radxa.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
2 years agorockchip: Only call binman when TPL available
Kever Yang [Sun, 18 Dec 2022 12:43:38 +0000 (20:43 +0800)]
rockchip: Only call binman when TPL available

Rockchip platform use TPL to do the DRAM initialize for all the SoCs,
if TPL is not available, means no available DRAM init program, and the
u-boot-rockchip.bin is not functionable.

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Change-Id: I2299f1eddce5aa7d5fb1a3fb4d8aeaa995b397fa

2 years agoMakefile: With BINMAN_ALLOW_MISSING=1 don't error on missing
Tom Rini [Tue, 6 Dec 2022 02:03:36 +0000 (21:03 -0500)]
Makefile: With BINMAN_ALLOW_MISSING=1 don't error on missing

When the user builds with BINMAN_ALLOW_MISSING=1 they're explicitly
setting the flag to allow for additional binaries to be missing and so
have acknowledged the output might not work. In this case we want to
default to not passing a non-zero exit code.

Cc: Simon Glass <sjg@chromium.org>
Reported-by: Peter Robinson <pbrobinson@gmail.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
2 years agoMerge tag 'efi-2023-01-rc4' of https://source.denx.de/u-boot/custodians/u-boot-efi
Tom Rini [Sun, 18 Dec 2022 13:10:09 +0000 (08:10 -0500)]
Merge tag 'efi-2023-01-rc4' of https://source.denx.de/u-boot/custodians/u-boot-efi

Pull request for efi-2023-01-rc4

Documentation:

* Fix htmldoc build dependency

UEFI:

* Adjust EBBR version for compatibility table

2 years agoMerge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-sunxi
Tom Rini [Sun, 18 Dec 2022 13:08:55 +0000 (08:08 -0500)]
Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-sunxi

This cleans up each board's defconfig, and fixes the serial console on
some Olimex board. Also we lose another legacy config variable.
The rest are minor cleanups, that actually shouldn't change anything
in the build.

Passed the gitlab CI, plus briefly tested on Pine64-LTS, LicheePi Nano,
and BananaPi M1.

2 years agodoc: update Sphinx requirements for certifi
Heinrich Schuchardt [Fri, 9 Dec 2022 14:33:52 +0000 (15:33 +0100)]
doc: update Sphinx requirements for certifi

Upgrade to version 2022.12.7.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
2 years agoefi: adjust ebbr to v2.1 in conformance profile
Vincent Stehlé [Fri, 16 Dec 2022 16:55:04 +0000 (17:55 +0100)]
efi: adjust ebbr to v2.1 in conformance profile

The EFI Conformance Profile Table entry for EBBR appears in v2.1.0 of the
EBBR specification[1]. Update naming accordingly.

While at it, update the EBBR version referenced in the documentation.

[1]: https://github.com/ARM-software/ebbr/releases/tag/v2.1.0

Signed-off-by: Vincent Stehlé <vincent.stehle@arm.com>
Cc: Heinrich Schuchardt <xypron.glpk@gmx.de>
Cc: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Reviewed-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
2 years agodoc: fix typos
Maxim Cournoyer [Sat, 17 Dec 2022 02:09:40 +0000 (21:09 -0500)]
doc: fix typos

Fix a few typos spot during a first read of the contribution process.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com>
Reviewed-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
2 years agoMerge https://source.denx.de/u-boot/custodians/u-boot-x86
Tom Rini [Thu, 15 Dec 2022 18:06:00 +0000 (13:06 -0500)]
Merge https://source.denx.de/u-boot/custodians/u-boot-x86

- Adjust CONFIG_TEXT_BASE for BayTrail based platforms
- 2 cosmetic issue fixes

2 years agosunxi: board: annotate #endif lines
Andre Przywara [Mon, 28 Nov 2022 00:02:56 +0000 (00:02 +0000)]
sunxi: board: annotate #endif lines

The legacy Allwinner code is cluttered with #ifdef's, some of them even
nested, which makes the code hard to read and error prone.
Eventually we will get rid of most of them, but for now let's at least
annotate the #endif lines with the corresponding symbol the bracket
started with.

Reviewed-by: Samuel Holland <samuel@sholland.org>
Tested-by: Samuel Holland <samuel@sholland.org>
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
2 years agosunxi: remove bogus mmc_pinmux_setup() prototype
Andre Przywara [Mon, 28 Nov 2022 00:55:20 +0000 (00:55 +0000)]
sunxi: remove bogus mmc_pinmux_setup() prototype

Since all callers of mmc_pinmux_setup() are located after the definition
of that function, there is no need for a forward declaration (anymore?).

Remove the prototype along with its #ifdef guards.

Reviewed-by: Samuel Holland <samuel@sholland.org>
Tested-by: Samuel Holland <samuel@sholland.org>
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
2 years agosunxi: remove unused CONFIG_MMC_SUNXI_SLOT
Andre Przywara [Mon, 28 Nov 2022 00:03:53 +0000 (00:03 +0000)]
sunxi: remove unused CONFIG_MMC_SUNXI_SLOT

There is a CONFIG_MMC_SUNXI_SLOT definition in our sunxi_common.h config
header, which was used to note the first MMC controller to initialise.
The definition in that header was always set to 0, with no easy way of
overriding this, and certainly none of the existing boards made any use
of that (non-)feature.
Remove that definition and replace it with a constant 0 in the only
user, in board.c. It turns out that this is safe, as this is only used
in the SPL, and the BROM also unconditionally initialises MMC0.
This also removes the last legacy config symbol with SUN*I in it from
the whitelist.

Reviewed-by: Samuel Holland <samuel@sholland.org>
Tested-by: Samuel Holland <samuel@sholland.org>
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
2 years agox86: cosmetic: Fix a typo in the reserve_arch() comments
Bin Meng [Thu, 24 Nov 2022 03:39:23 +0000 (11:39 +0800)]
x86: cosmetic: Fix a typo in the reserve_arch() comments

It should be fsp_continue().

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
2 years agox86: som-db5800-som-6867: Adjust CONFIG_TEXT_BASE
Bin Meng [Thu, 24 Nov 2022 08:19:54 +0000 (16:19 +0800)]
x86: som-db5800-som-6867: Adjust CONFIG_TEXT_BASE

At present U-Boot no longer builds as a complete rom for som-db5800-som-6867.

    BINMAN  .binman_stamp
  Wrote map file './rom.map' to show errors
  binman: Section '/binman/rom': contents size 0x80302c (8400940) exceeds section size 0x800000 (8388608)

Checking rom.map we see 'intel-vga' section is overlapped with
other sections:

  <none>     fff00000  0009f7c8  u-boot-with-ucode-ptr
  <none>     fff90000  00010000  intel-vga
  <none>     fff9f7c8  00001aae  u-boot-dtb-with-ucode

Let's adjust CONFIG_TEXT_BASE to allow more space for U-Boot codes.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
2 years agox86: dfi-bt700: Adjust CONFIG_TEXT_BASE
Bin Meng [Thu, 24 Nov 2022 07:58:17 +0000 (15:58 +0800)]
x86: dfi-bt700: Adjust CONFIG_TEXT_BASE

At present U-Boot no longer builds as a complete rom for all the
configs of dfi-bt700.

    BINMAN  .binman_stamp
  Wrote map file './rom.map' to show errors
  binman: Section '/binman/rom': contents size 0x80e836 (8448054) exceeds section size 0x800000 (8388608)

Checking rom.map we see 'intel-vga' section is overlapped with
other sections:

  <none>     fff00000  000aac90  u-boot-with-ucode-ptr
  <none>     fffa0000  00010000  intel-vga
  <none>     fffaac90  00001df0  u-boot-dtb-with-ucode
  <none>     fffaca80  00019800  u-boot-ucode

Let's adjust CONFIG_TEXT_BASE to allow more space for U-Boot codes.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Stefan Roese <sr@denx.de>
2 years agox86: conga-qeval20-qa3-e3845: Adjust CONFIG_TEXT_BASE
Bin Meng [Thu, 24 Nov 2022 07:33:09 +0000 (15:33 +0800)]
x86: conga-qeval20-qa3-e3845: Adjust CONFIG_TEXT_BASE

At present U-Boot no longer builds as a complete rom for all the
configs of conga-qeval20-qa3-e3845.

    BINMAN  .binman_stamp
  Wrote map file './rom.map' to show errors
  binman: Section '/binman/rom': contents size 0x80b680 (8435328) exceeds section size 0x800000 (8388608)

Checking rom.map we see 'intel-vga' section is overlapped with
other sections:

  <none>     fff00000  000a7cb0  u-boot-with-ucode-ptr
  <none>     fffa0000  00010000  intel-vga
  <none>     fffa7cb0  00001c1a  u-boot-dtb-with-ucode
  <none>     fffa98d0  00019800  u-boot-ucode

Let's adjust CONFIG_TEXT_BASE to allow more space for U-Boot codes.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
2 years agox86: minnowmax: Adjust CONFIG_TEXT_BASE
Bin Meng [Thu, 24 Nov 2022 03:07:13 +0000 (11:07 +0800)]
x86: minnowmax: Adjust CONFIG_TEXT_BASE

At present U-Boot no longer builds as a complete rom for minnowmax.

    BINMAN  .binman_stamp
  Wrote map file './rom.map' to show errors
  binman: Section '/binman/rom': contents size 0x803146 (8401222) exceeds section size 0x800000 (8388608)

Checking rom.map we see 'fdtmap' section is overlapped with
'intel-vga' section:

  <none>     fffa1390  00019800  u-boot-ucode
  <none>     fffb0000  00010000  intel-vga
  <none>     fffbab90  00000539  fdtmap

Let's adjust CONFIG_TEXT_BASE to allow more space for U-Boot codes.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
2 years agox86: bayleybay: Adjust CONFIG_TEXT_BASE
Bin Meng [Thu, 24 Nov 2022 03:24:37 +0000 (11:24 +0800)]
x86: bayleybay: Adjust CONFIG_TEXT_BASE

At present U-Boot no longer builds as a complete rom for bayleybay.

    BINMAN  .binman_stamp
  Wrote map file './rom.map' to show errors
  binman: Section '/binman/rom': contents size 0x814706 (8472326) exceeds section size 0x800000 (8388608)

Checking rom.map we see 'fdtmap' section is overlapped with
'intel-vga' and 'intel-fsp' sections:

  <none>     fffa2150  0002a000  u-boot-ucode
  <none>     fffb0000  00010000  intel-vga
  <none>     fffc0000  00038000  intel-fsp
  <none>     fffcc150  00000539  fdtmap

Let's adjust CONFIG_TEXT_BASE to allow more space for U-Boot codes.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
2 years agox86: Fix i8259 ifdef include guard
Alistair Delva [Mon, 26 Sep 2022 22:23:26 +0000 (22:23 +0000)]
x86: Fix i8259 ifdef include guard

When building U-Boot with clang, it notices that the i8259.h include
guard does not work correctly due to a typo. Fix it.

Signed-off-by: Alistair Delva <adelva@google.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Bin Meng <bmeng.cn@gmail.com>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
2 years agosunxi: Fix serial console for A10s-OLinuXino-MICRO
Mark Kettenis [Sun, 11 Dec 2022 22:00:54 +0000 (23:00 +0100)]
sunxi: Fix serial console for A10s-OLinuXino-MICRO

On this board CONFIG_CONS_INDEX needs to be 1 unlike other sun5i
boards.  Since this is the default, remove to bogus setting.

Fixes: 7095f8641863 ("sunxi: Convert CONS_INDEX to Kconfig")
Signed-off-by: Mark Kettenis <kettenis@openbsd.org>
Reviewed-by: Andre Przywara <andre.przywara@arm.com>
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
2 years agopinctrl: sunxi: Add P2WI and RSB pinmuxes
Samuel Holland [Fri, 18 Nov 2022 04:22:27 +0000 (22:22 -0600)]
pinctrl: sunxi: Add P2WI and RSB pinmuxes

P2WI and RSB are used to communicate with a PMIC. Most SoCs have only
one possible pinmux. F1C100s has two possibilities, with different mux
values, so omit it until some board needs one of them.

Signed-off-by: Samuel Holland <samuel@sholland.org>
Reviewed-by: Andre Przywara <andre.przywara@arm.com>
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
2 years agosunxi: define SYS_MONITOR_LEN in Kconfig, not _defconfig
Andre Przywara [Sat, 19 Nov 2022 16:10:59 +0000 (16:10 +0000)]
sunxi: define SYS_MONITOR_LEN in Kconfig, not _defconfig

Commit 08574ed339fb ("Convert CONFIG_SYS_MONITOR_LEN to Kconfig") moved
the definition of said config variable from the common sunxi header to
*every board's* defconfig.
This is a platform choice, not board specific, so remove the variable
from there, instead set the one value for all Allwinner boards in
Kconfig.

Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com>
2 years agoMerge branch '2022-12-12-build-related-updates' into next
Tom Rini [Tue, 13 Dec 2022 16:34:59 +0000 (11:34 -0500)]
Merge branch '2022-12-12-build-related-updates' into next

- Updates to the keymile platforms for DM_I2C and text based
  environment migration
- Finish migration of MTDPART/MTDIDS_DEFAULT to defconfig
- Disable warning about RWX segments with gcc-12.2

2 years agoRevert "cmd: pxe_utils: Check fdtcontroladdr in label_boot"
Tom Rini [Tue, 13 Dec 2022 14:26:25 +0000 (09:26 -0500)]
Revert "cmd: pxe_utils: Check fdtcontroladdr in label_boot"

With the change here, all extlinux.conf files with only "KERNEL
/fitImage" don't work anymore. One common example of this would be those
files generated by thee Poky/OE WIC bootimg-partition bootloader
partition generator.

This reverts commit d5ba6188dfbf6bb68354bec86e483623f1f6dae2.

Reported-by: Neil Armstrong <neil.armstrong@linaro.org>
Reported-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
2 years agokm/mpc8360: remove unused CONFIG_SYS_PAXE defines
Holger Brunck [Fri, 2 Dec 2022 17:22:43 +0000 (18:22 +0100)]
km/mpc8360: remove unused CONFIG_SYS_PAXE defines

These are unused defines and can be dropped.

Signed-off-by: Holger Brunck <holger.brunck@hitachienergy.com>
2 years agokm/ppc: migrate all mpc83xx to DM_I2C
Holger Brunck [Fri, 2 Dec 2022 17:22:42 +0000 (18:22 +0100)]
km/ppc: migrate all mpc83xx to DM_I2C

Enable DM_I2C and I2C mux to get rid of the usage of the legacy
i2c driver.

Signed-off-by: Holger Brunck <holger.brunck@hitachienergy.com>
2 years agoboard/km: remove obsolete ARCH_KIRKWOOD
Holger Brunck [Fri, 2 Dec 2022 17:22:41 +0000 (18:22 +0100)]
board/km: remove obsolete ARCH_KIRKWOOD

We already removed the support for these boards.

Signed-off-by: Holger Brunck <holger.brunck@hitachienergy.com>
2 years agoboard/km/secu: migrate to use environment text files
Holger Brunck [Fri, 2 Dec 2022 17:22:40 +0000 (18:22 +0100)]
board/km/secu: migrate to use environment text files

Instead of having these defines in a header file, move them to
a simple text file.

Signed-off-by: Holger Brunck <holger.brunck@hitachienergy.com>
2 years agoboard/km/cent2: migrate to environment text file
Holger Brunck [Fri, 2 Dec 2022 17:22:39 +0000 (18:22 +0100)]
board/km/cent2: migrate to environment text file

Use like the other boards a text file for the environment.
As this is the last user of keymile-common.h we can now remove this
file completely.

Signed-off-by: Holger Brunck <holger.brunck@hitachienergy.com>
2 years agokm/powerpc: migrate to env.txt file
Holger Brunck [Fri, 2 Dec 2022 17:22:38 +0000 (18:22 +0100)]
km/powerpc: migrate to env.txt file

Use already present common.env file and add a powerpc specific env
so that we can move all the environment defines to text files.

Signed-off-by: Holger Brunck <holger.brunck@hitachienergy.com>
2 years agoboard/km: move ls102xa boards to environment text files
Holger Brunck [Fri, 2 Dec 2022 17:22:37 +0000 (18:22 +0100)]
board/km: move ls102xa boards to environment text files

Create a common.env which we can use later on also for other boards.

Signed-off-by: Holger Brunck <holger.brunck@hitachienergy.com>
2 years agoconfigs: remove support of MTDIDS_DEFAULT/MTDPARTS_DEFAULT
Patrick Delaunay [Wed, 7 Dec 2022 08:26:44 +0000 (09:26 +0100)]
configs: remove support of MTDIDS_DEFAULT/MTDPARTS_DEFAULT

Complete the migration of MTDPARTS_DEFAULT / MTDIDS_DEFAULT in Kconfig;
this patch removes the support of MTDIDS_DEFAULT / MTDPARTS_DEFAULT
in the configuration files (include/configs/*.h).

Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
2 years agoconfigs: SBx81LIFKW: move MTDPART_DEFAULT in defconfig
Patrick Delaunay [Wed, 7 Dec 2022 08:26:43 +0000 (09:26 +0100)]
configs: SBx81LIFKW: move MTDPART_DEFAULT in defconfig

Replace MTDPARTS_DEFAULT in the config include file by
CONFIG_MTDPARTS_DEFAULT in defconfig to complete the Kconfig migration.

Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
2 years agoconfigs: SBx81LIFXCAT: move MTDPART_DEFAULT in defconfig
Patrick Delaunay [Wed, 7 Dec 2022 08:26:42 +0000 (09:26 +0100)]
configs: SBx81LIFXCAT: move MTDPART_DEFAULT in defconfig

Replace MTDPARTS_DEFAULT in the config include file by
CONFIG_MTDPARTS_DEFAULT in defconfig to complete the Kconfig migration.

Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
2 years agoconfigs: x530: move MTDPART/MTDIDS_DEFAULT in defconfig
Patrick Delaunay [Wed, 7 Dec 2022 08:26:41 +0000 (09:26 +0100)]
configs: x530: move MTDPART/MTDIDS_DEFAULT in defconfig

Replace MTDIDS_DEFAULT and MTDPARTS_DEFAULT in the config include file by
CONFIG_MTDIDS_DEFAULT and CONFIG_MTDPARTS_DEFAULT in defconfig to complete
the Kconfig migration.

Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
2 years agoconfigs: am333x_guardian: move MTDIDS_DEFAULT in defconfif
Patrick Delaunay [Wed, 7 Dec 2022 08:26:40 +0000 (09:26 +0100)]
configs: am333x_guardian: move MTDIDS_DEFAULT in defconfif

Replace MTDIDS_DEFAULT in config include file by CONFIG_MTDIDS_DEFAULT
in defonfig to complete the Kconfig migration

Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
2 years agoMakefile: link with --no-warn-rwx-segments
Tom Rini [Wed, 7 Dec 2022 20:49:43 +0000 (15:49 -0500)]
Makefile: link with --no-warn-rwx-segments

We borrow from the Linux Kernel 0d362be5b142 ("Makefile: link with -z
noexecstack --no-warn-rwx-segments") here to disable the RWX segment
linking warnings. We do not also bring in -z noexecstack as that
requires auditing and using ".note.GNU-stack" on assembly functions
which do need this feature. Further, we now introduce KBUILD_EFILDFLAGS
so that we can also pass --no-warn-rwx-segments when linking EFI
applications, and those do explicitly pass -z execstack.

Cc: Heinrich Schuchardt <xypron.glpk@gmx.de>
Cc: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
2 years agoMerge branch '2022-12-12-assorted-improvements' into next
Tom Rini [Mon, 12 Dec 2022 21:32:37 +0000 (16:32 -0500)]
Merge branch '2022-12-12-assorted-improvements' into next

- A number of PXE / sysboot related improvements
- Nuvoton updates
- Small updates to omap4, ARCH_OMAP2PLUS itself, mediatek
  pcie_designware.

2 years agoconfigs: set CONFIG_LMB_MAX_REGIONS=64 for all mt798[16] boards
Daniel Golle [Tue, 29 Nov 2022 19:37:59 +0000 (19:37 +0000)]
configs: set CONFIG_LMB_MAX_REGIONS=64 for all mt798[16] boards

With recently added wireless offloading features in Linux [1] the
number of reserved memory regions with MediaTek SoCs supporting
offloading wireless-to-Ethernet traffic grew beyond the default (8)
which breaks booting Linux:
ERROR: Failed to allocate 0xa6ac bytes below 0xc0000000.
device tree - allocation error
FDT creation failed!
resetting ...

Raise CONFIG_LMB_MAX_REGIONS to 64 like it is already done for other
SoCs which require a larger number of reserved memory regions, eg.
exynos78x0 based a3y17lte, a5y17lte and a7y17lte or dragonboard845c.

[1]: https://lore.kernel.org/netdev/e3489a697b404bd47447190cd2e5adf090ae61c2.1667687249.git.lorenzo@kernel.org/
     https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/commit/?id=eed4f1ddad8c5ad7596b229caec8bd7b477b81ee

Signed-off-by: Daniel Golle <daniel@makrotopia.org>