| Message ID | 20231226065441.1130540-1-ycliang@andestech.com |
|---|---|
| State | Accepted |
| Commit | 9924d44dbcd47bd3664fa9f1f9f24044d83eaebf |
| Delegated to: | Andes |
| Headers | show |
| Series | None | expand |
On Tue, Dec 26, 2023 at 02:54:41PM +0800, Leo Yu-Chi Liang wrote: > Enable MISC_INIT_R for ae350 to support CPU name detection > and re-sync the configs via make savedefconfig. > > Signed-off-by: Leo Yu-Chi Liang <ycliang@andestech.com> Reviewed-by: Yu Chien Peter Lin <peterlin@andestech.com> > --- > configs/ae350_rv32_defconfig | 5 +++-- > configs/ae350_rv32_spl_defconfig | 5 +++-- > configs/ae350_rv32_spl_xip_defconfig | 5 +++-- > configs/ae350_rv32_xip_defconfig | 5 +++-- > configs/ae350_rv64_defconfig | 5 +++-- > configs/ae350_rv64_spl_defconfig | 5 +++-- > configs/ae350_rv64_spl_xip_defconfig | 5 +++-- > configs/ae350_rv64_xip_defconfig | 5 +++-- > 8 files changed, 24 insertions(+), 16 deletions(-) > > diff --git a/configs/ae350_rv32_defconfig b/configs/ae350_rv32_defconfig > index 06cd972a0d..3bfa3e9f8e 100644 > --- a/configs/ae350_rv32_defconfig > +++ b/configs/ae350_rv32_defconfig > @@ -11,14 +11,15 @@ CONFIG_SYS_LOAD_ADDR=0x100000 > CONFIG_TARGET_ANDES_AE350=y > CONFIG_SYS_MONITOR_BASE=0x88000000 > CONFIG_FIT=y > +CONFIG_SYS_BOOTM_LEN=0x4000000 > CONFIG_DISTRO_DEFAULTS=y > CONFIG_BOOTDELAY=3 > +CONFIG_SYS_PBSIZE=1050 > CONFIG_DISPLAY_CPUINFO=y > CONFIG_DISPLAY_BOARDINFO=y > CONFIG_BOARD_EARLY_INIT_F=y > +CONFIG_MISC_INIT_R=y > CONFIG_SYS_PROMPT="RISC-V # " > -CONFIG_SYS_PBSIZE=1050 > -CONFIG_SYS_BOOTM_LEN=0x4000000 > CONFIG_CMD_IMLS=y > CONFIG_CMD_MMC=y > CONFIG_CMD_SF_TEST=y > diff --git a/configs/ae350_rv32_spl_defconfig b/configs/ae350_rv32_spl_defconfig > index f469d5bb2b..aeb50206d2 100644 > --- a/configs/ae350_rv32_spl_defconfig > +++ b/configs/ae350_rv32_spl_defconfig > @@ -16,19 +16,20 @@ CONFIG_RISCV_SMODE=y > CONFIG_SYS_MONITOR_BASE=0x88000000 > CONFIG_FIT=y > CONFIG_SPL_LOAD_FIT_ADDRESS=0x10000000 > +CONFIG_SYS_BOOTM_LEN=0x4000000 > CONFIG_DISTRO_DEFAULTS=y > CONFIG_BOOTDELAY=3 > +CONFIG_SYS_PBSIZE=1050 > CONFIG_DISPLAY_CPUINFO=y > CONFIG_DISPLAY_BOARDINFO=y > CONFIG_BOARD_EARLY_INIT_F=y > +CONFIG_MISC_INIT_R=y > CONFIG_SPL_MAX_SIZE=0x100000 > CONFIG_SPL_BSS_START_ADDR=0x400000 > CONFIG_SPL_BOARD_INIT=y > CONFIG_SPL_CACHE=y > CONFIG_SPL_OPENSBI_SCRATCH_OPTIONS=0x0 > CONFIG_SYS_PROMPT="RISC-V # " > -CONFIG_SYS_PBSIZE=1050 > -CONFIG_SYS_BOOTM_LEN=0x4000000 > CONFIG_CMD_IMLS=y > CONFIG_CMD_MMC=y > CONFIG_CMD_SF_TEST=y > diff --git a/configs/ae350_rv32_spl_xip_defconfig b/configs/ae350_rv32_spl_xip_defconfig > index 9672a19c23..f15ec301ce 100644 > --- a/configs/ae350_rv32_spl_xip_defconfig > +++ b/configs/ae350_rv32_spl_xip_defconfig > @@ -17,19 +17,20 @@ CONFIG_SPL_XIP=y > CONFIG_SYS_MONITOR_BASE=0x88000000 > CONFIG_FIT=y > CONFIG_SPL_LOAD_FIT_ADDRESS=0x80010000 > +CONFIG_SYS_BOOTM_LEN=0x4000000 > CONFIG_DISTRO_DEFAULTS=y > CONFIG_BOOTDELAY=3 > +CONFIG_SYS_PBSIZE=1050 > CONFIG_DISPLAY_CPUINFO=y > CONFIG_DISPLAY_BOARDINFO=y > CONFIG_BOARD_EARLY_INIT_F=y > +CONFIG_MISC_INIT_R=y > CONFIG_SPL_MAX_SIZE=0x100000 > CONFIG_SPL_BSS_START_ADDR=0x400000 > CONFIG_SPL_BOARD_INIT=y > CONFIG_SPL_CACHE=y > CONFIG_SPL_OPENSBI_SCRATCH_OPTIONS=0x0 > CONFIG_SYS_PROMPT="RISC-V # " > -CONFIG_SYS_PBSIZE=1050 > -CONFIG_SYS_BOOTM_LEN=0x4000000 > CONFIG_CMD_IMLS=y > CONFIG_CMD_MMC=y > CONFIG_CMD_SF_TEST=y > diff --git a/configs/ae350_rv32_xip_defconfig b/configs/ae350_rv32_xip_defconfig > index b90200a97e..c40eb043c5 100644 > --- a/configs/ae350_rv32_xip_defconfig > +++ b/configs/ae350_rv32_xip_defconfig > @@ -12,14 +12,15 @@ CONFIG_TARGET_ANDES_AE350=y > CONFIG_XIP=y > CONFIG_SYS_MONITOR_BASE=0x88000000 > CONFIG_FIT=y > +CONFIG_SYS_BOOTM_LEN=0x4000000 > CONFIG_DISTRO_DEFAULTS=y > CONFIG_BOOTDELAY=3 > +CONFIG_SYS_PBSIZE=1050 > CONFIG_DISPLAY_CPUINFO=y > CONFIG_DISPLAY_BOARDINFO=y > CONFIG_BOARD_EARLY_INIT_F=y > +CONFIG_MISC_INIT_R=y > CONFIG_SYS_PROMPT="RISC-V # " > -CONFIG_SYS_PBSIZE=1050 > -CONFIG_SYS_BOOTM_LEN=0x4000000 > CONFIG_CMD_IMLS=y > CONFIG_CMD_MMC=y > CONFIG_CMD_SF_TEST=y > diff --git a/configs/ae350_rv64_defconfig b/configs/ae350_rv64_defconfig > index a4b9ad6162..7ae938aeb2 100644 > --- a/configs/ae350_rv64_defconfig > +++ b/configs/ae350_rv64_defconfig > @@ -11,14 +11,15 @@ CONFIG_TARGET_ANDES_AE350=y > CONFIG_ARCH_RV64I=y > CONFIG_SYS_MONITOR_BASE=0x88000000 > CONFIG_FIT=y > +CONFIG_SYS_BOOTM_LEN=0x4000000 > CONFIG_DISTRO_DEFAULTS=y > CONFIG_BOOTDELAY=3 > +CONFIG_SYS_PBSIZE=1050 > CONFIG_DISPLAY_CPUINFO=y > CONFIG_DISPLAY_BOARDINFO=y > CONFIG_BOARD_EARLY_INIT_F=y > +CONFIG_MISC_INIT_R=y > CONFIG_SYS_PROMPT="RISC-V # " > -CONFIG_SYS_PBSIZE=1050 > -CONFIG_SYS_BOOTM_LEN=0x4000000 > CONFIG_CMD_IMLS=y > CONFIG_CMD_MMC=y > CONFIG_CMD_SF_TEST=y > diff --git a/configs/ae350_rv64_spl_defconfig b/configs/ae350_rv64_spl_defconfig > index 834a0fbbdd..68ac4325ab 100644 > --- a/configs/ae350_rv64_spl_defconfig > +++ b/configs/ae350_rv64_spl_defconfig > @@ -16,19 +16,20 @@ CONFIG_RISCV_SMODE=y > CONFIG_SYS_MONITOR_BASE=0x88000000 > CONFIG_FIT=y > CONFIG_SPL_LOAD_FIT_ADDRESS=0x10000000 > +CONFIG_SYS_BOOTM_LEN=0x4000000 > CONFIG_DISTRO_DEFAULTS=y > CONFIG_BOOTDELAY=3 > +CONFIG_SYS_PBSIZE=1050 > CONFIG_DISPLAY_CPUINFO=y > CONFIG_DISPLAY_BOARDINFO=y > CONFIG_BOARD_EARLY_INIT_F=y > +CONFIG_MISC_INIT_R=y > CONFIG_SPL_MAX_SIZE=0x100000 > CONFIG_SPL_BSS_START_ADDR=0x400000 > CONFIG_SPL_BOARD_INIT=y > CONFIG_SPL_CACHE=y > CONFIG_SPL_OPENSBI_SCRATCH_OPTIONS=0x0 > CONFIG_SYS_PROMPT="RISC-V # " > -CONFIG_SYS_PBSIZE=1050 > -CONFIG_SYS_BOOTM_LEN=0x4000000 > CONFIG_CMD_IMLS=y > CONFIG_CMD_MMC=y > CONFIG_CMD_SF_TEST=y > diff --git a/configs/ae350_rv64_spl_xip_defconfig b/configs/ae350_rv64_spl_xip_defconfig > index b52b8d78d7..839ca335d4 100644 > --- a/configs/ae350_rv64_spl_xip_defconfig > +++ b/configs/ae350_rv64_spl_xip_defconfig > @@ -17,19 +17,20 @@ CONFIG_SPL_XIP=y > CONFIG_SYS_MONITOR_BASE=0x88000000 > CONFIG_FIT=y > CONFIG_SPL_LOAD_FIT_ADDRESS=0x80010000 > +CONFIG_SYS_BOOTM_LEN=0x4000000 > CONFIG_DISTRO_DEFAULTS=y > CONFIG_BOOTDELAY=3 > +CONFIG_SYS_PBSIZE=1050 > CONFIG_DISPLAY_CPUINFO=y > CONFIG_DISPLAY_BOARDINFO=y > CONFIG_BOARD_EARLY_INIT_F=y > +CONFIG_MISC_INIT_R=y > CONFIG_SPL_MAX_SIZE=0x100000 > CONFIG_SPL_BSS_START_ADDR=0x400000 > CONFIG_SPL_BOARD_INIT=y > CONFIG_SPL_CACHE=y > CONFIG_SPL_OPENSBI_SCRATCH_OPTIONS=0x0 > CONFIG_SYS_PROMPT="RISC-V # " > -CONFIG_SYS_PBSIZE=1050 > -CONFIG_SYS_BOOTM_LEN=0x4000000 > CONFIG_CMD_IMLS=y > CONFIG_CMD_MMC=y > CONFIG_CMD_SF_TEST=y > diff --git a/configs/ae350_rv64_xip_defconfig b/configs/ae350_rv64_xip_defconfig > index cc5e751c9b..5432b6d6d7 100644 > --- a/configs/ae350_rv64_xip_defconfig > +++ b/configs/ae350_rv64_xip_defconfig > @@ -12,14 +12,15 @@ CONFIG_ARCH_RV64I=y > CONFIG_XIP=y > CONFIG_SYS_MONITOR_BASE=0x88000000 > CONFIG_FIT=y > +CONFIG_SYS_BOOTM_LEN=0x4000000 > CONFIG_DISTRO_DEFAULTS=y > CONFIG_BOOTDELAY=3 > +CONFIG_SYS_PBSIZE=1050 > CONFIG_DISPLAY_CPUINFO=y > CONFIG_DISPLAY_BOARDINFO=y > CONFIG_BOARD_EARLY_INIT_F=y > +CONFIG_MISC_INIT_R=y > CONFIG_SYS_PROMPT="RISC-V # " > -CONFIG_SYS_PBSIZE=1050 > -CONFIG_SYS_BOOTM_LEN=0x4000000 > CONFIG_CMD_IMLS=y > CONFIG_CMD_MMC=y > CONFIG_CMD_SF_TEST=y > -- > 2.34.1 >
diff --git a/configs/ae350_rv32_defconfig b/configs/ae350_rv32_defconfig index 06cd972a0d..3bfa3e9f8e 100644 --- a/configs/ae350_rv32_defconfig +++ b/configs/ae350_rv32_defconfig @@ -11,14 +11,15 @@ CONFIG_SYS_LOAD_ADDR=0x100000 CONFIG_TARGET_ANDES_AE350=y CONFIG_SYS_MONITOR_BASE=0x88000000 CONFIG_FIT=y +CONFIG_SYS_BOOTM_LEN=0x4000000 CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTDELAY=3 +CONFIG_SYS_PBSIZE=1050 CONFIG_DISPLAY_CPUINFO=y CONFIG_DISPLAY_BOARDINFO=y CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_MISC_INIT_R=y CONFIG_SYS_PROMPT="RISC-V # " -CONFIG_SYS_PBSIZE=1050 -CONFIG_SYS_BOOTM_LEN=0x4000000 CONFIG_CMD_IMLS=y CONFIG_CMD_MMC=y CONFIG_CMD_SF_TEST=y diff --git a/configs/ae350_rv32_spl_defconfig b/configs/ae350_rv32_spl_defconfig index f469d5bb2b..aeb50206d2 100644 --- a/configs/ae350_rv32_spl_defconfig +++ b/configs/ae350_rv32_spl_defconfig @@ -16,19 +16,20 @@ CONFIG_RISCV_SMODE=y CONFIG_SYS_MONITOR_BASE=0x88000000 CONFIG_FIT=y CONFIG_SPL_LOAD_FIT_ADDRESS=0x10000000 +CONFIG_SYS_BOOTM_LEN=0x4000000 CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTDELAY=3 +CONFIG_SYS_PBSIZE=1050 CONFIG_DISPLAY_CPUINFO=y CONFIG_DISPLAY_BOARDINFO=y CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_MISC_INIT_R=y CONFIG_SPL_MAX_SIZE=0x100000 CONFIG_SPL_BSS_START_ADDR=0x400000 CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_CACHE=y CONFIG_SPL_OPENSBI_SCRATCH_OPTIONS=0x0 CONFIG_SYS_PROMPT="RISC-V # " -CONFIG_SYS_PBSIZE=1050 -CONFIG_SYS_BOOTM_LEN=0x4000000 CONFIG_CMD_IMLS=y CONFIG_CMD_MMC=y CONFIG_CMD_SF_TEST=y diff --git a/configs/ae350_rv32_spl_xip_defconfig b/configs/ae350_rv32_spl_xip_defconfig index 9672a19c23..f15ec301ce 100644 --- a/configs/ae350_rv32_spl_xip_defconfig +++ b/configs/ae350_rv32_spl_xip_defconfig @@ -17,19 +17,20 @@ CONFIG_SPL_XIP=y CONFIG_SYS_MONITOR_BASE=0x88000000 CONFIG_FIT=y CONFIG_SPL_LOAD_FIT_ADDRESS=0x80010000 +CONFIG_SYS_BOOTM_LEN=0x4000000 CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTDELAY=3 +CONFIG_SYS_PBSIZE=1050 CONFIG_DISPLAY_CPUINFO=y CONFIG_DISPLAY_BOARDINFO=y CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_MISC_INIT_R=y CONFIG_SPL_MAX_SIZE=0x100000 CONFIG_SPL_BSS_START_ADDR=0x400000 CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_CACHE=y CONFIG_SPL_OPENSBI_SCRATCH_OPTIONS=0x0 CONFIG_SYS_PROMPT="RISC-V # " -CONFIG_SYS_PBSIZE=1050 -CONFIG_SYS_BOOTM_LEN=0x4000000 CONFIG_CMD_IMLS=y CONFIG_CMD_MMC=y CONFIG_CMD_SF_TEST=y diff --git a/configs/ae350_rv32_xip_defconfig b/configs/ae350_rv32_xip_defconfig index b90200a97e..c40eb043c5 100644 --- a/configs/ae350_rv32_xip_defconfig +++ b/configs/ae350_rv32_xip_defconfig @@ -12,14 +12,15 @@ CONFIG_TARGET_ANDES_AE350=y CONFIG_XIP=y CONFIG_SYS_MONITOR_BASE=0x88000000 CONFIG_FIT=y +CONFIG_SYS_BOOTM_LEN=0x4000000 CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTDELAY=3 +CONFIG_SYS_PBSIZE=1050 CONFIG_DISPLAY_CPUINFO=y CONFIG_DISPLAY_BOARDINFO=y CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_MISC_INIT_R=y CONFIG_SYS_PROMPT="RISC-V # " -CONFIG_SYS_PBSIZE=1050 -CONFIG_SYS_BOOTM_LEN=0x4000000 CONFIG_CMD_IMLS=y CONFIG_CMD_MMC=y CONFIG_CMD_SF_TEST=y diff --git a/configs/ae350_rv64_defconfig b/configs/ae350_rv64_defconfig index a4b9ad6162..7ae938aeb2 100644 --- a/configs/ae350_rv64_defconfig +++ b/configs/ae350_rv64_defconfig @@ -11,14 +11,15 @@ CONFIG_TARGET_ANDES_AE350=y CONFIG_ARCH_RV64I=y CONFIG_SYS_MONITOR_BASE=0x88000000 CONFIG_FIT=y +CONFIG_SYS_BOOTM_LEN=0x4000000 CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTDELAY=3 +CONFIG_SYS_PBSIZE=1050 CONFIG_DISPLAY_CPUINFO=y CONFIG_DISPLAY_BOARDINFO=y CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_MISC_INIT_R=y CONFIG_SYS_PROMPT="RISC-V # " -CONFIG_SYS_PBSIZE=1050 -CONFIG_SYS_BOOTM_LEN=0x4000000 CONFIG_CMD_IMLS=y CONFIG_CMD_MMC=y CONFIG_CMD_SF_TEST=y diff --git a/configs/ae350_rv64_spl_defconfig b/configs/ae350_rv64_spl_defconfig index 834a0fbbdd..68ac4325ab 100644 --- a/configs/ae350_rv64_spl_defconfig +++ b/configs/ae350_rv64_spl_defconfig @@ -16,19 +16,20 @@ CONFIG_RISCV_SMODE=y CONFIG_SYS_MONITOR_BASE=0x88000000 CONFIG_FIT=y CONFIG_SPL_LOAD_FIT_ADDRESS=0x10000000 +CONFIG_SYS_BOOTM_LEN=0x4000000 CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTDELAY=3 +CONFIG_SYS_PBSIZE=1050 CONFIG_DISPLAY_CPUINFO=y CONFIG_DISPLAY_BOARDINFO=y CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_MISC_INIT_R=y CONFIG_SPL_MAX_SIZE=0x100000 CONFIG_SPL_BSS_START_ADDR=0x400000 CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_CACHE=y CONFIG_SPL_OPENSBI_SCRATCH_OPTIONS=0x0 CONFIG_SYS_PROMPT="RISC-V # " -CONFIG_SYS_PBSIZE=1050 -CONFIG_SYS_BOOTM_LEN=0x4000000 CONFIG_CMD_IMLS=y CONFIG_CMD_MMC=y CONFIG_CMD_SF_TEST=y diff --git a/configs/ae350_rv64_spl_xip_defconfig b/configs/ae350_rv64_spl_xip_defconfig index b52b8d78d7..839ca335d4 100644 --- a/configs/ae350_rv64_spl_xip_defconfig +++ b/configs/ae350_rv64_spl_xip_defconfig @@ -17,19 +17,20 @@ CONFIG_SPL_XIP=y CONFIG_SYS_MONITOR_BASE=0x88000000 CONFIG_FIT=y CONFIG_SPL_LOAD_FIT_ADDRESS=0x80010000 +CONFIG_SYS_BOOTM_LEN=0x4000000 CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTDELAY=3 +CONFIG_SYS_PBSIZE=1050 CONFIG_DISPLAY_CPUINFO=y CONFIG_DISPLAY_BOARDINFO=y CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_MISC_INIT_R=y CONFIG_SPL_MAX_SIZE=0x100000 CONFIG_SPL_BSS_START_ADDR=0x400000 CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_CACHE=y CONFIG_SPL_OPENSBI_SCRATCH_OPTIONS=0x0 CONFIG_SYS_PROMPT="RISC-V # " -CONFIG_SYS_PBSIZE=1050 -CONFIG_SYS_BOOTM_LEN=0x4000000 CONFIG_CMD_IMLS=y CONFIG_CMD_MMC=y CONFIG_CMD_SF_TEST=y diff --git a/configs/ae350_rv64_xip_defconfig b/configs/ae350_rv64_xip_defconfig index cc5e751c9b..5432b6d6d7 100644 --- a/configs/ae350_rv64_xip_defconfig +++ b/configs/ae350_rv64_xip_defconfig @@ -12,14 +12,15 @@ CONFIG_ARCH_RV64I=y CONFIG_XIP=y CONFIG_SYS_MONITOR_BASE=0x88000000 CONFIG_FIT=y +CONFIG_SYS_BOOTM_LEN=0x4000000 CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTDELAY=3 +CONFIG_SYS_PBSIZE=1050 CONFIG_DISPLAY_CPUINFO=y CONFIG_DISPLAY_BOARDINFO=y CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_MISC_INIT_R=y CONFIG_SYS_PROMPT="RISC-V # " -CONFIG_SYS_PBSIZE=1050 -CONFIG_SYS_BOOTM_LEN=0x4000000 CONFIG_CMD_IMLS=y CONFIG_CMD_MMC=y CONFIG_CMD_SF_TEST=y
Enable MISC_INIT_R for ae350 to support CPU name detection and re-sync the configs via make savedefconfig. Signed-off-by: Leo Yu-Chi Liang <ycliang@andestech.com> --- configs/ae350_rv32_defconfig | 5 +++-- configs/ae350_rv32_spl_defconfig | 5 +++-- configs/ae350_rv32_spl_xip_defconfig | 5 +++-- configs/ae350_rv32_xip_defconfig | 5 +++-- configs/ae350_rv64_defconfig | 5 +++-- configs/ae350_rv64_spl_defconfig | 5 +++-- configs/ae350_rv64_spl_xip_defconfig | 5 +++-- configs/ae350_rv64_xip_defconfig | 5 +++-- 8 files changed, 24 insertions(+), 16 deletions(-)