From b700c8bd92fca1d72104b7e5f94b42fd4879457d Mon Sep 17 00:00:00 2001 From: Udit Kumar Date: Mon, 19 Feb 2024 14:11:39 +0530 Subject: configs: j784s4_evm: Update offset for emmc and OSPI On AM69 board, build image was going beyond wrt defined offsets. So increasing offset for eMMC and OSPI boot. Along with update in corresponding device tree. Cc: Neha Francis Cc: Vaishnav Achath Cc: Apurva Nandan Signed-off-by: Udit Kumar Reviewed-by: Neha Malcom Francis Tested-by: Beleswar Padhi --- arch/arm/dts/k3-am69-sk.dts | 18 +++++++++--------- arch/arm/dts/k3-j784s4-evm.dts | 36 ++++++++++++++++++------------------ configs/j784s4_evm_a72_defconfig | 6 +++--- configs/j784s4_evm_r5_defconfig | 6 +++--- 4 files changed, 33 insertions(+), 33 deletions(-) diff --git a/arch/arm/dts/k3-am69-sk.dts b/arch/arm/dts/k3-am69-sk.dts index 508fbee411..f49721039f 100644 --- a/arch/arm/dts/k3-am69-sk.dts +++ b/arch/arm/dts/k3-am69-sk.dts @@ -272,27 +272,27 @@ partition@0 { label = "ospi.tiboot3"; - reg = <0x0 0x80000>; + reg = <0x0 0x100000>; }; - partition@80000 { + partition@100000 { label = "ospi.tispl"; - reg = <0x80000 0x200000>; + reg = <0x100000 0x200000>; }; - partition@280000 { + partition@300000 { label = "ospi.u-boot"; - reg = <0x280000 0x400000>; + reg = <0x300000 0x400000>; }; - partition@680000 { + partition@700000 { label = "ospi.env"; - reg = <0x680000 0x40000>; + reg = <0x700000 0x40000>; }; - partition@6c0000 { + partition@740000 { label = "ospi.env.backup"; - reg = <0x6c0000 0x40000>; + reg = <0x740000 0x40000>; }; partition@800000 { diff --git a/arch/arm/dts/k3-j784s4-evm.dts b/arch/arm/dts/k3-j784s4-evm.dts index e936a82002..539471c805 100644 --- a/arch/arm/dts/k3-j784s4-evm.dts +++ b/arch/arm/dts/k3-j784s4-evm.dts @@ -718,27 +718,27 @@ partition@0 { label = "ospi.tiboot3"; - reg = <0x0 0x80000>; + reg = <0x0 0x100000>; }; - partition@80000 { + partition@100000 { label = "ospi.tispl"; - reg = <0x80000 0x200000>; + reg = <0x100000 0x200000>; }; - partition@280000 { + partition@300000 { label = "ospi.u-boot"; - reg = <0x280000 0x400000>; + reg = <0x300000 0x400000>; }; - partition@680000 { + partition@700000 { label = "ospi.env"; - reg = <0x680000 0x40000>; + reg = <0x700000 0x40000>; }; - partition@6c0000 { + partition@740000 { label = "ospi.env.backup"; - reg = <0x6c0000 0x40000>; + reg = <0x740000 0x40000>; }; partition@800000 { @@ -773,27 +773,27 @@ partition@0 { label = "ospi_nand.tiboot3"; - reg = <0x0 0x80000>; + reg = <0x0 0x100000>; }; - partition@80000 { + partition@100000 { label = "ospi_nand.tispl"; - reg = <0x80000 0x200000>; + reg = <0x100000 0x200000>; }; - partition@280000 { + partition@300000 { label = "ospi_nand.u-boot"; - reg = <0x280000 0x400000>; + reg = <0x300000 0x400000>; }; - partition@680000 { + partition@700000 { label = "ospi_nand.env"; - reg = <0x680000 0x40000>; + reg = <0x700000 0x40000>; }; - partition@6c0000 { + partition@740000 { label = "ospi_nand.env.backup"; - reg = <0x6c0000 0x40000>; + reg = <0x740000 0x40000>; }; partition@2000000 { diff --git a/configs/j784s4_evm_a72_defconfig b/configs/j784s4_evm_a72_defconfig index 73a47c9074..4c958a959c 100644 --- a/configs/j784s4_evm_a72_defconfig +++ b/configs/j784s4_evm_a72_defconfig @@ -45,7 +45,7 @@ CONFIG_SPL_STACK_R=y CONFIG_SYS_SPL_MALLOC=y CONFIG_SYS_SPL_MALLOC_SIZE=0x800000 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y -CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x1400 +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x1800 CONFIG_SPL_DMA=y CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_FS_LOAD_PAYLOAD_NAME="u-boot.img" @@ -53,7 +53,7 @@ CONFIG_SPL_I2C=y CONFIG_SPL_DM_MAILBOX=y CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_MTD_LOAD=y -CONFIG_SYS_MTD_U_BOOT_OFFS=0x280000 +CONFIG_SYS_MTD_U_BOOT_OFFS=0x300000 CONFIG_SPL_NAND_SPI_SUPPORT=y CONFIG_SPL_DM_SPI_FLASH=y # CONFIG_SPL_NOR_SUPPORT=y @@ -64,7 +64,7 @@ CONFIG_SPL_RAM_DEVICE=y # CONFIG_SPL_SPI_FLASH_TINY is not set CONFIG_SPL_SPI_FLASH_SFDP_SUPPORT=y CONFIG_SPL_SPI_LOAD=y -CONFIG_SYS_SPI_U_BOOT_OFFS=0x280000 +CONFIG_SYS_SPI_U_BOOT_OFFS=0x300000 CONFIG_SPL_THERMAL=y CONFIG_SPL_USB_GADGET=y CONFIG_SPL_DFU=y diff --git a/configs/j784s4_evm_r5_defconfig b/configs/j784s4_evm_r5_defconfig index e892603118..3b8f032094 100644 --- a/configs/j784s4_evm_r5_defconfig +++ b/configs/j784s4_evm_r5_defconfig @@ -17,7 +17,7 @@ CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y CONFIG_SPL_DRIVERS_MISC=y CONFIG_SPL_STACK_R_ADDR=0x82000000 -CONFIG_SPL_SIZE_LIMIT=0x80000 +CONFIG_SPL_SIZE_LIMIT=0x100000 CONFIG_SPL_SIZE_LIMIT_PROVIDE_STACK=0x4000 CONFIG_SPL_FS_FAT=y CONFIG_SPL_LIBDISK_SUPPORT=y @@ -53,7 +53,7 @@ CONFIG_CUSTOM_SYS_SPL_MALLOC_ADDR=0x84000000 CONFIG_SYS_SPL_MALLOC_SIZE=0x1000000 CONFIG_SPL_EARLY_BSS=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y -CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x400 +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x800 CONFIG_SPL_DMA=y CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_FS_EXT4=y @@ -72,7 +72,7 @@ CONFIG_SPL_REMOTEPROC=y # CONFIG_SPL_SPI_FLASH_TINY is not set CONFIG_SPL_SPI_FLASH_SFDP_SUPPORT=y CONFIG_SPL_SPI_LOAD=y -CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000 +CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000 CONFIG_SPL_THERMAL=y CONFIG_SPL_USB_GADGET=y CONFIG_SPL_DFU=y -- cgit v1.2.3