diff options
author | Tom Rini <trini@konsulko.com> | 2019-08-26 09:37:37 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2019-08-26 09:37:37 -0400 |
commit | 6f9656d726235b4cbb4f469a82c30e5006a75b53 (patch) | |
tree | 2b8afde3d7a06a3778bd24cf4243dd0856a07add /configs/sama5d3xek_spiflash_defconfig | |
parent | 50b4b80f597b9f59b98adbdbad691b1027bd501a (diff) | |
parent | 1ee774d20914fb89ad1b236aedb4178912f77c77 (diff) |
Merge branch '2019-08-24-master-imports'
- Migrate SYS_SPI_U_BOOT_OFFS, SYS_NAND_USE_FLASH_BBT and ARCH_CPU_INIT
to Kconfig
Diffstat (limited to 'configs/sama5d3xek_spiflash_defconfig')
-rw-r--r-- | configs/sama5d3xek_spiflash_defconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/configs/sama5d3xek_spiflash_defconfig b/configs/sama5d3xek_spiflash_defconfig index c38b3973d0..b27a288b4a 100644 --- a/configs/sama5d3xek_spiflash_defconfig +++ b/configs/sama5d3xek_spiflash_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_AT91=y CONFIG_SYS_TEXT_BASE=0x26f00000 CONFIG_TARGET_SAMA5D3XEK=y @@ -28,6 +29,7 @@ CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(boots # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SPL_TEXT_BASE=0x300000 CONFIG_SPL_SPI_LOAD=y +CONFIG_SYS_SPI_U_BOOT_OFFS=0x10000 CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMI is not set @@ -65,6 +67,7 @@ CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_PROTECTION=y CONFIG_SYS_FLASH_CFI=y CONFIG_NAND=y +# CONFIG_SYS_NAND_USE_FLASH_BBT is not set CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y |