Remove CONFIG_NR_DRAM_BANKS option and bi_memstart/memsize from bd_info
Subsystems (9)
v8 cover Remove CONFIG_NR_DRAM_BANKS option and bi_memstart/memsize from bd_info
This patchset is an extension of the previous single patch "CONFIG_NR_DRAM_BANKS: Remove unreferenced code as its always defined". With a split into separate patches, its hopefully easier to understand, what is changed.
The earlier patch versions tried a simple search and replace of the bi_memstart / bi_memsize values with bi_dram[].start/.size. This did not work. This patchset now removes some of the assignments and changes in most cases to gd->ram_base/ram_size instead, which seems a better choice.
Successful Azure build report:
https://dev.azure.com/sr0718/u-boot/_build/results?buildId=39
Thanks,
Stefan
Changes in v8:
- Add Reviewed-by tag from Bin
- Rebased on latest TOT
- Add Reviewed-by tag from Simon
- Add Reviewed-by tag from Simon
- Add Reviewed-by tag from Simon
- Add Reviewed-by tag from Simon
- Add Reviewed-by tag from Simon
Changes in v7:
- Add Reviewe-by tag from Ovidiu
- Reword commit text as suggested by Wolfgang
- Add Reviewe-by tag from Ovidiu
- Add Reviewe-by tag from Ovidiu
- Add Reviewe-by tag from Ovidiu
Changes in v6:
- Simplify dram_init_banksize() even more as suggested by Daniel
Changes in v5:
- Add Reviewed-by tag from Pali & Andy
- Move "bd" assignment as suggested by Andy
- Use PHYSADDR() for xtensa, as the bi_memstart value was originally defined this way
- New patch to fix the failing "test.py xtfpga" CI test
- Add Tested-by tag from Oleksandr & Michael
Changes in v4:
- Only remove dead code with CONFIG_NR_DRAM_BANKS always defined
- New patch
- New patch
- New patch
- New patch
- New patch
- New patch
- New patch
- New patch
Stefan Roese (10):
CONFIG_NR_DRAM_BANKS: Remove unreferenced code as its always defined
image: Use gd->ram_base/_size in env_get_bootm_size()
board_f: Add default values for bi_dram[] in dram_init_banksize()
global: Move from bi_memstart/memsize -> gd->ram_base/ram_size
xtensa: Remove arch_setup_bdinfo()
xtensa: Remove local no-op dram_init_banksize()
video: cfb_console.c: Use bi_dram[] values on all platforms
powerpc: Remove bi_memstart & bi_memsize assignments in spl.c
cmd: bdinfo: Remove print of superseeded bi_memstart / bi_memsize
values
asm-generic/u-boot.h: Remove bi_memstart & bi_memsize from bd_info
api/api_platform-mips.c | 3 +-- api/api_platform-powerpc.c | 2 +- arch/mips/lib/boot.c | 2 +- arch/mips/lib/bootm.c | 2 +- arch/powerpc/cpu/mpc83xx/fdt.c | 2 +- arch/powerpc/cpu/mpc83xx/traps.c | 2 +- arch/powerpc/cpu/mpc85xx/fdt.c | 4 ++-- arch/powerpc/cpu/mpc85xx/traps.c | 2 +- arch/powerpc/cpu/mpc86xx/fdt.c | 4 +++- arch/powerpc/cpu/mpc86xx/traps.c | 2 +- arch/powerpc/cpu/mpc8xx/fdt.c | 2 +- arch/powerpc/lib/bootm.c | 4 ++-- arch/x86/cpu/broadwell/cpu_from_spl.c | 2 -- arch/xtensa/lib/Makefile | 2 +- arch/xtensa/lib/bdinfo.c | 22 ------------------ arch/xtensa/lib/bootm.c | 5 ++-- board/Arcturus/ucp1020/spl.c | 2 -- board/cadence/xtfpga/xtfpga.c | 5 ---- board/freescale/p1010rdb/spl.c | 2 -- board/freescale/p1_p2_rdb_pc/spl.c | 2 -- board/freescale/t102xrdb/spl.c | 2 -- board/freescale/t104xrdb/spl.c | 2 -- board/freescale/t208xqds/spl.c | 2 -- board/freescale/t208xrdb/spl.c | 2 -- board/freescale/t4rdb/spl.c | 2 -- board/xilinx/zynqmp/zynqmp.c | 2 -- cmd/bdinfo.c | 10 -------- cmd/bedbug.c | 2 +- common/board_f.c | 12 +--------- common/image.c | 10 ++------ common/init/handoff.c | 33 +++++++++++---------------- drivers/pci/pci-uclass.c | 18 ++------------- drivers/video/cfb_console.c | 8 +------ include/asm-generic/u-boot.h | 4 ---- include/handoff.h | 2 -- lib/fdtdec.c | 5 ---- lib/lmb.c | 9 ++------ 37 files changed, 41 insertions(+), 157 deletions(-) delete mode 100644 arch/xtensa/lib/bdinfo.c
Signature · 1 line
2.28.0
PATCH v8 1/10 CONFIG_NR_DRAM_BANKS: Remove unreferenced code as its always defined
Since commit 86cf1c82850f ("configs: Migrate CONFIG_NR_DRAM_BANKS") & commit 999a772d9f24 ("Kconfig: Migrate CONFIG_NR_DRAM_BANKS"), CONFIG_NR_DRAM_BANKS is always defined with a value (4 is default). It makes no sense to still carry code that is guarded with "#ifndef CONFIG_NR_DRAM_BANKS" (and similar). This patch removes all these unreferenced code paths.
---
Changes in v8:
- Add Reviewed-by tag from Bin
- Rebased on latest TOT
Changes in v5:
- Add Reviewed-by tag from Pali & Andy
- Move "bd" assignment as suggested by Andy
Changes in v4:
- Only remove dead code with CONFIG_NR_DRAM_BANKS always defined
arch/x86/cpu/broadwell/cpu_from_spl.c | 2 -- board/xilinx/zynqmp/zynqmp.c | 2 -- cmd/bdinfo.c | 2 -- common/board_f.c | 7 +----- common/image.c | 3 +-- common/init/handoff.c | 33 +++++++++++---------------- drivers/pci/pci-uclass.c | 18 ++------------- include/asm-generic/u-boot.h | 2 -- include/handoff.h | 2 -- lib/fdtdec.c | 5 ---- lib/lmb.c | 9 ++------ 11 files changed, 19 insertions(+), 66 deletions(-)
arch/x86/cpu/broadwell/cpu_from_spl.c +0 -2
@@ -53,14 +53,12 @@ void board_debug_uart_init(void)int dram_init_banksize (void ) { -#ifdef CONFIG_NR_DRAM_BANKS struct spl_handoff *ho; ho =bloblist_find (BLOBLISTT_SPL_HANDOFF ,sizeof (*ho));if (!ho)return log_msg_ret ("Missing SPL hand-off info" , -ENOENT );handoff_load_dram_banks (ho); -#endif return 0 ; }
board/xilinx/zynqmp/zynqmp.c +0 -2
@@ -423,10 +423,8 @@ int dram_init(void)#else int dram_init_banksize (void ) { -#if defined(CONFIG_NR_DRAM_BANKS ) gd->bd->bi_dram[0 ].start =CONFIG_SYS_SDRAM_BASE ; gd->bd->bi_dram[0 ].size =get_effective_memsize (); -#endif mem_map_fill ();
cmd/bdinfo.c +0 -2
@@ -49,7 +49,6 @@ void bdinfo_print_mhz(const char *name, unsigned long hz)static void print_bi_dram (const struct bd_info *bd) { -#ifdef CONFIG_NR_DRAM_BANKS int i;for (i =0 ; i <CONFIG_NR_DRAM_BANKS ; ++i) {
@@ -59,7 +58,6 @@ static void print_bi_dram(const struct bd_info *bd)bdinfo_print_num ("-> size" , bd->bi_dram[i].size); } } -#endif }__weak void arch_print_bdinfo (void )
common/board_f.c +1 -6
@@ -215,8 +215,6 @@ static int announce_dram_init(void)static int show_dram_config (void ) {unsigned long long size; - -#ifdef CONFIG_NR_DRAM_BANKS int i;debug ("\nRAM Configuration:\n" );
@@ -229,9 +227,6 @@ static int show_dram_config(void)#endif }debug ("\nDRAM: " ); -#else - size = gd->ram_size; -#endif print_size (size,"" );board_add_ram_info (0 );
@@ -242,7 +237,7 @@ static int show_dram_config(void)__weak int dram_init_banksize (void ) { -#if defined(CONFIG_NR_DRAM_BANKS ) && defined(CONFIG_SYS_SDRAM_BASE ) +#if defined(CONFIG_SYS_SDRAM_BASE ) gd->bd->bi_dram[0 ].start =CONFIG_SYS_SDRAM_BASE ; gd->bd->bi_dram[0 ].size =get_effective_memsize ();#endif
common/image.c +1 -2
@@ -685,8 +685,7 @@ phys_size_t env_get_bootm_size(void)return tmp; } -#if (defined(CONFIG_ARM ) || defined(CONFIG_MICROBLAZE )) && \ - defined(CONFIG_NR_DRAM_BANKS ) +#if defined(CONFIG_ARM ) || defined(CONFIG_MICROBLAZE ) start = gd->bd->bi_dram[0 ].start; size = gd->bd->bi_dram[0 ].size;#else
common/init/handoff.c +13 -20
@@ -12,18 +12,15 @@ DECLARE_GLOBAL_DATA_PTR;void handoff_save_dram (struct spl_handoff *ho) { +struct bd_info *bd = gd->bd; +int i; + ho->ram_size = gd->ram_size; -#ifdef CONFIG_NR_DRAM_BANKS - { -struct bd_info *bd = gd->bd; -int i; - -for (i =0 ; i <CONFIG_NR_DRAM_BANKS ; i++) { - ho->ram_bank[i].start = bd->bi_dram[i].start; - ho->ram_bank[i].size = bd->bi_dram[i].size; - } + +for (i =0 ; i <CONFIG_NR_DRAM_BANKS ; i++) { + ho->ram_bank[i].start = bd->bi_dram[i].start; + ho->ram_bank[i].size = bd->bi_dram[i].size; } -#endif }void handoff_load_dram_size (struct spl_handoff *ho)
@@ -33,15 +30,11 @@ void handoff_load_dram_size(struct spl_handoff *ho)void handoff_load_dram_banks (struct spl_handoff *ho) { -#ifdef CONFIG_NR_DRAM_BANKS - { -struct bd_info *bd = gd->bd; -int i; - -for (i =0 ; i <CONFIG_NR_DRAM_BANKS ; i++) { - bd->bi_dram[i].start = ho->ram_bank[i].start; - bd->bi_dram[i].size = ho->ram_bank[i].size; - } +struct bd_info *bd = gd->bd; +int i; + +for (i =0 ; i <CONFIG_NR_DRAM_BANKS ; i++) { + bd->bi_dram[i].start = ho->ram_bank[i].start; + bd->bi_dram[i].size = ho->ram_bank[i].size; } -#endif }
drivers/pci/pci-uclass.c +2 -16
@@ -872,6 +872,7 @@ static void decode_regions(struct pci_controller *hose, ofnode parent_node, {int pci_addr_cells, addr_cells, size_cells;int cells_per_record; +struct bd_info *bd;const u32 *prop;int len;int i;
@@ -938,9 +939,7 @@ static void decode_regions(struct pci_controller *hose, ofnode parent_node, }/* Add a region for our local memory */ -#ifdef CONFIG_NR_DRAM_BANKS -struct bd_info *bd = gd->bd; - + bd = gd->bd;if (!bd)return ;
@@ -958,19 +957,6 @@ static void decode_regions(struct pci_controller *hose, ofnode parent_node, PCI_REGION_MEM | PCI_REGION_SYS_MEMORY); } } -#else -phys_addr_t base =0 , size; - - size = gd->ram_size; -#ifdef CONFIG_SYS_SDRAM_BASE - base =CONFIG_SYS_SDRAM_BASE ; -#endif -if (gd->pci_ram_top && gd->pci_ram_top < base + size) - size = gd->pci_ram_top - base; -if (size) -pci_set_region (hose->regions + hose->region_count++, base, - base, size,PCI_REGION_MEM |PCI_REGION_SYS_MEMORY ); -#endif return ; }
include/asm-generic/u-boot.h +0 -2
@@ -70,12 +70,10 @@ struct bd_info {#endif ulong bi_arch_number;/* unique id for this board */ ulong bi_boot_params;/* where this board expects params */ -#ifdef CONFIG_NR_DRAM_BANKS struct {/* RAM configuration */ phys_addr_t start;phys_size_t size; } bi_dram[CONFIG_NR_DRAM_BANKS]; -#endif /* CONFIG_NR_DRAM_BANKS */ };#endif /* __ASSEMBLY__ */
include/handoff.h +0 -2
@@ -20,12 +20,10 @@struct spl_handoff {struct arch_spl_handoff arch;u64 ram_size; -#ifdef CONFIG_NR_DRAM_BANKS struct {u64 start;u64 size; } ram_bank[CONFIG_NR_DRAM_BANKS ]; -#endif };void handoff_save_dram (struct spl_handoff *ho);
lib/fdtdec.c +0 -5
@@ -1057,8 +1057,6 @@ int fdtdec_setup_mem_size_base(void)return 0 ; } -#if defined(CONFIG_NR_DRAM_BANKS ) -ofnode get_next_memory_node (ofnode mem) { do {
@@ -1154,7 +1152,6 @@ int fdtdec_setup_mem_size_base_lowest(void)return 0 ; } -#endif #if CONFIG_IS_ENABLED (MULTI_DTB_FIT ) # if CONFIG_IS_ENABLED(MULTI_DTB_FIT_GZIP) ||\
@@ -1617,7 +1614,6 @@ int fdtdec_resetup(int *rescan) }#endif -#ifdef CONFIG_NR_DRAM_BANKS int fdtdec_decode_ram_size (const void *blob,const char *area,int board_id,phys_addr_t *basep,phys_size_t *sizep,struct bd_info *bd)
@@ -1723,6 +1719,5 @@ int fdtdec_decode_ram_size(const void *blob, const char *area, int board_id, return 0; } -#endif /* CONFIG_NR_DRAM_BANKS */ #endif /* !USE_HOSTCC */
lib/lmb.c +2 -7
@@ -117,22 +117,17 @@ static void lmb_reserve_common(struct lmb *lmb, void *fdt_blob)/* Initialize the struct, add memory and call arch/board reserve functions */ void lmb_init_and_reserve (struct lmb *lmb,struct bd_info *bd,void *fdt_blob) { -#ifdef CONFIG_NR_DRAM_BANKS int i; -#endif lmb_init (lmb); -#ifdef CONFIG_NR_DRAM_BANKS +for (i =0 ; i <CONFIG_NR_DRAM_BANKS ; i++) {if (bd->bi_dram[i].size) {lmb_add (lmb, bd->bi_dram[i].start, bd->bi_dram[i].size); } } -#else -if (bd->bi_memsize) -lmb_add (lmb, bd->bi_memstart, bd->bi_memsize); -#endif +lmb_reserve_common (lmb, fdt_blob); }
Signature · 1 line
2.28.0
PATCH v8 2/10 image: Use gd->ram_base/_size in env_get_bootm_size()
In reply to Stefan RoeseUse only gd->ram_base/_size in env_get_bootm_size() instead of bi_dram[] in some cases and bi_memstart in others.
---
Changes in v8:
- Add Reviewed-by tag from Simon
Changes in v4:
- New patch
common/image.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
common/image.c +2 -7
@@ -685,13 +685,8 @@ phys_size_t env_get_bootm_size(void)return tmp; } -#if defined(CONFIG_ARM ) || defined(CONFIG_MICROBLAZE ) - start = gd->bd->bi_dram[0 ].start; - size = gd->bd->bi_dram[0 ].size; -#else - start = gd->bd->bi_memstart; - size = gd->bd->bi_memsize; -#endif + start = gd->ram_base; + size = gd->ram_size; s =env_get ("bootm_low" );if (s)
Signature · 1 line
2.28.0
PATCH v8 3/10 board_f: Add default values for bi_dram[] in dram_init_banksize()
In reply to Stefan RoeseRemove the bi_memstart / bi_memsize assignment in setup_bdinfo() and make sure, that bd_dram[] is always configured in the weak default implementation of dram_init_banksize(), when CONFIG_SYS_SDRAM_BASE is not set.
---
(no changes since v7)
Changes in v7:
- Add Reviewe-by tag from Ovidiu
Changes in v6:
- Simplify dram_init_banksize() even more as suggested by Daniel
Changes in v4:
- New patch
common/board_f.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
common/board_f.c +1 -6
@@ -237,10 +237,8 @@ static int show_dram_config(void)__weak int dram_init_banksize (void ) { -#if defined(CONFIG_SYS_SDRAM_BASE ) - gd->bd->bi_dram[0 ].start =CONFIG_SYS_SDRAM_BASE ; + gd->bd->bi_dram[0 ].start = gd->ram_base; gd->bd->bi_dram[0 ].size =get_effective_memsize (); -#endif return 0 ; }
@@ -602,9 +600,6 @@ int setup_bdinfo(void) {struct bd_info *bd = gd->bd; - bd->bi_memstart = gd->ram_base;/* start of memory */ - bd->bi_memsize = gd->ram_size;/* size in bytes */ -if (IS_ENABLED (CONFIG_SYS_HAS_SRAM )) { bd->bi_sramstart =CONFIG_SYS_SRAM_BASE ;/* start of SRAM */ bd->bi_sramsize =CONFIG_SYS_SRAM_SIZE ;/* size of SRAM */
Signature · 1 line
2.28.0
PATCH v8 4/10 global: Move from bi_memstart/memsize -> gd->ram_base/ram_size
In reply to Stefan RoeseWith the planned removal of bi_memstart & bi_memsize, this patch now moves the references to the better suiting gd->ram_base/ram_size variables.
---
Changes in v8:
- Add Reviewed-by tag from Simon
Changes in v7:
- Reword commit text as suggested by Wolfgang
Changes in v5:
- Use PHYSADDR() for xtensa, as the bi_memstart value was originally defined this way
Changes in v4:
- New patch
api/api_platform-mips.c | 3 +-- api/api_platform-powerpc.c | 2 +- arch/mips/lib/boot.c | 2 +- arch/mips/lib/bootm.c | 2 +- arch/powerpc/cpu/mpc83xx/fdt.c | 2 +- arch/powerpc/cpu/mpc83xx/traps.c | 2 +- arch/powerpc/cpu/mpc85xx/fdt.c | 4 ++-- arch/powerpc/cpu/mpc85xx/traps.c | 2 +- arch/powerpc/cpu/mpc86xx/fdt.c | 4 +++- arch/powerpc/cpu/mpc86xx/traps.c | 2 +- arch/powerpc/cpu/mpc8xx/fdt.c | 2 +- arch/powerpc/lib/bootm.c | 4 ++-- arch/xtensa/lib/bootm.c | 5 ++--- cmd/bedbug.c | 2 +- 14 files changed, 19 insertions(+), 19 deletions(-)
api/api_platform-mips.c +1 -2
@@ -24,8 +24,7 @@ DECLARE_GLOBAL_DATA_PTR;int platform_sys_info (struct sys_info *si) { -platform_set_mr (si, gd->bd->bi_memstart, - gd->bd->bi_memsize,MR_ATTR_DRAM ); +platform_set_mr (si, gd->ram_base, gd->ram_size,MR_ATTR_DRAM );return 1 ; }
api/api_platform-powerpc.c +1 -1
@@ -42,7 +42,7 @@ int platform_sys_info(struct sys_info *si) si->bar =0 ;#endif -platform_set_mr (si, gd->bd->bi_memstart, gd->bd->bi_memsize,MR_ATTR_DRAM ); +platform_set_mr (si, gd->ram_base, gd->ram_size,MR_ATTR_DRAM );platform_set_mr (si, gd->bd->bi_flashstart, gd->bd->bi_flashsize,MR_ATTR_FLASH );platform_set_mr (si, gd->bd->bi_sramstart, gd->bd->bi_sramsize,MR_ATTR_SRAM );
arch/mips/lib/boot.c +1 -1
@@ -17,7 +17,7 @@ unsigned long do_go_exec(ulong (*entry)(int, char * const []),* whole SDRAM area, since we don't know the size of the image * that was loaded. */ -flush_cache (gd->bd->bi_memstart, gd->ram_top - gd->bd->bi_memstart); +flush_cache (gd->ram_base, gd->ram_top - gd->ram_base);return entry (argc, argv); }
arch/mips/lib/bootm.c +1 -1
@@ -242,7 +242,7 @@ static int boot_reloc_fdt(bootm_headers_t *images)#if CONFIG_IS_ENABLED (MIPS_BOOT_FDT ) &&CONFIG_IS_ENABLED (OF_LIBFDT )int arch_fixup_fdt (void *blob) { -u64 mem_start =virt_to_phys ((void *)gd->bd->bi_memstart); +u64 mem_start =virt_to_phys ((void *)gd->ram_base);u64 mem_size = gd->ram_size;return fdt_fixup_memory_banks (blob, &mem_start, &mem_size,1 );
arch/powerpc/cpu/mpc83xx/fdt.c +1 -1
@@ -121,7 +121,7 @@ void ft_cpu_setup(void *blob, struct bd_info *bd) "clock-frequency", get_serial_clock(), 1);#endif -fdt_fixup_memory (blob, (u64 )bd->bi_memstart, (u64 )bd->bi_memsize); +fdt_fixup_memory (blob, (u64 )gd->ram_base, (u64 )gd->ram_size);#if defined(CONFIG_BOOTCOUNT_LIMIT ) && \ (defined(CONFIG_QE ) && !defined(CONFIG_ARCH_MPC831X ))
arch/powerpc/cpu/mpc83xx/traps.c +1 -1
@@ -23,7 +23,7 @@ DECLARE_GLOBAL_DATA_PTR;/* Returns 0 if exception not found and fixup otherwise. */ extern unsigned long search_exception_table (unsigned long ); -#define END_OF_MEM (gd->bd->bi_memstart + gd->bd->bi_memsize) +#define END_OF_MEM (gd->ram_base + gd->ram_size)/* * Trap & Exception support
arch/powerpc/cpu/mpc85xx/fdt.c +2 -2
@@ -672,10 +672,10 @@ void ft_cpu_setup(void *blob, struct bd_info *bd) "clock-frequency", get_bus_freq(0), 1);#endif -fdt_fixup_memory (blob, (u64 )bd->bi_memstart, (u64 )bd->bi_memsize); +fdt_fixup_memory (blob, (u64 )gd->ram_base, (u64 )gd->ram_size);#ifdef CONFIG_MP -ft_fixup_cpu (blob, (u64 )bd->bi_memstart + (u64 )bd->bi_memsize); +ft_fixup_cpu (blob, (u64 )gd->ram_base + (u64 )gd->ram_size);ft_fixup_num_cores (blob);#endif
arch/powerpc/cpu/mpc85xx/traps.c +1 -1
@@ -37,7 +37,7 @@ extern unsigned long search_exception_table(unsigned long);* amount of memory on the system if we're unable to keep all * the memory mapped in. */ -#define END_OF_MEM (gd->bd->bi_memstart + get_effective_memsize()) +#define END_OF_MEM (gd->ram_base + get_effective_memsize())static __inline__void set_tsr (unsigned long val) {
arch/powerpc/cpu/mpc86xx/fdt.c +3 -1
@@ -8,6 +8,8 @@#include <fdt_support.h> #include <asm/mp.h> +DECLARE_GLOBAL_DATA_PTR ; +extern void ft_fixup_num_cores (void *blob);extern void ft_srio_setup (void *blob);
@@ -27,7 +29,7 @@ void ft_cpu_setup(void *blob, struct bd_info *bd)do_fixup_by_prop_u32 (blob,"device_type" ,"soc" ,4 ,"bus-frequency" , bd->bi_busfreq,1 ); -fdt_fixup_memory (blob, (u64 )bd->bi_memstart, (u64 )bd->bi_memsize); +fdt_fixup_memory (blob, (u64 )gd->ram_base, (u64 )gd->ram_size);#ifdef CONFIG_SYS_NS16550 do_fixup_by_compat_u32(blob, "ns16550",
arch/powerpc/cpu/mpc86xx/traps.c +1 -1
@@ -30,7 +30,7 @@ extern unsigned long search_exception_table(unsigned long);* amount of memory on the system if we're unable to keep all * the memory mapped in. */ -#define END_OF_MEM (gd->bd->bi_memstart + get_effective_memsize()) +#define END_OF_MEM (gd->ram_base + get_effective_memsize())/* * Trap & Exception support
arch/powerpc/cpu/mpc8xx/fdt.c +1 -1
@@ -25,5 +25,5 @@ void ft_cpu_setup(void *blob, struct bd_info *bd)do_fixup_by_compat_u32 (blob,"fsl,cpm-brg" ,"clock-frequency" , gd->arch.brg_clk,1 ); -fdt_fixup_memory (blob, (u64 )bd->bi_memstart, (u64 )bd->bi_memsize); +fdt_fixup_memory (blob, (u64 )gd->ram_base, (u64 )gd->ram_size); }
arch/powerpc/lib/bootm.c +2 -2
@@ -298,8 +298,8 @@ void boot_prep_vxworks(bootm_headers_t *images)if (!images->ft_addr)return ; - base = (u64 )gd->bd->bi_memstart; - size = (u64 )gd->bd->bi_memsize; + base = (u64 )gd->ram_base; + size = (u64 )gd->ram_size; off =fdt_path_offset (images->ft_addr,"/memory" );if (off <0 )
arch/xtensa/lib/bootm.c +2 -3
@@ -41,15 +41,14 @@ static struct bp_tag *setup_last_tag(struct bp_tag *params)static struct bp_tag *setup_memory_tag (struct bp_tag *params) { -struct bd_info *bd = gd->bd;struct meminfo *mem; params->id =BP_TAG_MEMORY ; params->size =sizeof (struct meminfo ); mem = (struct meminfo *)params->data; mem->type =MEMORY_TYPE_CONVENTIONAL ; - mem->start = bd->bi_memstart; - mem->end = bd->bi_memstart + bd->bi_memsize; + mem->start =PHYSADDR (gd->ram_base); + mem->end =PHYSADDR (gd->ram_base + gd->ram_size);printf (" MEMORY: tag:0x%04x, type:0X%lx, start:0X%lx, end:0X%lx\n" ,BP_TAG_MEMORY , mem->type, mem->start, mem->end);
cmd/bedbug.c +1 -1
@@ -348,7 +348,7 @@ int do_bedbug_stack(struct cmd_tbl *cmdtp, int flag, int argc,return 1 ; } - top = gd->bd->bi_memstart + gd->bd->bi_memsize; + top = gd->ram_start + gd->ram_size; depth =0 ;printf ("Depth PC\n" );
Signature · 1 line
2.28.0
PATCH v8 5/10 xtensa: Remove arch_setup_bdinfo()
In reply to Stefan Roesearch_setup_bdinfo() only configures the deprecated bi_memstart & bi_memsize values, which should not be needed any more. Lets remove this file completely.
---
(no changes since v7)
Changes in v7:
- Add Reviewe-by tag from Ovidiu
Changes in v4:
- New patch
arch/xtensa/lib/Makefile | 2 +- arch/xtensa/lib/bdinfo.c | 22 ---------------------- 2 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 arch/xtensa/lib/bdinfo.c
arch/xtensa/lib/Makefile +1 -1
@@ -5,4 +5,4 @@ obj-$(CONFIG_CMD_BOOTM) += bootm.o -obj-y += cache.o misc.o relocate.o time.o bdinfo.o +obj-y += cache.o misc.o relocate.o time.o
arch/xtensa/lib/bdinfo.c deleted +0 -22
@@ -1,22 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* -* XTENSA-specific information for the 'bd' command -* -* (C) Copyright 2003 -* Wolfgang Denk, DENX Software Engineering, wd at denx.de. -*/ - -#include <common.h> -#include <init.h> - -DECLARE_GLOBAL_DATA_PTR ; - -int arch_setup_bdinfo (void ) -{ -struct bd_info *bd = gd->bd; - - bd->bi_memstart =PHYSADDR (CONFIG_SYS_SDRAM_BASE ); - bd->bi_memsize =CONFIG_SYS_SDRAM_SIZE ; - -return 0 ; -}
Signature · 1 line
2.28.0
PATCH v8 6/10 xtensa: Remove local no-op dram_init_banksize()
In reply to Stefan RoeseWhen this no-op dram_init_banksize() is removed, the weak default will be used instead, which correctly sets the bi_dram[] banksize values.
---
(no changes since v7)
Changes in v7:
- Add Reviewe-by tag from Ovidiu
Changes in v5:
- New patch to fix the failing "test.py xtfpga" CI test
board/cadence/xtfpga/xtfpga.c | 5 ----- 1 file changed, 5 deletions(-)
board/cadence/xtfpga/xtfpga.c +0 -5
@@ -49,11 +49,6 @@ int checkboard(void)return 0 ; } -int dram_init_banksize (void ) -{ -return 0 ; -} -int board_postclk_init (void ) {/*
Signature · 1 line
2.28.0
PATCH v8 7/10 video: cfb_console.c: Use bi_dram[] values on all platforms
In reply to Stefan RoeseAll platforms support bi_dram[] since quite some time. Lets remove the and bi_memsize values completely.
---
Changes in v8:
- Add Reviewed-by tag from Simon
Changes in v4:
- New patch
drivers/video/cfb_console.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
drivers/video/cfb_console.c +1 -7
@@ -1983,8 +1983,6 @@ static void *video_logo(void)static int cfb_fb_is_in_dram (void ) {struct bd_info *bd = gd->bd; -#if defined(CONFIG_ARM ) || defined(CONFIG_NDS32 ) || \ -defined(CONFIG_SANDBOX ) || defined(CONFIG_X86 )ulong start, end;int i;
@@ -1995,11 +1993,7 @@ defined(CONFIG_SANDBOX) || defined(CONFIG_X86) (ulong)video_fb_address < end)return 1 ; } -#else -if ((ulong )video_fb_address >= bd->bi_memstart && - (ulong )video_fb_address < bd->bi_memstart + bd->bi_memsize) -return 1 ; -#endif +return 0 ; }
Signature · 1 line
2.28.0
PATCH v8 8/10 powerpc: Remove bi_memstart & bi_memsize assignments in spl.c
In reply to Stefan RoeseMost likely these deprecated (removed) variables are not needed. Lets remove the assignments completely from all spl.c files.
---
Changes in v8:
- Add Reviewed-by tag from Simon
Changes in v5:
- Add Tested-by tag from Oleksandr & Michael
Changes in v4:
- New patch
board/Arcturus/ucp1020/spl.c | 2 -- board/freescale/p1010rdb/spl.c | 2 -- board/freescale/p1_p2_rdb_pc/spl.c | 2 -- board/freescale/t102xrdb/spl.c | 2 -- board/freescale/t104xrdb/spl.c | 2 -- board/freescale/t208xqds/spl.c | 2 -- board/freescale/t208xrdb/spl.c | 2 -- board/freescale/t4rdb/spl.c | 2 -- 8 files changed, 16 deletions(-)
board/Arcturus/ucp1020/spl.c +0 -2
@@ -83,8 +83,6 @@ void board_init_r(gd_t *gd, ulong dest_addr) bd = (struct bd_info *)(CONFIG_SPL_GD_ADDR +sizeof (gd_t));memset (bd,0 ,sizeof (struct bd_info )); gd->bd = bd; - bd->bi_memstart =CONFIG_SYS_INIT_L2_ADDR ; - bd->bi_memsize =CONFIG_SYS_L2_SIZE ;arch_cpu_init ();get_clocks ();
board/freescale/p1010rdb/spl.c +0 -2
@@ -69,8 +69,6 @@ void board_init_r(gd_t *gd, ulong dest_addr) bd = (struct bd_info *)(CONFIG_SPL_GD_ADDR +sizeof (gd_t));memset (bd,0 ,sizeof (struct bd_info )); gd->bd = bd; - bd->bi_memstart =CONFIG_SYS_INIT_L2_ADDR ; - bd->bi_memsize =CONFIG_SYS_L2_SIZE ;arch_cpu_init ();get_clocks ();
board/freescale/p1_p2_rdb_pc/spl.c +0 -2
@@ -75,8 +75,6 @@ void board_init_r(gd_t *gd, ulong dest_addr) bd = (struct bd_info *)(CONFIG_SPL_GD_ADDR +sizeof (gd_t));memset (bd,0 ,sizeof (struct bd_info )); gd->bd = bd; - bd->bi_memstart =CONFIG_SYS_INIT_L2_ADDR ; - bd->bi_memsize =CONFIG_SYS_L2_SIZE ;arch_cpu_init ();get_clocks ();
board/freescale/t102xrdb/spl.c +0 -2
@@ -103,8 +103,6 @@ void board_init_r(gd_t *gd, ulong dest_addr) bd = (struct bd_info *)(gd +sizeof (gd_t));memset (bd,0 ,sizeof (struct bd_info )); gd->bd = bd; - bd->bi_memstart =CONFIG_SYS_INIT_L3_ADDR ; - bd->bi_memsize =CONFIG_SYS_L3_SIZE ;arch_cpu_init ();get_clocks ();
board/freescale/t104xrdb/spl.c +0 -2
@@ -94,8 +94,6 @@ void board_init_r(gd_t *gd, ulong dest_addr) bd = (struct bd_info *)(gd +sizeof (gd_t));memset (bd,0 ,sizeof (struct bd_info )); gd->bd = bd; - bd->bi_memstart =CONFIG_SYS_INIT_L3_ADDR ; - bd->bi_memsize =CONFIG_SYS_L3_SIZE ;arch_cpu_init ();get_clocks ();
board/freescale/t208xqds/spl.c +0 -2
@@ -102,8 +102,6 @@ void board_init_r(gd_t *gd, ulong dest_addr) bd = (struct bd_info *)(gd +sizeof (gd_t));memset (bd,0 ,sizeof (struct bd_info )); gd->bd = bd; - bd->bi_memstart =CONFIG_SYS_INIT_L3_ADDR ; - bd->bi_memsize =CONFIG_SYS_L3_SIZE ;arch_cpu_init ();get_clocks ();
board/freescale/t208xrdb/spl.c +0 -2
@@ -72,8 +72,6 @@ void board_init_r(gd_t *gd, ulong dest_addr) bd = (struct bd_info *)(gd +sizeof (gd_t));memset (bd,0 ,sizeof (struct bd_info )); gd->bd = bd; - bd->bi_memstart =CONFIG_SYS_INIT_L3_ADDR ; - bd->bi_memsize =CONFIG_SYS_L3_SIZE ;arch_cpu_init ();get_clocks ();
board/freescale/t4rdb/spl.c +0 -2
@@ -75,8 +75,6 @@ void board_init_r(gd_t *gd, ulong dest_addr) bd = (struct bd_info *)(gd +sizeof (gd_t));memset (bd,0 ,sizeof (struct bd_info )); gd->bd = bd; - bd->bi_memstart =CONFIG_SYS_INIT_L3_ADDR ; - bd->bi_memsize =CONFIG_SYS_L3_SIZE ;arch_cpu_init ();get_clocks ();
Signature · 1 line
2.28.0
PATCH v8 9/10 cmd: bdinfo: Remove print of superseeded bi_memstart / bi_memsize values
In reply to Stefan RoeseRemove printing of the superseeded (by bi_dram[]) memory values from the bdinfo command.
---
(no changes since v7)
Changes in v7:
- Add Reviewe-by tag from Ovidiu
Changes in v4:
- New patch
cmd/bdinfo.c | 8 -------- 1 file changed, 8 deletions(-)
cmd/bdinfo.c +0 -8
@@ -34,12 +34,6 @@ static void print_eth(int idx)printf ("%-12s= %s\n" , name, val); } -static void print_phys_addr (const char *name,phys_addr_t value) -{ -printf ("%-12s= 0x%.*llx\n" , name,2 * (int )sizeof (ulong), - (unsigned long long )value); -} -void bdinfo_print_mhz (const char *name,unsigned long hz) {char buf[32 ];
@@ -73,8 +67,6 @@ int do_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])#endif bdinfo_print_num ("boot_params" , (ulong )bd->bi_boot_params);print_bi_dram (bd); -bdinfo_print_num ("memstart" , (ulong )bd->bi_memstart); -print_phys_addr ("memsize" , bd->bi_memsize);if (IS_ENABLED (CONFIG_SYS_HAS_SRAM )) {bdinfo_print_num ("sramstart" , (ulong )bd->bi_sramstart);bdinfo_print_num ("sramsize" , (ulong )bd->bi_sramsize);
Signature · 1 line
2.28.0
PATCH v8 10/10 asm-generic/u-boot.h: Remove bi_memstart & bi_memsize from bd_info
In reply to Stefan Roesebi_memstart & bi_memsize are now not referenced any more. This patch removes their definitions from the bd_info struct.
---
Changes in v8:
- Add Reviewed-by tag from Simon
Changes in v4:
- New patch
include/asm-generic/u-boot.h | 2 -- 1 file changed, 2 deletions(-)
include/asm-generic/u-boot.h +0 -2
@@ -27,8 +27,6 @@#include <linux/types.h> struct bd_info { -unsigned long bi_memstart;/* start of DRAM memory */ -phys_size_t 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 */
Signature · 1 line
2.28.0