diff options
| author | andy.hu <andy.hu@starfivetech.com> | 2024-01-19 13:44:46 +0300 |
|---|---|---|
| committer | andy.hu <andy.hu@starfivetech.com> | 2024-01-19 13:44:46 +0300 |
| commit | 7277a071034220c99a6d8beffddef277725e9475 (patch) | |
| tree | ba34dcc3db19b10a242ed9e2186bc8adcbd0e7c5 | |
| parent | 8c7b3f31fb546f829bbce9ee52435342314fabbf (diff) | |
| parent | 3340ac044a52ebbf46a6df01010cc7168ded5f29 (diff) | |
| download | u-boot-7277a071034220c99a6d8beffddef277725e9475.tar.xz | |
Merge branch 'CR_9038_uboot_32Mflash_ziv.xu' into 'jh7110-master'
CR_9038_uboot_32Mflash_ziv.xu
See merge request sdk/u-boot!76
| -rw-r--r-- | configs/starfive_devkits_defconfig | 1 | ||||
| -rw-r--r-- | configs/starfive_evb_defconfig | 1 | ||||
| -rw-r--r-- | configs/starfive_visionfive2_defconfig | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/configs/starfive_devkits_defconfig b/configs/starfive_devkits_defconfig index 26483b9690..3774c07cdf 100644 --- a/configs/starfive_devkits_defconfig +++ b/configs/starfive_devkits_defconfig @@ -46,6 +46,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION=0x2 CONFIG_SPL_DM_SPI_FLASH=y CONFIG_SPL_DM_RESET=y +# CONFIG_SPL_SPI_FLASH_TINY is not set CONFIG_SPL_SPI_LOAD=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="StarFive # " diff --git a/configs/starfive_evb_defconfig b/configs/starfive_evb_defconfig index fa4ce76af3..1f2b15ef5f 100644 --- a/configs/starfive_evb_defconfig +++ b/configs/starfive_evb_defconfig @@ -45,6 +45,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x1800 CONFIG_SPL_DM_SPI_FLASH=y CONFIG_SPL_DM_RESET=y +# CONFIG_SPL_SPI_FLASH_TINY is not set CONFIG_SPL_SPI_LOAD=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="StarFive # " diff --git a/configs/starfive_visionfive2_defconfig b/configs/starfive_visionfive2_defconfig index 07bb1955d9..05b072db34 100644 --- a/configs/starfive_visionfive2_defconfig +++ b/configs/starfive_visionfive2_defconfig @@ -46,6 +46,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION=0x2 CONFIG_SPL_I2C=y CONFIG_SPL_DM_SPI_FLASH=y CONFIG_SPL_DM_RESET=y +# CONFIG_SPL_SPI_FLASH_TINY is not set CONFIG_SPL_SPI_LOAD=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="StarFive # " |