| Message ID | a1be83580e0344c32443c834d671776606432598.1610370064.git.michal.simek@xilinx.com |
|---|---|
| State | Accepted |
| Commit | a672b9871b57fa1f1e86faa33360a49e218b9c57 |
| Delegated to: | Michal Simek |
| Headers | show |
| Series | [1/2] xilinx: common: Change macro handling in board_fdt_blob_setup() | expand |
po 11. 1. 2021 v 14:01 odesÃlatel Michal Simek <michal.simek@xilinx.com> napsal: > > This hook is used in full U-Boot that's why there is no reason to touch > this location from SPL. The hook was introduced for QEMU usage but none is > really running SPL on QEMU that's why it shouldn't break any usecase. > > Signed-off-by: Michal Simek <michal.simek@xilinx.com> > --- > > board/xilinx/common/board.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/board/xilinx/common/board.c b/board/xilinx/common/board.c > index 9f651db734c7..df19aeadd0b2 100644 > --- a/board/xilinx/common/board.c > +++ b/board/xilinx/common/board.c > @@ -324,7 +324,8 @@ void *board_fdt_blob_setup(void) > { > void *fdt_blob; > > - if (!IS_ENABLED(CONFIG_VERSAL_NO_DDR) && > + if (!IS_ENABLED(CONFIG_SPL_BUILD) && > + !IS_ENABLED(CONFIG_VERSAL_NO_DDR) && > !IS_ENABLED(CONFIG_VERSAL_NO_DDR)) { > fdt_blob = (void *)CONFIG_XILINX_OF_BOARD_DTB_ADDR; > > -- > 2.30.0 > Applied. M
diff --git a/board/xilinx/common/board.c b/board/xilinx/common/board.c index 9f651db734c7..df19aeadd0b2 100644 --- a/board/xilinx/common/board.c +++ b/board/xilinx/common/board.c @@ -324,7 +324,8 @@ void *board_fdt_blob_setup(void) { void *fdt_blob; - if (!IS_ENABLED(CONFIG_VERSAL_NO_DDR) && + if (!IS_ENABLED(CONFIG_SPL_BUILD) && + !IS_ENABLED(CONFIG_VERSAL_NO_DDR) && !IS_ENABLED(CONFIG_VERSAL_NO_DDR)) { fdt_blob = (void *)CONFIG_XILINX_OF_BOARD_DTB_ADDR;
This hook is used in full U-Boot that's why there is no reason to touch this location from SPL. The hook was introduced for QEMU usage but none is really running SPL on QEMU that's why it shouldn't break any usecase. Signed-off-by: Michal Simek <michal.simek@xilinx.com> --- board/xilinx/common/board.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)