Message ID | 20231104072150.3339-11-nm@ti.com |
---|---|
State | Accepted |
Commit | 53ffd00780d2ede4674138039e04c0cc4be1197c |
Delegated to: | Tom Rini |
Headers | show |
Series | board: ti: j721e: cleanup | expand |
Hi Nishanth, On 04/11/23 12:51, Nishanth Menon wrote: > Kernel commit 1b77265626a4 ("arm64: dts: ti: k3-j7200-mcu-wakeup: Add > HyperBus node") was merged to kernel without its dependent patch [1]. > Similar fix is needed in U-Boot, and hbmc currently breaks boot. Till > this gets fixed in U-Boot, disable the config by default so that the > hbmc probe that happens in board/ti/j721e/evm.c will not take place > and lead to boot failure. > > This is similar to the approach in commit 5b2671594b80 ("configs: > j721e: Remove HBMC_AM654 config"), introduced to j7200 evm platform. > > [1] https://lore.kernel.org/all/20230424184810.29453-1-afd@ti.com/ > > Signed-off-by: Nishanth Menon <nm@ti.com> > --- > configs/j7200_evm_a72_defconfig | 1 - > configs/j7200_evm_r5_defconfig | 1 - > 2 files changed, 2 deletions(-) > > diff --git a/configs/j7200_evm_a72_defconfig b/configs/j7200_evm_a72_defconfig > index cb4a141675da..889358afc316 100644 > --- a/configs/j7200_evm_a72_defconfig > +++ b/configs/j7200_evm_a72_defconfig > @@ -138,7 +138,6 @@ CONFIG_CFI_FLASH=y > CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y > CONFIG_FLASH_CFI_MTD=y > CONFIG_SYS_FLASH_CFI=y > -CONFIG_HBMC_AM654=y > CONFIG_SYS_MAX_FLASH_BANKS_DETECT=y > CONFIG_DM_SPI_FLASH=y > CONFIG_SPI_FLASH_STMICRO=y > diff --git a/configs/j7200_evm_r5_defconfig b/configs/j7200_evm_r5_defconfig > index d25dd8134b63..6452c60345fd 100644 > --- a/configs/j7200_evm_r5_defconfig > +++ b/configs/j7200_evm_r5_defconfig > @@ -114,7 +114,6 @@ CONFIG_CFI_FLASH=y > CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y > CONFIG_FLASH_CFI_MTD=y > CONFIG_SYS_FLASH_CFI=y > -CONFIG_HBMC_AM654=y > CONFIG_SYS_MAX_FLASH_BANKS_DETECT=y > CONFIG_DM_SPI_FLASH=y > CONFIG_SPI_FLASH_SFDP_SUPPORT=y Reviewed-by: Neha Malcom Francis <n-francis@ti.com>
diff --git a/configs/j7200_evm_a72_defconfig b/configs/j7200_evm_a72_defconfig index cb4a141675da..889358afc316 100644 --- a/configs/j7200_evm_a72_defconfig +++ b/configs/j7200_evm_a72_defconfig @@ -138,7 +138,6 @@ CONFIG_CFI_FLASH=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y CONFIG_FLASH_CFI_MTD=y CONFIG_SYS_FLASH_CFI=y -CONFIG_HBMC_AM654=y CONFIG_SYS_MAX_FLASH_BANKS_DETECT=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/j7200_evm_r5_defconfig b/configs/j7200_evm_r5_defconfig index d25dd8134b63..6452c60345fd 100644 --- a/configs/j7200_evm_r5_defconfig +++ b/configs/j7200_evm_r5_defconfig @@ -114,7 +114,6 @@ CONFIG_CFI_FLASH=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y CONFIG_FLASH_CFI_MTD=y CONFIG_SYS_FLASH_CFI=y -CONFIG_HBMC_AM654=y CONFIG_SYS_MAX_FLASH_BANKS_DETECT=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH_SFDP_SUPPORT=y
Kernel commit 1b77265626a4 ("arm64: dts: ti: k3-j7200-mcu-wakeup: Add HyperBus node") was merged to kernel without its dependent patch [1]. Similar fix is needed in U-Boot, and hbmc currently breaks boot. Till this gets fixed in U-Boot, disable the config by default so that the hbmc probe that happens in board/ti/j721e/evm.c will not take place and lead to boot failure. This is similar to the approach in commit 5b2671594b80 ("configs: j721e: Remove HBMC_AM654 config"), introduced to j7200 evm platform. [1] https://lore.kernel.org/all/20230424184810.29453-1-afd@ti.com/ Signed-off-by: Nishanth Menon <nm@ti.com> --- configs/j7200_evm_a72_defconfig | 1 - configs/j7200_evm_r5_defconfig | 1 - 2 files changed, 2 deletions(-)