davinci: da850evm/omapl138-lcdk: Move BSS to SDRAM because SRAM is full
PATCH v3 1/2 davinci: da850evm/omapl138-lcdk: Move BSS to SDRAM because SRAM is full
In order to fully support SPL_OF_CONTROL, we need BSS to be a bit larger. This patch relocates BSS to SDRAM instead of SRAM which is similar to how ARMv7 boards (like OMAP2+) do it.
This means two new variables are required:CONFIG_SPL_BSS_START_ADDR set to DAVINCI_DDR_EMIF_DATA_BASE CONFIG_SPL_BSS_MAX_SIZE is set to 0x1080000 which is 1 byte before the location where U-Boot will load.
---
V2: No Change
V3: Fix omapl138-lcdk so it builds.
board/davinci/da8xxevm/u-boot-spl-da850evm.lds +13 -8
@@ -10,6 +10,9 @@ MEMORY { .sram : ORIGIN = IMAGE_TEXT_BASE,\ LENGTH = CONFIG_SPL_MAX_FOOTPRINT } +MEMORY { .sdram : ORIGIN = CONFIG_SPL_BSS_START_ADDR, \ + LENGTH = CONFIG_SPL_BSS_MAX_SIZE } + OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") OUTPUT_ARCH(arm) ENTRY(_start)
@@ -42,6 +45,15 @@ SECTIONS __rel_dyn_end = .; } >.sram + __image_copy_end = .; + + .end : + { + *(.__end) + } + + _image_binary_end = .; + .bss : { . = ALIGN(4);
@@ -49,12 +61,5 @@ SECTIONS *(.bss*) . = ALIGN(4); __bss_end = .; - } >.sram - - __image_copy_end = .; - - .end : - { - *(.__end) - } + } >.sdram }
include/configs/da850evm.h +2 -1
@@ -48,7 +48,8 @@#define PHYS_SDRAM_1 DAVINCI_DDR_EMIF_DATA_BASE/* DDR Start */ #define PHYS_SDRAM_1_SIZE (64 << 20)/* SDRAM size 64MB */ #define CONFIG_MAX_RAM_BANK_SIZE (512 << 20)/* max size from SPRS586*/ - +#define CONFIG_SPL_BSS_START_ADDR DAVINCI_DDR_EMIF_DATA_BASE +#define CONFIG_SPL_BSS_MAX_SIZE 0x1080000/* memtest start addr */ #define CONFIG_SYS_MEMTEST_START (PHYS_SDRAM_1 + 0x2000000)
include/configs/omapl138_lcdk.h +3 -0
@@ -43,6 +43,9 @@#define PHYS_SDRAM_1_SIZE (128 << 20)/* SDRAM size 128MB */ #define CONFIG_MAX_RAM_BANK_SIZE (512 << 20)/* max size from SPRS586*/ +#define CONFIG_SPL_BSS_START_ADDR DAVINCI_DDR_EMIF_DATA_BASE +#define CONFIG_SPL_BSS_MAX_SIZE 0x1080000 +/* memtest start addr */ #define CONFIG_SYS_MEMTEST_START (PHYS_SDRAM_1 + 0x2000000)
Signature · 1 line
2.17.1
PATCH v3 1/2 davinci: da850evm/omapl138-lcdk: Move BSS to SDRAM because SRAM is full
Quoted 10 lines · Adam Ford
In order to fully support
SPL_OF_CONTROL, we need BSS to be a bit larger. This patch relocates BSS to SDRAM instead of SRAM which is similar to how ARMv7 boards (like OMAP2+) do it.This means two new variables are required:
CONFIG_SPL_BSS_START_ADDRset toDAVINCI_DDR_EMIF_DATA_BASECONFIG_SPL_BSS_MAX_SIZEis set to0x1080000which is 1 byte before the location where U-Boot will load.
Quoted 5 lines
Signed-off-by Adam Ford <[email protected]>---
V2: No Change
V3: Fix omapl138-lcdk so it builds.
Tom,
Is there any change to pick up V3 before the next release? Enabling the DT support is my solution to some of the SPI churn and updates which sort of expect DT support now. Since the DA850-evm boots from SPI flash, I'd rather fix the issues with DT support than trying to prolong the platdata format.
adam
Quoted 75 lines
board/davinci/da8xxevm/u-boot-spl-da850evm.lds +13
-8@@ -10,6 +10,9 @@ MEMORY { .sram : ORIGIN = IMAGE_TEXT_BASE,\ LENGTH = CONFIG_SPL_MAX_FOOTPRINT } +MEMORY { .sdram : ORIGIN = CONFIG_SPL_BSS_START_ADDR, \ + LENGTH = CONFIG_SPL_BSS_MAX_SIZE } + OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") OUTPUT_ARCH(arm) ENTRY(_start)@@ -42,6 +45,15 @@ SECTIONS __rel_dyn_end = .; } >.sram + __image_copy_end = .; + + .end : + { + *(.__end) + } + + _image_binary_end = .; + .bss : { . = ALIGN(4);@@ -49,12 +61,5 @@ SECTIONS *(.bss*) . = ALIGN(4); __bss_end = .; - } >.sram - - __image_copy_end = .; - - .end : - { - *(.__end) - } + } >.sdram }include/configs/da850evm.h +2
-1@@ -48,7 +48,8 @@#define PHYS_SDRAM_1 DAVINCI_DDR_EMIF_DATA_BASE/* DDR Start */ #define PHYS_SDRAM_1_SIZE (64 << 20)/* SDRAM size 64MB */ #define CONFIG_MAX_RAM_BANK_SIZE (512 << 20)/* max size from SPRS586*/ - +#define CONFIG_SPL_BSS_START_ADDR DAVINCI_DDR_EMIF_DATA_BASE +#define CONFIG_SPL_BSS_MAX_SIZE 0x1080000/* memtest start addr */ #define CONFIG_SYS_MEMTEST_START (PHYS_SDRAM_1 + 0x2000000)include/configs/omapl138_lcdk.h +3
-1@@ -43,6 +43,9 @@#define PHYS_SDRAM_1_SIZE (128 << 20)/* SDRAM size 128MB */ #define CONFIG_MAX_RAM_BANK_SIZE (512 << 20)/* max size from SPRS586*/ +#define CONFIG_SPL_BSS_START_ADDR DAVINCI_DDR_EMIF_DATA_BASE +#define CONFIG_SPL_BSS_MAX_SIZE 0x1080000 +/* memtest start addr */ #define CONFIG_SYS_MEMTEST_START (PHYS_SDRAM_1 + 0x2000000) --2.17.1
PATCH v3 2/2 ARM: davinci: da850evm: Enable SPL_OF_CONTROL without PLATDATA
In reply to Adam FordWith the memory mapping giving us some more avialable RAM, this updates the da850-evm-u-boot.dtsi to include the serial port, SPI and Flash nodes along with some dependent nodes in the SPL dtb. This also removes the platform data initialization code for the serial port and SPI Flash.
---
V2: Add da850evm_nand_defconfig to build with DT as well V3: No change
arch/arm/dts/da850-evm-u-boot.dtsi +18 -0
@@ -6,6 +6,24 @@ * Copyright (C) Adam Ford */ +/ { + soc at 1c00000 { + u-boot,dm-spl; + }; +}; + &flash { compatible = "m25p64", "spi-flash"; }; + +&mmc0 { + u-boot,dm-spl; +}; + +&serial2 { + u-boot,dm-spl; +}; + +&spi1 { + u-boot,dm-spl; +};
board/davinci/da8xxevm/da850evm.c +0 -27
@@ -49,33 +49,6 @@ DECLARE_GLOBAL_DATA_PTR;#define CFG_MAC_ADDR_OFFSET (flash->size - SZ_64K) -#ifdef CONFIG_SPL_BUILD -#include <ns16550.h> -#include <dm/platform_data/spi_davinci.h> - -static const struct ns16550_platdata da850evm_serial = { - .base =DAVINCI_UART2_BASE , - .reg_shift =2 , - .clock =150000000 , - .fcr =UART_FCR_DEFVAL , -}; - -U_BOOT_DEVICE (da850evm_uart) = { - .name ="ns16550_serial" , - .platdata = &da850evm_serial, -}; - -static const struct davinci_spi_platdata davinci_spi_data = { - .regs = (struct davinci_spi_regs *)0x01f0e000 , - .num_cs =4 , -}; - -U_BOOT_DEVICE (davinci_spi) = { - .name ="davinci_spi" , - .platdata = &davinci_spi_data, -}; -#endif -#ifdef CONFIG_MAC_ADDR_IN_SPIFLASH static int get_mac_addr (u8 *addr) {
configs/da850evm_defconfig +5 -1
@@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_SYS_THUMB_BUILD=y CONFIG_ARCH_DAVINCI=y CONFIG_SYS_TEXT_BASE=0xc1080000 CONFIG_TARGET_DA850EVM=y
@@ -13,6 +14,7 @@ CONFIG_SPL_SPI_SUPPORT=y CONFIG_NR_DRAM_BANKS=1 CONFIG_SYS_EXTRA_OPTIONS="MAC_ADDR_IN_SPIFLASH" CONFIG_BOOTDELAY=3 +CONFIG_DEFAULT_FDT_FILE="da850-evm.dtb" CONFIG_MISC_INIT_R=y CONFIG_VERSION_VARIABLE=y # CONFIG_DISPLAY_CPUINFO is not set
@@ -20,6 +22,7 @@ CONFIG_VERSION_VARIABLE=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y +CONFIG_SPL_SEPARATE_BSS=y CONFIG_SPL_SPI_LOAD=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="U-Boot > "
@@ -39,10 +42,11 @@ CONFIG_CMD_DIAG=y CONFIG_OF_CONTROL=y CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="da850-evm" -CONFIG_SPL_OF_PLATDATA=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_DM=y CONFIG_SPL_DM=y +CONFIG_SPL_DM_SEQ_ALIAS=y +CONFIG_SPL_OF_TRANSLATE=y CONFIG_DM_GPIO=y CONFIG_DA8XX_GPIO=y CONFIG_DM_I2C=y
configs/da850evm_nand_defconfig +6 -1
@@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_SYS_THUMB_BUILD=y CONFIG_ARCH_DAVINCI=y CONFIG_SYS_TEXT_BASE=0xc1080000 CONFIG_TARGET_DA850EVM=y
@@ -12,12 +13,14 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_SYS_EXTRA_OPTIONS="MAC_ADDR_IN_SPIFLASH" CONFIG_BOOTDELAY=3 +CONFIG_DEFAULT_FDT_FILE="da850-evm.dtb" CONFIG_VERSION_VARIABLE=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y +CONFIG_SPL_SEPARATE_BSS=y CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_SPI_LOAD=y CONFIG_HUSH_PARSER=y
@@ -37,13 +40,15 @@ CONFIG_CMD_DIAG=y CONFIG_OF_CONTROL=y CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="da850-evm" -CONFIG_SPL_OF_PLATDATA=y CONFIG_ENV_IS_IN_NAND=y CONFIG_DM=y CONFIG_SPL_DM=y +CONFIG_SPL_DM_SEQ_ALIAS=y +CONFIG_SPL_OF_TRANSLATE=y CONFIG_DM_GPIO=y CONFIG_DA8XX_GPIO=y CONFIG_DM_I2C=y +CONFIG_DM_MMC=y CONFIG_NAND=y CONFIG_NAND_DAVINCI=y CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
Signature · 1 line
2.17.1
PATCH v3 2/2 ARM: davinci: da850evm: Enable SPL_OF_CONTROL without PLATDATA
Quoted 7 lines · Adam Ford
With the memory mapping giving us some more avialable RAM, this updates the
da850-evm-u-boot.dtsito include the serial port, SPI and Flash nodes along with some dependent nodes in the SPL dtb. This also removes the platform data initialization code for the serial port and SPI Flash.Signed-off-by Adam Ford <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190412/a5ed8f0b/attachment.sig>
PATCH v3 1/2 davinci: da850evm/omapl138-lcdk: Move BSS to SDRAM because SRAM is full
In reply to Adam FordQuoted 10 lines · Adam Ford
In order to fully support
SPL_OF_CONTROL, we need BSS to be a bit larger. This patch relocates BSS to SDRAM instead of SRAM which is similar to how ARMv7 boards (like OMAP2+) do it.This means two new variables are required:
CONFIG_SPL_BSS_START_ADDRset toDAVINCI_DDR_EMIF_DATA_BASECONFIG_SPL_BSS_MAX_SIZEis set to0x1080000which is 1 byte before the location where U-Boot will load.Signed-off-by Adam Ford <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190412/249a0b06/attachment.sig>