On 7/22/21 5:25 PM, Peter Robinson wrote:
This reverts commit 346df7d4fa62afc578d820b3a18815eec765074f.
This patch broke booting Rockchip systems from U-Boot residing on SPI flash, for at least the Pinebook Pro and Rockpro64, and also confirmed with the not yet upstream Helios64.
Signed-off-by: Peter Robinson pbrobinson@gmail.com Cc: T Karthik Reddy t.karthik.reddy@xilinx.com Cc: Ashok Reddy Soma ashok.reddy.soma@xilinx.com Cc: Michal Simek michal.simek@xilinx.com Cc: Pratyush Yadav p.yadav@ti.com
drivers/spi/spi-uclass.c | 11 ----------- 1 file changed, 11 deletions(-)
diff --git a/drivers/spi/spi-uclass.c b/drivers/spi/spi-uclass.c index d867b27806..ec7f4652b3 100644 --- a/drivers/spi/spi-uclass.c +++ b/drivers/spi/spi-uclass.c @@ -11,7 +11,6 @@ #include <log.h> #include <malloc.h> #include <spi.h> -#include <spi-mem.h> #include <dm/device_compat.h> #include <asm/global_data.h> #include <dm/device-internal.h> @@ -200,16 +199,6 @@ static int spi_post_probe(struct udevice *bus) ops->set_mode += gd->reloc_off; if (ops->cs_info) ops->cs_info += gd->reloc_off;
if (ops->mem_ops) {struct spi_controller_mem_ops *mem_ops =(struct spi_controller_mem_ops *)ops->mem_ops;if (mem_ops->adjust_op_size)mem_ops->adjust_op_size += gd->reloc_off;if (mem_ops->supports_op)mem_ops->supports_op += gd->reloc_off;if (mem_ops->exec_op)mem_ops->exec_op += gd->reloc_off;}#endif
This is protected by CONFIG_NEEDS_MANUAL_RELOC which is only enable for m68k and microblaze. I expect rockchip is arm and you should never have this code in your binary. That's why please double check it.
Thanks, Michal