Message ID | 20200504171638.2.I7b34db96c419d4d9692f4e1228df2a2d69b5c0b4@changeid |
---|---|
State | Superseded |
Headers | show |
Series | Tidy up the 'bd' command. | expand |
> From: Simon Glass [mailto:sjg at chromium.org] > Sent: Tuesday, May 05, 2020 7:17 AM > To: U-Boot Mailing List > Cc: Tom Rini; Simon Glass; Joe Hershberger; Rick Jian-Zhi Chen(???) > Subject: [PATCH 02/36] bdinfo: riscv: Use generic bd_info > > At present riscv still uses its own private bd_info struct. Move it over to use the generic one like other archs. > > Signed-off-by: Simon Glass <sjg at chromium.org> > --- > Reviewed-by: Rick Chen <rick at andestech.com> > arch/riscv/include/asm/u-boot.h | 19 ++----------------- > 1 file changed, 2 insertions(+), 17 deletions(-) > > diff --git a/arch/riscv/include/asm/u-boot.h b/arch/riscv/include/asm/u-boot.h index 5ba8e77812..d5e1d5f323 100644 > --- a/arch/riscv/include/asm/u-boot.h > +++ b/arch/riscv/include/asm/u-boot.h > @@ -18,25 +18,10 @@ > #ifndef _U_BOOT_H_ > #define _U_BOOT_H_ 1 > > +/* Use the generic board which requires a unified bd_info */ #include > +<asm-generic/u-boot.h> > #include <asm/u-boot-riscv.h> > > - > -typedef struct bd_info { > - unsigned long bi_boot_params; /* where this board expects params */ > - unsigned long bi_memstart; /* start of DRAM memory */ > - unsigned long bi_memsize; /* size of DRAM memory in bytes */ > - unsigned long bi_flashstart; /* start of FLASH memory */ > - unsigned long bi_flashsize; /* size of FLASH memory */ > - unsigned long bi_flashoffset; /* reserved area for startup monitor */ > - unsigned char bi_enetaddr[6]; > - > - struct /* RAM configuration */ > - { > - unsigned long start; > - unsigned long size; > - } bi_dram[CONFIG_NR_DRAM_BANKS]; > -} bd_t; > - > /* For image.h:image_check_target_arch() */ #define IH_ARCH_DEFAULT IH_ARCH_RISCV > > --
On Tue, May 5, 2020 at 7:19 AM Simon Glass <sjg at chromium.org> wrote: > > At present riscv still uses its own private bd_info struct. Move it over > to use the generic one like other archs. > > Signed-off-by: Simon Glass <sjg at chromium.org> > --- > > arch/riscv/include/asm/u-boot.h | 19 ++----------------- > 1 file changed, 2 insertions(+), 17 deletions(-) > Reviewed-by: Bin Meng <bmeng.cn at gmail.com>
diff --git a/arch/riscv/include/asm/u-boot.h b/arch/riscv/include/asm/u-boot.h index 5ba8e77812..d5e1d5f323 100644 --- a/arch/riscv/include/asm/u-boot.h +++ b/arch/riscv/include/asm/u-boot.h @@ -18,25 +18,10 @@ #ifndef _U_BOOT_H_ #define _U_BOOT_H_ 1 +/* Use the generic board which requires a unified bd_info */ +#include <asm-generic/u-boot.h> #include <asm/u-boot-riscv.h> - -typedef struct bd_info { - unsigned long bi_boot_params; /* where this board expects params */ - unsigned long bi_memstart; /* start of DRAM memory */ - unsigned long bi_memsize; /* size of DRAM memory in bytes */ - unsigned long bi_flashstart; /* start of FLASH memory */ - unsigned long bi_flashsize; /* size of FLASH memory */ - unsigned long bi_flashoffset; /* reserved area for startup monitor */ - unsigned char bi_enetaddr[6]; - - struct /* RAM configuration */ - { - unsigned long start; - unsigned long size; - } bi_dram[CONFIG_NR_DRAM_BANKS]; -} bd_t; - /* For image.h:image_check_target_arch() */ #define IH_ARCH_DEFAULT IH_ARCH_RISCV
At present riscv still uses its own private bd_info struct. Move it over to use the generic one like other archs. Signed-off-by: Simon Glass <sjg at chromium.org> --- arch/riscv/include/asm/u-boot.h | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-)