diff options
| author | Tom Rini <trini@konsulko.com> | 2023-02-28 01:28:21 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-02-28 01:28:21 +0300 |
| commit | 5b197eee334bdf75cc9e9148161299679a5251ea (patch) | |
| tree | edec3c21a01fb54d764d04caa2bd774823e76c2d /configs/uniphier_v7_defconfig | |
| parent | 7a826ded4a0e409d73ff4a910685821d34f1b664 (diff) | |
| parent | e8c80ac0f7a13bf0fc016ce324b870c0cff7a2b8 (diff) | |
| download | u-boot-5b197eee334bdf75cc9e9148161299679a5251ea.tar.xz | |
Merge tag 'v2023.04-rc3' into next
Prepare v2023.04-rc3
Diffstat (limited to 'configs/uniphier_v7_defconfig')
| -rw-r--r-- | configs/uniphier_v7_defconfig | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/configs/uniphier_v7_defconfig b/configs/uniphier_v7_defconfig index 03feb04b93..b7b86b668c 100644 --- a/configs/uniphier_v7_defconfig +++ b/configs/uniphier_v7_defconfig @@ -2,19 +2,18 @@ CONFIG_ARM=y CONFIG_ARCH_UNIPHIER=y CONFIG_TEXT_BASE=0x84000000 CONFIG_NR_DRAM_BANKS=3 +CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y +CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x84000000 CONFIG_ENV_SIZE=0x2000 CONFIG_DEFAULT_DEVICE_TREE="uniphier-pxs2-vodka" CONFIG_SPL_TEXT_BASE=0x00100000 CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y +CONFIG_SPL_STACK=0x100000 CONFIG_SPL=y CONFIG_MICRO_SUPPORT_CARD=y CONFIG_SYS_LOAD_ADDR=0x85000000 -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x84000000 CONFIG_SYS_MONITOR_LEN=2097152 -CONFIG_TIMER=y -CONFIG_SPL_TIMER=y CONFIG_TIMESTAMP=y # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set CONFIG_BOOTCOMMAND="run ${bootdev}script; run ${bootdev}boot" @@ -25,7 +24,6 @@ CONFIG_SPL_MAX_SIZE=0x10000 CONFIG_SPL_PAD_TO=0x20000 CONFIG_SPL_BSS_MAX_SIZE=0x2000 # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set -CONFIG_SPL_STACK=0x100000 CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_NOR_SUPPORT=y CONFIG_SPL_TARGET="u-boot-with-spl.bin" @@ -80,6 +78,8 @@ CONFIG_SNI_AVE=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_UNIPHIER_SPI=y +CONFIG_TIMER=y +CONFIG_SPL_TIMER=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_EHCI_HCD=y |