CONFIG_NR_DRAM_BANKS: Remove unreferenced code as its always defined
Subsystems (10)
PATCH v2 1/1 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.
Also complete remove bi_memstart & bi_memsize from the board-info struct. As now bi_dram[] is always enabled and should be used instead. This removes the redundant varriables.
---
v2:
- Change all references to bi_memstart & bi_memsize to bi_dram[0].start/ size and remove it from the bd_info struct completely, as suggested by Daniel
api/api_platform-mips.c | 4 ++-- api/api_platform-powerpc.c | 2 +- arch/arc/lib/cpu.c | 4 ++-- 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 | 2 +- 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/bootm.c | 4 ++-- board/Arcturus/ucp1020/spl.c | 4 ++-- board/cadence/xtfpga/xtfpga.c | 4 ++-- board/freescale/p1010rdb/spl.c | 4 ++-- board/freescale/p1_p2_rdb_pc/spl.c | 4 ++-- board/freescale/t102xrdb/spl.c | 4 ++-- board/freescale/t104xrdb/spl.c | 4 ++-- board/freescale/t208xqds/spl.c | 4 ++-- board/freescale/t208xrdb/spl.c | 4 ++-- board/freescale/t4rdb/spl.c | 4 ++-- board/xilinx/zynqmp/zynqmp.c | 2 -- cmd/bdinfo.c | 6 ++---- cmd/bedbug.c | 2 +- common/board_f.c | 10 +++------- common/image.c | 12 ------------ common/init/handoff.c | 4 ---- drivers/pci/pci-uclass.c | 17 +---------------- drivers/video/cfb_console.c | 8 +------- include/asm-generic/u-boot.h | 4 ---- include/handoff.h | 2 -- lib/fdtdec.c | 5 ----- lib/lmb.c | 7 ------- 36 files changed, 45 insertions(+), 110 deletions(-)
api/api_platform-mips.c +2 -2
@@ -24,8 +24,8 @@ 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->bd-> bi_dram[0 ].start, + gd->bd->bi_dram[0 ].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->bd->bi_dram[0 ].start, gd->bd->bi_dram[0 ].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/arc/lib/cpu.c +2 -2
@@ -27,8 +27,8 @@ int arch_cpu_init(void)int arch_early_init_r (void ) { - gd->bd->bi_memstart =CONFIG_SYS_SDRAM_BASE ; - gd->bd->bi_memsize =CONFIG_SYS_SDRAM_SIZE ; + gd->bd->bi_dram[0 ].start =CONFIG_SYS_SDRAM_BASE ; + gd->bd->bi_dram[0 ].size =CONFIG_SYS_SDRAM_SIZE ;return 0 ; }
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->bd->bi_dram[0 ].start, gd->ram_top - gd->bd->bi_dram[0 ].start);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->bd->bi_dram[0 ].start);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 )bd->bi_dram[0 ].start, (u64 )bd->bi_dram[0 ].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->bd->bi_dram[0].start + gd->bd->bi_dram[0].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 )bd->bi_dram[0 ].start, (u64 )bd->bi_dram[0 ].size);#ifdef CONFIG_MP -ft_fixup_cpu (blob, (u64 )bd->bi_memstart + (u64 )bd->bi_memsize); +ft_fixup_cpu (blob, (u64 )bd->bi_dram[0 ].start + (u64 )bd->bi_dram[0 ].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->bd->bi_dram[0].start + get_effective_memsize())static __inline__void set_tsr (unsigned long val) {
arch/powerpc/cpu/mpc86xx/fdt.c +1 -1
@@ -27,7 +27,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 )bd->bi_dram[0 ].start, (u64 )bd->bi_dram[0 ].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->bd->bi_dram[0].start + 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 )bd->bi_dram[0 ].start, (u64 )bd->bi_dram[0 ].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->bd->bi_dram[0 ].start; + size = (u64 )gd->bd->bi_dram[0 ].size; off =fdt_path_offset (images->ft_addr,"/memory" );if (off <0 )
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 ; }
arch/xtensa/lib/bootm.c +2 -2
@@ -48,8 +48,8 @@ static struct bp_tag *setup_memory_tag(struct bp_tag *params) 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 = bd->bi_dram[0 ].start; + mem->end = bd->bi_dram[0 ].start + bd->bi_dram[0 ].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);
board/Arcturus/ucp1020/spl.c +2 -2
@@ -83,8 +83,8 @@ 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 ; + bd->bi_dram[0 ].start =CONFIG_SYS_INIT_L2_ADDR ; + bd->bi_dram[0 ].size =CONFIG_SYS_L2_SIZE ;arch_cpu_init ();get_clocks ();
board/cadence/xtfpga/xtfpga.c +2 -2
@@ -51,8 +51,8 @@ int checkboard(void)int dram_init_banksize (void ) { - gd->bd->bi_memstart =PHYSADDR (CONFIG_SYS_SDRAM_BASE ); - gd->bd->bi_memsize =CONFIG_SYS_SDRAM_SIZE ; + gd->bd->bi_dram[0 ].start =PHYSADDR (CONFIG_SYS_SDRAM_BASE ); + gd->bd->bi_dram[0 ].size =CONFIG_SYS_SDRAM_SIZE ;return 0 ; }
board/freescale/p1010rdb/spl.c +2 -2
@@ -69,8 +69,8 @@ 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 ; + bd->bi_dram[0 ].start =CONFIG_SYS_INIT_L2_ADDR ; + bd->bi_dram[0 ].size =CONFIG_SYS_L2_SIZE ;arch_cpu_init ();get_clocks ();
board/freescale/p1_p2_rdb_pc/spl.c +2 -2
@@ -75,8 +75,8 @@ 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 ; + bd->bi_dram[0 ].start =CONFIG_SYS_INIT_L2_ADDR ; + bd->bi_dram[0 ].size =CONFIG_SYS_L2_SIZE ;arch_cpu_init ();get_clocks ();
board/freescale/t102xrdb/spl.c +2 -2
@@ -103,8 +103,8 @@ 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 ; + bd->bi_dram[0 ].start =CONFIG_SYS_INIT_L3_ADDR ; + bd->bi_dram[0 ].size =CONFIG_SYS_L3_SIZE ;arch_cpu_init ();get_clocks ();
board/freescale/t104xrdb/spl.c +2 -2
@@ -94,8 +94,8 @@ 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 ; + bd->bi_dram[0 ].start =CONFIG_SYS_INIT_L3_ADDR ; + bd->bi_dram[0 ].size =CONFIG_SYS_L3_SIZE ;arch_cpu_init ();get_clocks ();
board/freescale/t208xqds/spl.c +2 -2
@@ -102,8 +102,8 @@ 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 ; + bd->bi_dram[0 ].start =CONFIG_SYS_INIT_L3_ADDR ; + bd->bi_dram[0 ].size =CONFIG_SYS_L3_SIZE ;arch_cpu_init ();get_clocks ();
board/freescale/t208xrdb/spl.c +2 -2
@@ -72,8 +72,8 @@ 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 ; + bd->bi_dram[0 ].start =CONFIG_SYS_INIT_L3_ADDR ; + bd->bi_dram[0 ].size =CONFIG_SYS_L3_SIZE ;arch_cpu_init ();get_clocks ();
board/freescale/t4rdb/spl.c +2 -2
@@ -75,8 +75,8 @@ 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 ; + bd->bi_dram[0 ].start =CONFIG_SYS_INIT_L3_ADDR ; + bd->bi_dram[0 ].size =CONFIG_SYS_L3_SIZE ;arch_cpu_init ();get_clocks ();
board/xilinx/zynqmp/zynqmp.c +0 -2
@@ -467,10 +467,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 +2 -4
@@ -47,7 +47,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) {
@@ -57,7 +56,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 )
@@ -73,8 +71,8 @@ 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_lnum ("memsize" , (u64 )bd->bi_memsize); +bdinfo_print_num ("memstart" , (ulong )bd->bi_dram[0 ].start); +print_lnum ("memsize" , (u64 )bd->bi_dram[0 ].size);bdinfo_print_num ("flashstart" , (ulong )bd->bi_flashstart);bdinfo_print_num ("flashsize" , (ulong )bd->bi_flashsize);bdinfo_print_num ("flashoffset" , (ulong )bd->bi_flashoffset);
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->bd->bi_dram[0 ].start + gd->bd->bi_dram[0 ].size; depth =0 ;printf ("Depth PC\n" );
common/board_f.c +3 -7
@@ -216,7 +216,6 @@ static int show_dram_config(void) {unsigned long long size; -#ifdef CONFIG_NR_DRAM_BANKS int i;debug ("\nRAM Configuration:\n" );
@@ -229,9 +228,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 +238,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
@@ -607,8 +603,8 @@ static int setup_board_part1(void)/* * Save local variables to board info struct */ - bd->bi_memstart =CONFIG_SYS_SDRAM_BASE ;/* start of memory */ - bd->bi_memsize = gd->ram_size;/* size in bytes */ + bd->bi_dram[0 ].start =CONFIG_SYS_SDRAM_BASE ;/* start of memory */ + bd->bi_dram[0 ].size = gd->ram_size;/* size in bytes */ #ifdef CONFIG_SYS_SRAM_BASE bd->bi_sramstart =CONFIG_SYS_SRAM_BASE ;/* start of SRAM */
common/image.c +0 -12
@@ -666,13 +666,7 @@ ulong env_get_bootm_low(void)return tmp; } -#if defined(CONFIG_SYS_SDRAM_BASE ) -return CONFIG_SYS_SDRAM_BASE ; -#elif defined(CONFIG_ARM ) || defined(CONFIG_MICROBLAZE )return gd->bd->bi_dram[0 ].start; -#else -return 0 ; -#endif }phys_size_t env_get_bootm_size (void )
@@ -685,14 +679,8 @@ phys_size_t env_get_bootm_size(void)return tmp; } -#if (defined(CONFIG_ARM ) || defined(CONFIG_MICROBLAZE )) && \ - defined(CONFIG_NR_DRAM_BANKS ) 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 s =env_get ("bootm_low" );if (s)
common/init/handoff.c +0 -4
@@ -13,7 +13,6 @@ DECLARE_GLOBAL_DATA_PTR;void handoff_save_dram (struct spl_handoff *ho) { ho->ram_size = gd->ram_size; -#ifdef CONFIG_NR_DRAM_BANKS {struct bd_info *bd = gd->bd;int i;
@@ -23,7 +22,6 @@ void handoff_save_dram(struct spl_handoff *ho) ho->ram_bank[i].size = bd->bi_dram[i].size; } } -#endif }void handoff_load_dram_size (struct spl_handoff *ho)
@@ -33,7 +31,6 @@ 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;
@@ -43,5 +40,4 @@ void handoff_load_dram_banks(struct spl_handoff *ho) bd->bi_dram[i].size = ho->ram_bank[i].size; } } -#endif }
drivers/pci/pci-uclass.c +1 -16
@@ -871,6 +871,7 @@ static void decode_regions(struct pci_controller *hose, ofnode parent_node, ofnode node) {int pci_addr_cells, addr_cells, size_cells; +struct bd_info *bd = gd->bd;int cells_per_record;const u32 *prop;int len;
@@ -938,9 +939,6 @@ 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; -if (!bd)return ;
@@ -958,19 +956,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 ; }
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 ; }
include/asm-generic/u-boot.h +0 -4
@@ -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 */
@@ -70,12 +68,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
@@ -1055,8 +1055,6 @@ int fdtdec_setup_mem_size_base(void)return 0 ; } -#if defined(CONFIG_NR_DRAM_BANKS ) -static int get_next_memory_node (const void *blob,int mem) { do {
@@ -1106,7 +1104,6 @@ int fdtdec_setup_memory_banksize(void)return 0 ; } -#endif #if CONFIG_IS_ENABLED (MULTI_DTB_FIT ) # if CONFIG_IS_ENABLED(MULTI_DTB_FIT_GZIP) ||\
@@ -1569,7 +1566,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)
@@ -1675,6 +1671,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 +0 -7
@@ -113,22 +113,15 @@ 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 v2 1/1 CONFIG_NR_DRAM_BANKS: Remove unreferenced code as its always defined
Quoted 52 lines
Since commit
86cf1c82850f("configs: MigrateCONFIG_NR_DRAM_BANKS") & commit999a772d9f24("Kconfig: MigrateCONFIG_NR_DRAM_BANKS"),CONFIG_NR_DRAM_BANKSis always defined with a value (4 is default). It makes no sense to still carry code that is guarded with "#ifndefCONFIG_NR_DRAM_BANKS" (and similar). This patch removes all these unreferenced code paths.Also complete remove
bi_memstart&bi_memsizefrom the board-info struct. As now bi_dram[] is always enabled and should be used instead. This removes the redundant varriables.Signed-off-by Stefan Roese <[email protected]>Cc Daniel Schwierzeck <[email protected]>Cc Tom Rini <[email protected]>Cc Ramon Fried <[email protected]>Cc Simon Glass <[email protected]>Cc Michal Simek <[email protected]>---
v2:
- Change all references tobi_memstart&bi_memsizeto bi_dram[0].start/ size and remove it from thebd_infostruct completely, as suggested by Danielapi/api_platform-mips.c | 4 ++-- api/api_platform-powerpc.c | 2 +- arch/arc/lib/cpu.c | 4 ++-- 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 | 2 +- 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/bootm.c | 4 ++-- board/Arcturus/ucp1020/spl.c | 4 ++-- board/cadence/xtfpga/xtfpga.c | 4 ++-- board/freescale/p1010rdb/spl.c | 4 ++-- board/freescale/p1_p2_rdb_pc/spl.c | 4 ++-- board/freescale/t102xrdb/spl.c | 4 ++-- board/freescale/t104xrdb/spl.c | 4 ++-- board/freescale/t208xqds/spl.c | 4 ++-- board/freescale/t208xrdb/spl.c | 4 ++-- board/freescale/t4rdb/spl.c | 4 ++-- board/xilinx/zynqmp/zynqmp.c | 2 -- cmd/bdinfo.c | 6 ++---- cmd/bedbug.c | 2 +- common/board_f.c | 10 +++------- common/image.c | 12 ------------
Quoted 9 lines
common/init/handoff.c | 4 ---- drivers/pci/pci-uclass.c | 17 +---------------- drivers/video/cfb_console.c | 8 +------- include/asm-generic/u-boot.h | 4 ---- include/handoff.h | 2 -- lib/fdtdec.c | 5 ----- lib/lmb.c | 7 ------- 36 files changed, 45 insertions(+), 110 deletions(-)
nice cleanup, thanks.
Signature · 1 line
- Daniel
PATCH v2 1/1 CONFIG_NR_DRAM_BANKS: Remove unreferenced code as its always defined
In reply to Stefan RoeseQuoted 11 lines · Stefan Roese
Since commit
86cf1c82850f("configs: MigrateCONFIG_NR_DRAM_BANKS") & commit999a772d9f24("Kconfig: MigrateCONFIG_NR_DRAM_BANKS"),CONFIG_NR_DRAM_BANKSis always defined with a value (4 is default). It makes no sense to still carry code that is guarded with "#ifndefCONFIG_NR_DRAM_BANKS" (and similar). This patch removes all these unreferenced code paths.Also complete remove
bi_memstart&bi_memsizefrom the board-info struct. As now bi_dram[] is always enabled and should be used instead. This removes the redundant varriables.
Quoted 7 lines
Signed-off-by Stefan Roese <[email protected]>Cc Daniel Schwierzeck <[email protected]>Cc Tom Rini <[email protected]>Cc Ramon Fried <[email protected]>Cc Simon Glass <[email protected]>Cc Michal Simek <[email protected]>Reviewed-by Daniel Schwierzeck <[email protected]>
I don't see quite how, but this is breaking running test/nokia_rx51_test.sh (or, my fixup of this to apply to current master was wrong, and is what's breaking the test). Please rebase and confirm that test passes as well, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200807/5a8f97cc/attachment.sig>
PATCH v2 1/1 CONFIG_NR_DRAM_BANKS: Remove unreferenced code as its always defined
Hi Tom,
Hi Pali,
(added Pali because of the Nokia RX51 issue)
Quoted 21 lines · Tom Rini
Quoted 11 lines · Stefan Roese
Since commit
86cf1c82850f("configs: MigrateCONFIG_NR_DRAM_BANKS") & commit999a772d9f24("Kconfig: MigrateCONFIG_NR_DRAM_BANKS"),CONFIG_NR_DRAM_BANKSis always defined with a value (4 is default). It makes no sense to still carry code that is guarded with "#ifndefCONFIG_NR_DRAM_BANKS" (and similar). This patch removes all these unreferenced code paths.Also complete remove
bi_memstart&bi_memsizefrom the board-info struct. As now bi_dram[] is always enabled and should be used instead. This removes the redundant varriables.Quoted 7 lines
Signed-off-by Stefan Roese <[email protected]>Cc Daniel Schwierzeck <[email protected]>Cc Tom Rini <[email protected]>Cc Ramon Fried <[email protected]>Cc Simon Glass <[email protected]>Cc Michal Simek <[email protected]>Reviewed-by Daniel Schwierzeck <[email protected]>
Quoted 4 lines
I don't see quite how, but this is breaking running
test/nokia_rx51_test.sh(or, my fixup of this to apply to current master was wrong, and is what's breaking the test). Please rebase and confirm that test passes as well, thanks!
I've checked the issue with nokia_rx51_test.sh and could not find any issues in the patch. My assumption now is, that the very old Linux kernel (2.6.28) that is used in this Nokia test, still uses the bd_info struct in Linux to pass the memory information (via bd_memstart & bi_memsize), as was also done in the very old PowerPC days. With this patch now and the removal of these fields from bd_info, this might explain why this kernel does not boot any more (no output on the serial console at all).
Pali, could you please check if my assumption is correct here? And if yes, could please switch the test to using a newer kernel version? Or remove the Linux kernel booting from the test?
I've pushed the latest patch version into this branch (based on top of the latest TOT):
The failing Azure CI report can be found here:
https://dev.azure.com/sr0718/u-boot/_build/results?buildId=20&view=results
A working Azure report is here for comparison:
https://dev.azure.com/sr0718/u-boot/_build/results?buildId=18&view=results
Thanks,
Stefan
PATCH v2 1/1 CONFIG_NR_DRAM_BANKS: Remove unreferenced code as its always defined
Hello!
Quoted 4 lines · On Tuesday 11 August 2020 08:37:46 Stefan Roese wrote:
Hi Tom,
Hi Pali,(added Pali because of the Nokia RX51 issue)
Could you please send me a link to "problematic" patch? As you have not inlined it in this email.
Quoted 36 lines · Tom Rini
Quoted 21 lines · Stefan Roese
Quoted 12 lines
Since commit
86cf1c82850f("configs: MigrateCONFIG_NR_DRAM_BANKS") & commit999a772d9f24("Kconfig: MigrateCONFIG_NR_DRAM_BANKS"),CONFIG_NR_DRAM_BANKSis always defined with a value (4 is default). It makes no sense to still carry code that is guarded with "#ifndefCONFIG_NR_DRAM_BANKS" (and similar). This patch removes all these unreferenced code paths.Also complete remove
bi_memstart&bi_memsizefrom the board-info struct. As now bi_dram[] is always enabled and should be used instead. This removes the redundant varriables.Quoted 7 lines
Signed-off-by Stefan Roese <[email protected]>Cc Daniel Schwierzeck <[email protected]>Cc Tom Rini <[email protected]>Cc Ramon Fried <[email protected]>Cc Simon Glass <[email protected]>Cc Michal Simek <[email protected]>Reviewed-by Daniel Schwierzeck <[email protected]>Quoted 4 lines
I don't see quite how, but this is breaking running
test/nokia_rx51_test.sh(or, my fixup of this to apply to current master was wrong, and is what's breaking the test). Please rebase and confirm that test passes as well, thanks!I've checked the issue with
nokia_rx51_test.shand could not find any issues in the patch. My assumption now is, that the very old Linux kernel (2.6.28) that is used in this Nokia test, still uses thebd_infostruct in Linux to pass the memory information (viabd_memstart&bi_memsize), as was also done in the very old PowerPC days. With this patch now and the removal of these fields frombd_info, this might explain why this kernel does not boot any more (no output on the serial console at all).
Quoted 3 lines
Pali, could you please check if my assumption is correct here? And if yes, could please switch the test to using a newer kernel version? Or remove the Linux kernel booting from the test?
Yes, Nokia N900 uses "old" ATAGs. But we cannot remove it. New kernel version does not contain Maemo patches which are required for Maemo system which is still widely used. And yes, people are using it with U-Boot.
Second reason why we cannot remove support for ATAGs is that Nokia's signed first stage bootloader pass other setup data via ATAGs for kernel and U-Boot N900 board code parses it, reuse it and pass to kernel.
And replacing first stage bootloader is not possible because it is signed and signing keys are secret (now probably lost).
Quoted 15 lines
I've pushed the latest patch version into this branch (based on top of the latest TOT):
The failing Azure CI report can be found here:
https://dev.azure.com/sr0718/u-boot/_build/results?buildId=20&view=results
A working Azure report is here for comparison:
https://dev.azure.com/sr0718/u-boot/_build/results?buildId=18&view=results
Thanks,
Stefan
PATCH v2 1/1 CONFIG_NR_DRAM_BANKS: Remove unreferenced code as its always defined
Hi Pali,
Quoted 10 lines · Pali Roh?r
Hello!
Quoted 4 lines · On Tuesday 11 August 2020 08:37:46 Stefan Roese wrote:
Hi Tom,
Hi Pali,(added Pali because of the Nokia RX51 issue)
Could you please send me a link to "problematic" patch? As you have not inlined it in this email.
Its a rebase of the original patch.
Quoted 45 lines
Quoted 36 lines · Tom Rini
Quoted 21 lines · Stefan Roese
Quoted 12 lines
Since commit
86cf1c82850f("configs: MigrateCONFIG_NR_DRAM_BANKS") & commit999a772d9f24("Kconfig: MigrateCONFIG_NR_DRAM_BANKS"),CONFIG_NR_DRAM_BANKSis always defined with a value (4 is default). It makes no sense to still carry code that is guarded with "#ifndefCONFIG_NR_DRAM_BANKS" (and similar). This patch removes all these unreferenced code paths.Also complete remove
bi_memstart&bi_memsizefrom the board-info struct. As now bi_dram[] is always enabled and should be used instead. This removes the redundant varriables.Quoted 7 lines
Signed-off-by Stefan Roese <[email protected]>Cc Daniel Schwierzeck <[email protected]>Cc Tom Rini <[email protected]>Cc Ramon Fried <[email protected]>Cc Simon Glass <[email protected]>Cc Michal Simek <[email protected]>Reviewed-by Daniel Schwierzeck <[email protected]>Quoted 4 lines
I don't see quite how, but this is breaking running
test/nokia_rx51_test.sh(or, my fixup of this to apply to current master was wrong, and is what's breaking the test). Please rebase and confirm that test passes as well, thanks!I've checked the issue with
nokia_rx51_test.shand could not find any issues in the patch. My assumption now is, that the very old Linux kernel (2.6.28) that is used in this Nokia test, still uses thebd_infostruct in Linux to pass the memory information (viabd_memstart&bi_memsize), as was also done in the very old PowerPC days. With this patch now and the removal of these fields frombd_info, this might explain why this kernel does not boot any more (no output on the serial console at all).Quoted 3 lines
Pali, could you please check if my assumption is correct here? And if yes, could please switch the test to using a newer kernel version? Or remove the Linux kernel booting from the test?
Yes, Nokia N900 uses "old" ATAGs. But we cannot remove it. New kernel version does not contain Maemo patches which are required for Maemo system which is still widely used. And yes, people are using it with U-Boot.
Quoted 6 lines
Second reason why we cannot remove support for ATAGs is that Nokia's signed first stage bootloader pass other setup data via ATAGs for kernel and U-Boot N900 board code parses it, reuse it and pass to kernel.
And replacing first stage bootloader is not possible because it is signed and signing keys are secret (now probably lost).
Okay. But this patch is not removing ATAG support, but removes 2 member from the bd_info struct (bi_memstart & bi_memsize), which are replaced (superseeded) by the bi_dram[].start/.size values. And AFAICT, the generation of the memory ATAG is already done based on these values:
setup_memory_tags() in arch/arm/lib/bootm.c
So I still fail to understand, why booting of this old kernel using ATAGs does not work with this patch applied. Perhaps you could give it a quick test? That would be really helpful. Here again the gitlab branch that you can use for some tests:
Thanks,
Stefan
PATCH v2 1/1 CONFIG_NR_DRAM_BANKS: Remove unreferenced code as its always defined
Quoted 76 lines · Stefan Roese
Hi Pali,
Quoted 10 lines · Pali Roh?r
Hello!
Quoted 4 lines · On Tuesday 11 August 2020 08:37:46 Stefan Roese wrote:
Hi Tom,
Hi Pali,(added Pali because of the Nokia RX51 issue)
Could you please send me a link to "problematic" patch? As you have not inlined it in this email.
Its a rebase of the original patch.
Quoted 45 lines
Quoted 36 lines · Tom Rini
Quoted 21 lines · Stefan Roese
Quoted 12 lines
Since commit
86cf1c82850f("configs: MigrateCONFIG_NR_DRAM_BANKS") & commit999a772d9f24("Kconfig: MigrateCONFIG_NR_DRAM_BANKS"),CONFIG_NR_DRAM_BANKSis always defined with a value (4 is default). It makes no sense to still carry code that is guarded with "#ifndefCONFIG_NR_DRAM_BANKS" (and similar). This patch removes all these unreferenced code paths.Also complete remove
bi_memstart&bi_memsizefrom the board-info struct. As now bi_dram[] is always enabled and should be used instead. This removes the redundant varriables.Quoted 7 lines
Signed-off-by Stefan Roese <[email protected]>Cc Daniel Schwierzeck <[email protected]>Cc Tom Rini <[email protected]>Cc Ramon Fried <[email protected]>Cc Simon Glass <[email protected]>Cc Michal Simek <[email protected]>Reviewed-by Daniel Schwierzeck <[email protected]>Quoted 4 lines
I don't see quite how, but this is breaking running
test/nokia_rx51_test.sh(or, my fixup of this to apply to current master was wrong, and is what's breaking the test). Please rebase and confirm that test passes as well, thanks!I've checked the issue with
nokia_rx51_test.shand could not find any issues in the patch. My assumption now is, that the very old Linux kernel (2.6.28) that is used in this Nokia test, still uses thebd_infostruct in Linux to pass the memory information (viabd_memstart&bi_memsize), as was also done in the very old PowerPC days. With this patch now and the removal of these fields frombd_info, this might explain why this kernel does not boot any more (no output on the serial console at all).Quoted 3 lines
Pali, could you please check if my assumption is correct here? And if yes, could please switch the test to using a newer kernel version? Or remove the Linux kernel booting from the test?
Yes, Nokia N900 uses "old" ATAGs. But we cannot remove it. New kernel version does not contain Maemo patches which are required for Maemo system which is still widely used. And yes, people are using it with U-Boot.
Quoted 6 lines
Second reason why we cannot remove support for ATAGs is that Nokia's signed first stage bootloader pass other setup data via ATAGs for kernel and U-Boot N900 board code parses it, reuse it and pass to kernel.
And replacing first stage bootloader is not possible because it is signed and signing keys are secret (now probably lost).
Okay. But this patch is not removing ATAG support, but removes 2 member from the
bd_infostruct (bi_memstart&bi_memsize), which are replaced (superseeded) by the bi_dram[].start/.size values. And AFAICT, the generation of the memory ATAG is already done based on these values:
Quoted 8 lines
setup_memory_tags()inarch/arm/lib/bootm.cSo I still fail to understand, why booting of this old kernel using ATAGs does not work with this patch applied. Perhaps you could give it a quick test? That would be really helpful. Here again the gitlab branch that you can use for some tests:
So, I also thought maybe changing bd_t was it, and reverted just that part locally, and it was still breaking. It's also only breaking in one of the three boot tests, if I follow things correctly.
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200811/d50b9cd0/attachment.sig>
PATCH v2 1/1 CONFIG_NR_DRAM_BANKS: Remove unreferenced code as its always defined
Quoted 77 lines · On Tuesday 11 August 2020 09:08:33 Tom Rini wrote:
Quoted 76 lines · Stefan Roese
Hi Pali,
Quoted 10 lines · Pali Roh?r
Hello!
Quoted 4 lines · On Tuesday 11 August 2020 08:37:46 Stefan Roese wrote:
Hi Tom,
Hi Pali,(added Pali because of the Nokia RX51 issue)
Could you please send me a link to "problematic" patch? As you have not inlined it in this email.
Its a rebase of the original patch.
Quoted 45 lines
Quoted 36 lines · Tom Rini
Quoted 21 lines · Stefan Roese
Quoted 12 lines
Since commit
86cf1c82850f("configs: MigrateCONFIG_NR_DRAM_BANKS") & commit999a772d9f24("Kconfig: MigrateCONFIG_NR_DRAM_BANKS"),CONFIG_NR_DRAM_BANKSis always defined with a value (4 is default). It makes no sense to still carry code that is guarded with "#ifndefCONFIG_NR_DRAM_BANKS" (and similar). This patch removes all these unreferenced code paths.Also complete remove
bi_memstart&bi_memsizefrom the board-info struct. As now bi_dram[] is always enabled and should be used instead. This removes the redundant varriables.Quoted 7 lines
Signed-off-by Stefan Roese <[email protected]>Cc Daniel Schwierzeck <[email protected]>Cc Tom Rini <[email protected]>Cc Ramon Fried <[email protected]>Cc Simon Glass <[email protected]>Cc Michal Simek <[email protected]>Reviewed-by Daniel Schwierzeck <[email protected]>Quoted 4 lines
I don't see quite how, but this is breaking running
test/nokia_rx51_test.sh(or, my fixup of this to apply to current master was wrong, and is what's breaking the test). Please rebase and confirm that test passes as well, thanks!I've checked the issue with
nokia_rx51_test.shand could not find any issues in the patch. My assumption now is, that the very old Linux kernel (2.6.28) that is used in this Nokia test, still uses thebd_infostruct in Linux to pass the memory information (viabd_memstart&bi_memsize), as was also done in the very old PowerPC days. With this patch now and the removal of these fields frombd_info, this might explain why this kernel does not boot any more (no output on the serial console at all).Quoted 3 lines
Pali, could you please check if my assumption is correct here? And if yes, could please switch the test to using a newer kernel version? Or remove the Linux kernel booting from the test?
Yes, Nokia N900 uses "old" ATAGs. But we cannot remove it. New kernel version does not contain Maemo patches which are required for Maemo system which is still widely used. And yes, people are using it with U-Boot.
Quoted 6 lines
Second reason why we cannot remove support for ATAGs is that Nokia's signed first stage bootloader pass other setup data via ATAGs for kernel and U-Boot N900 board code parses it, reuse it and pass to kernel.
And replacing first stage bootloader is not possible because it is signed and signing keys are secret (now probably lost).
Okay. But this patch is not removing ATAG support, but removes 2 member from the
bd_infostruct (bi_memstart&bi_memsize), which are replaced (superseeded) by the bi_dram[].start/.size values. And AFAICT, the generation of the memory ATAG is already done based on these values:
Quoted 8 lines
Quoted 8 lines
setup_memory_tags()inarch/arm/lib/bootm.cSo I still fail to understand, why booting of this old kernel using ATAGs does not work with this patch applied. Perhaps you could give it a quick test? That would be really helpful. Here again the gitlab branch that you can use for some tests:
I can do some tests on real N900 device at the end of week. But I doubt that I could debug something on device if kernel does not print any message.
Running u-boot and kernel in N900 emulator with debug serial console is easier and you can do it too locally. If you look at that test script test/nokia_rx51_test.sh you could see that it downloads & compile qemu and prepare OneNAND MTD image with compiled u-boot + kernel binary.
You can also run that test script locally, it does not require root and all data it stores into temporary "nokia_rx51_tmp" directory. This could help you to test your changes without need to push them to travis/gitlab ci testing.
Quoted 3 lines
So, I also thought maybe changing
bd_twas it, and reverted just that part locally, and it was still breaking. It's also only breaking in one of the three boot tests, if I follow things correctly.
What about trying to *not* remove first two members of struct bd_info? Maybe it is part of ABI structure?
https://gitlab.denx.de/u-boot/custodians/u-boot-marvell/-/commit/7196447f2e708a83c653f39c97f2439960482ad6#688c66555c917f123c1d054aabd1c7023c6c4522_31_30
PATCH v2 1/1 CONFIG_NR_DRAM_BANKS: Remove unreferenced code as its always defined
Quoted 101 lines · Pali Roh?r
Quoted 77 lines · On Tuesday 11 August 2020 09:08:33 Tom Rini wrote:
Quoted 76 lines · Stefan Roese
Hi Pali,
Quoted 10 lines · Pali Roh?r
Hello!
Quoted 4 lines · On Tuesday 11 August 2020 08:37:46 Stefan Roese wrote:
Hi Tom,
Hi Pali,(added Pali because of the Nokia RX51 issue)
Could you please send me a link to "problematic" patch? As you have not inlined it in this email.
Its a rebase of the original patch.
Quoted 45 lines
Quoted 36 lines · Tom Rini
Quoted 21 lines · Stefan Roese
Quoted 12 lines
Since commit
86cf1c82850f("configs: MigrateCONFIG_NR_DRAM_BANKS") & commit999a772d9f24("Kconfig: MigrateCONFIG_NR_DRAM_BANKS"),CONFIG_NR_DRAM_BANKSis always defined with a value (4 is default). It makes no sense to still carry code that is guarded with "#ifndefCONFIG_NR_DRAM_BANKS" (and similar). This patch removes all these unreferenced code paths.Also complete remove
bi_memstart&bi_memsizefrom the board-info struct. As now bi_dram[] is always enabled and should be used instead. This removes the redundant varriables.Quoted 7 lines
Signed-off-by Stefan Roese <[email protected]>Cc Daniel Schwierzeck <[email protected]>Cc Tom Rini <[email protected]>Cc Ramon Fried <[email protected]>Cc Simon Glass <[email protected]>Cc Michal Simek <[email protected]>Reviewed-by Daniel Schwierzeck <[email protected]>Quoted 4 lines
I don't see quite how, but this is breaking running
test/nokia_rx51_test.sh(or, my fixup of this to apply to current master was wrong, and is what's breaking the test). Please rebase and confirm that test passes as well, thanks!I've checked the issue with
nokia_rx51_test.shand could not find any issues in the patch. My assumption now is, that the very old Linux kernel (2.6.28) that is used in this Nokia test, still uses thebd_infostruct in Linux to pass the memory information (viabd_memstart&bi_memsize), as was also done in the very old PowerPC days. With this patch now and the removal of these fields frombd_info, this might explain why this kernel does not boot any more (no output on the serial console at all).Quoted 3 lines
Pali, could you please check if my assumption is correct here? And if yes, could please switch the test to using a newer kernel version? Or remove the Linux kernel booting from the test?
Yes, Nokia N900 uses "old" ATAGs. But we cannot remove it. New kernel version does not contain Maemo patches which are required for Maemo system which is still widely used. And yes, people are using it with U-Boot.
Quoted 6 lines
Second reason why we cannot remove support for ATAGs is that Nokia's signed first stage bootloader pass other setup data via ATAGs for kernel and U-Boot N900 board code parses it, reuse it and pass to kernel.
And replacing first stage bootloader is not possible because it is signed and signing keys are secret (now probably lost).
Okay. But this patch is not removing ATAG support, but removes 2 member from the
bd_infostruct (bi_memstart&bi_memsize), which are replaced (superseeded) by the bi_dram[].start/.size values. And AFAICT, the generation of the memory ATAG is already done based on these values:Quoted 8 lines
Quoted 8 lines
setup_memory_tags()inarch/arm/lib/bootm.cSo I still fail to understand, why booting of this old kernel using ATAGs does not work with this patch applied. Perhaps you could give it a quick test? That would be really helpful. Here again the gitlab branch that you can use for some tests:
I can do some tests on real N900 device at the end of week. But I doubt that I could debug something on device if kernel does not print any message.
Running u-boot and kernel in N900 emulator with debug serial console is easier and you can do it too locally. If you look at that test script
test/nokia_rx51_test.shyou could see that it downloads & compile qemu and prepare OneNAND MTD image with compiled u-boot + kernel binary.You can also run that test script locally, it does not require root and all data it stores into temporary "
nokia_rx51_tmp" directory. This could help you to test your changes without need to push them to travis/gitlab ci testing.
Quoted 7 lines
Quoted 3 lines
So, I also thought maybe changing
bd_twas it, and reverted just that part locally, and it was still breaking. It's also only breaking in one of the three boot tests, if I follow things correctly.What about trying to *not* remove first two members of struct
bd_info? Maybe it is part of ABI structure?
https://gitlab.denx.de/u-boot/custodians/u-boot-marvell/-/commit/7196447f2e708a83c653f39c97f2439960482ad6#688c66555c917f123c1d054aabd1c7023c6c4522_31_30
Not changing the structure is what I tried and it still failed, unless I made a thinko when I was checking it out. Can you please look in to this a bit?
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200811/4a75f30e/attachment.sig>
PATCH v2 1/1 CONFIG_NR_DRAM_BANKS: Remove unreferenced code as its always defined
Am Dienstag, den 11.08.2020, 10:58 -0400 schrieb Tom Rini:
Quoted 106 lines · Pali Roh?r
Quoted 105 lines · On Tuesday 11 August 2020 09:08:33 Tom Rini wrote:
Quoted 77 lines · Stefan Roese
Quoted 76 lines
Hi Pali,
Quoted 10 lines · Pali Roh?r
Hello!
Quoted 4 lines · On Tuesday 11 August 2020 08:37:46 Stefan Roese wrote:
Hi Tom,
Hi Pali,(added Pali because of the Nokia RX51 issue)
Could you please send me a link to "problematic" patch? As you have not inlined it in this email.
Its a rebase of the original patch.
Quoted 45 lines
Quoted 36 lines · Tom Rini
Quoted 21 lines · Stefan Roese
Quoted 12 lines
Since commit
86cf1c82850f("configs: MigrateCONFIG_NR_DRAM_BANKS") & commit999a772d9f24("Kconfig: MigrateCONFIG_NR_DRAM_BANKS"),CONFIG_NR_DRAM_BANKSis always defined with a value (4 is default). It makes no sense to still carry code that is guarded with "#ifndefCONFIG_NR_DRAM_BANKS" (and similar). This patch removes all these unreferenced code paths.Also complete remove
bi_memstart&bi_memsizefrom the board-info struct. As now bi_dram[] is always enabled and should be used instead. This removes the redundant varriables.Quoted 7 lines
Signed-off-by Stefan Roese <[email protected]>Cc Daniel Schwierzeck <[email protected]>Cc Tom Rini <[email protected]>Cc Ramon Fried <[email protected]>Cc Simon Glass <[email protected]>Cc Michal Simek <[email protected]>Reviewed-by Daniel Schwierzeck <[email protected]>Quoted 4 lines
I don't see quite how, but this is breaking running
test/nokia_rx51_test.sh(or, my fixup of this to apply to current master was wrong, and is what's breaking the test). Please rebase and confirm that test passes as well, thanks!I've checked the issue with
nokia_rx51_test.shand could not find any issues in the patch. My assumption now is, that the very old Linux kernel (2.6.28) that is used in this Nokia test, still uses thebd_infostruct in Linux to pass the memory information (viabd_memstart&bi_memsize), as was also done in the very old PowerPC days. With this patch now and the removal of these fields frombd_info, this might explain why this kernel does not boot any more (no output on the serial console at all).Quoted 3 lines
Pali, could you please check if my assumption is correct here? And if yes, could please switch the test to using a newer kernel version? Or remove the Linux kernel booting from the test?
Yes, Nokia N900 uses "old" ATAGs. But we cannot remove it. New kernel version does not contain Maemo patches which are required for Maemo system which is still widely used. And yes, people are using it with U-Boot.
Quoted 6 lines
Second reason why we cannot remove support for ATAGs is that Nokia's signed first stage bootloader pass other setup data via ATAGs for kernel and U-Boot N900 board code parses it, reuse it and pass to kernel.
And replacing first stage bootloader is not possible because it is signed and signing keys are secret (now probably lost).
Okay. But this patch is not removing ATAG support, but removes 2 member from the
bd_infostruct (bi_memstart&bi_memsize), which are replaced (superseeded) by the bi_dram[].start/.size values. And AFAICT, the generation of the memory ATAG is already done based on these values:Quoted 8 lines
Quoted 8 lines
setup_memory_tags()inarch/arm/lib/bootm.cSo I still fail to understand, why booting of this old kernel using ATAGs does not work with this patch applied. Perhaps you could give it a quick test? That would be really helpful. Here again the gitlab branch that you can use for some tests:
I can do some tests on real N900 device at the end of week. But I doubt that I could debug something on device if kernel does not print any message.
Running u-boot and kernel in N900 emulator with debug serial console is easier and you can do it too locally. If you look at that test script
test/nokia_rx51_test.shyou could see that it downloads & compile qemu and prepare OneNAND MTD image with compiled u-boot + kernel binary.You can also run that test script locally, it does not require root and all data it stores into temporary "
nokia_rx51_tmp" directory. This could help you to test your changes without need to push them to travis/gitlab ci testing.Quoted 3 lines
So, I also thought maybe changing
bd_twas it, and reverted just that part locally, and it was still breaking. It's also only breaking in one of the three boot tests, if I follow things correctly.
Quoted 8 lines
Quoted 3 lines
What about trying to *not* remove first two members of struct
bd_info? Maybe it is part of ABI structure?
https://gitlab.denx.de/u-boot/custodians/u-boot-marvell/-/commit/7196447f2e708a83c653f39c97f2439960482ad6#688c66555c917f123c1d054aabd1c7023c6c4522_31_30Not changing the structure is what I tried and it still failed, unless I made a thinko when I was checking it out. Can you please look in to this a bit?
if I understand this correctly, the Maemo support in Linux parses bd_info but do not use bi_memstart and bi_memsize but other member variables. If we remove bi_memstart and bi_memsize, the offsets of all other member variables are changing and therefore the "ABI" to Linux breaks.
If so, we can remove all usages of bi_memstart and bi_memsize like Stefan did, but not the variables themselves. Maybe we should just update the inline documentation for bi_memstart and bi_memsize to state that them should not be used anymore and that offsets in bd_info must not be changed (e.g. by removing variables or by changing variable types to different sizes) to maintain ABI compatibility?
Signature · 1 line
- Daniel
PATCH v2 1/1 CONFIG_NR_DRAM_BANKS: Remove unreferenced code as its always defined
Hi Daniel,
Quoted 123 lines · Daniel Schwierzeck
Am Dienstag, den 11.08.2020, 10:58 -0400 schrieb Tom Rini:
Quoted 106 lines · Pali Roh?r
Quoted 105 lines · On Tuesday 11 August 2020 09:08:33 Tom Rini wrote:
Quoted 77 lines · Stefan Roese
Quoted 76 lines
Hi Pali,
Quoted 10 lines · Pali Roh?r
Hello!
Quoted 4 lines · On Tuesday 11 August 2020 08:37:46 Stefan Roese wrote:
Hi Tom,
Hi Pali,(added Pali because of the Nokia RX51 issue)
Could you please send me a link to "problematic" patch? As you have not inlined it in this email.
Its a rebase of the original patch.
Quoted 45 lines
Quoted 36 lines · Tom Rini
Quoted 21 lines · Stefan Roese
Quoted 12 lines
Since commit
86cf1c82850f("configs: MigrateCONFIG_NR_DRAM_BANKS") & commit999a772d9f24("Kconfig: MigrateCONFIG_NR_DRAM_BANKS"),CONFIG_NR_DRAM_BANKSis always defined with a value (4 is default). It makes no sense to still carry code that is guarded with "#ifndefCONFIG_NR_DRAM_BANKS" (and similar). This patch removes all these unreferenced code paths.Also complete remove
bi_memstart&bi_memsizefrom the board-info struct. As now bi_dram[] is always enabled and should be used instead. This removes the redundant varriables.Quoted 7 lines
Signed-off-by Stefan Roese <[email protected]>Cc Daniel Schwierzeck <[email protected]>Cc Tom Rini <[email protected]>Cc Ramon Fried <[email protected]>Cc Simon Glass <[email protected]>Cc Michal Simek <[email protected]>Reviewed-by Daniel Schwierzeck <[email protected]>Quoted 4 lines
I don't see quite how, but this is breaking running
test/nokia_rx51_test.sh(or, my fixup of this to apply to current master was wrong, and is what's breaking the test). Please rebase and confirm that test passes as well, thanks!I've checked the issue with
nokia_rx51_test.shand could not find any issues in the patch. My assumption now is, that the very old Linux kernel (2.6.28) that is used in this Nokia test, still uses thebd_infostruct in Linux to pass the memory information (viabd_memstart&bi_memsize), as was also done in the very old PowerPC days. With this patch now and the removal of these fields frombd_info, this might explain why this kernel does not boot any more (no output on the serial console at all).Quoted 3 lines
Pali, could you please check if my assumption is correct here? And if yes, could please switch the test to using a newer kernel version? Or remove the Linux kernel booting from the test?
Yes, Nokia N900 uses "old" ATAGs. But we cannot remove it. New kernel version does not contain Maemo patches which are required for Maemo system which is still widely used. And yes, people are using it with U-Boot.
Quoted 6 lines
Second reason why we cannot remove support for ATAGs is that Nokia's signed first stage bootloader pass other setup data via ATAGs for kernel and U-Boot N900 board code parses it, reuse it and pass to kernel.
And replacing first stage bootloader is not possible because it is signed and signing keys are secret (now probably lost).
Okay. But this patch is not removing ATAG support, but removes 2 member from the
bd_infostruct (bi_memstart&bi_memsize), which are replaced (superseeded) by the bi_dram[].start/.size values. And AFAICT, the generation of the memory ATAG is already done based on these values:Quoted 8 lines
Quoted 8 lines
setup_memory_tags()inarch/arm/lib/bootm.cSo I still fail to understand, why booting of this old kernel using ATAGs does not work with this patch applied. Perhaps you could give it a quick test? That would be really helpful. Here again the gitlab branch that you can use for some tests:
I can do some tests on real N900 device at the end of week. But I doubt that I could debug something on device if kernel does not print any message.
Running u-boot and kernel in N900 emulator with debug serial console is easier and you can do it too locally. If you look at that test script
test/nokia_rx51_test.shyou could see that it downloads & compile qemu and prepare OneNAND MTD image with compiled u-boot + kernel binary.You can also run that test script locally, it does not require root and all data it stores into temporary "
nokia_rx51_tmp" directory. This could help you to test your changes without need to push them to travis/gitlab ci testing.Quoted 3 lines
So, I also thought maybe changing
bd_twas it, and reverted just that part locally, and it was still breaking. It's also only breaking in one of the three boot tests, if I follow things correctly.Quoted 8 lines
Quoted 3 lines
What about trying to *not* remove first two members of struct
bd_info? Maybe it is part of ABI structure?
https://gitlab.denx.de/u-boot/custodians/u-boot-marvell/-/commit/7196447f2e708a83c653f39c97f2439960482ad6#688c66555c917f123c1d054aabd1c7023c6c4522_31_30Not changing the structure is what I tried and it still failed, unless I made a thinko when I was checking it out. Can you please look in to this a bit?
if I understand this correctly, the Maemo support in Linux parses
bd_infobut do not usebi_memstartandbi_memsizebut other member variables. If we removebi_memstartandbi_memsize, the offsets of all other member variables are changing and therefore the "ABI" to Linux breaks.
Quoted 6 lines
If so, we can remove all usages of
bi_memstartandbi_memsizelike Stefan did, but not the variables themselves. Maybe we should just update the inline documentation forbi_memstartandbi_memsizeto state that them should not be used anymore and that offsets inbd_infomust not be changed (e.g. by removing variables or by changing variable types to different sizes) to maintain ABI compatibility?
I don't think we should keep bd_info around long term, let alone fix its format. We use devicetree now.
If we want to support such old kernels on this one board, how about adding a Kconfig and a special header which has the file in the format that this one board needs? That way it shouldn't break in future, but we are not prevented from making future changes.
BTW it is great that we have a test for this board and were able to catch this quickly. I hope we will have more such tests!
Regards,
Simon
PATCH v2 1/1 CONFIG_NR_DRAM_BANKS: Remove unreferenced code as its always defined
Quoted 134 lines · On Tuesday 11 August 2020 10:22:44 Simon Glass wrote:
Hi Daniel,
Quoted 123 lines · Daniel Schwierzeck
Am Dienstag, den 11.08.2020, 10:58 -0400 schrieb Tom Rini:
Quoted 106 lines · Pali Roh?r
Quoted 105 lines · On Tuesday 11 August 2020 09:08:33 Tom Rini wrote:
Quoted 77 lines · Stefan Roese
Quoted 76 lines
Hi Pali,
Quoted 10 lines · Pali Roh?r
Hello!
Quoted 4 lines · On Tuesday 11 August 2020 08:37:46 Stefan Roese wrote:
Hi Tom,
Hi Pali,(added Pali because of the Nokia RX51 issue)
Could you please send me a link to "problematic" patch? As you have not inlined it in this email.
Its a rebase of the original patch.
Quoted 45 lines
Quoted 36 lines · Tom Rini
Quoted 21 lines · Stefan Roese
Quoted 12 lines
Since commit
86cf1c82850f("configs: MigrateCONFIG_NR_DRAM_BANKS") & commit999a772d9f24("Kconfig: MigrateCONFIG_NR_DRAM_BANKS"),CONFIG_NR_DRAM_BANKSis always defined with a value (4 is default). It makes no sense to still carry code that is guarded with "#ifndefCONFIG_NR_DRAM_BANKS" (and similar). This patch removes all these unreferenced code paths.Also complete remove
bi_memstart&bi_memsizefrom the board-info struct. As now bi_dram[] is always enabled and should be used instead. This removes the redundant varriables.Quoted 7 lines
Signed-off-by Stefan Roese <[email protected]>Cc Daniel Schwierzeck <[email protected]>Cc Tom Rini <[email protected]>Cc Ramon Fried <[email protected]>Cc Simon Glass <[email protected]>Cc Michal Simek <[email protected]>Reviewed-by Daniel Schwierzeck <[email protected]>Quoted 4 lines
I don't see quite how, but this is breaking running
test/nokia_rx51_test.sh(or, my fixup of this to apply to current master was wrong, and is what's breaking the test). Please rebase and confirm that test passes as well, thanks!I've checked the issue with
nokia_rx51_test.shand could not find any issues in the patch. My assumption now is, that the very old Linux kernel (2.6.28) that is used in this Nokia test, still uses thebd_infostruct in Linux to pass the memory information (viabd_memstart&bi_memsize), as was also done in the very old PowerPC days. With this patch now and the removal of these fields frombd_info, this might explain why this kernel does not boot any more (no output on the serial console at all).Quoted 3 lines
Pali, could you please check if my assumption is correct here? And if yes, could please switch the test to using a newer kernel version? Or remove the Linux kernel booting from the test?
Yes, Nokia N900 uses "old" ATAGs. But we cannot remove it. New kernel version does not contain Maemo patches which are required for Maemo system which is still widely used. And yes, people are using it with U-Boot.
Quoted 6 lines
Second reason why we cannot remove support for ATAGs is that Nokia's signed first stage bootloader pass other setup data via ATAGs for kernel and U-Boot N900 board code parses it, reuse it and pass to kernel.
And replacing first stage bootloader is not possible because it is signed and signing keys are secret (now probably lost).
Okay. But this patch is not removing ATAG support, but removes 2 member from the
bd_infostruct (bi_memstart&bi_memsize), which are replaced (superseeded) by the bi_dram[].start/.size values. And AFAICT, the generation of the memory ATAG is already done based on these values:Quoted 8 lines
Quoted 8 lines
setup_memory_tags()inarch/arm/lib/bootm.cSo I still fail to understand, why booting of this old kernel using ATAGs does not work with this patch applied. Perhaps you could give it a quick test? That would be really helpful. Here again the gitlab branch that you can use for some tests:
I can do some tests on real N900 device at the end of week. But I doubt that I could debug something on device if kernel does not print any message.
Running u-boot and kernel in N900 emulator with debug serial console is easier and you can do it too locally. If you look at that test script
test/nokia_rx51_test.shyou could see that it downloads & compile qemu and prepare OneNAND MTD image with compiled u-boot + kernel binary.You can also run that test script locally, it does not require root and all data it stores into temporary "
nokia_rx51_tmp" directory. This could help you to test your changes without need to push them to travis/gitlab ci testing.Quoted 3 lines
So, I also thought maybe changing
bd_twas it, and reverted just that part locally, and it was still breaking. It's also only breaking in one of the three boot tests, if I follow things correctly.Quoted 8 lines
Quoted 3 lines
What about trying to *not* remove first two members of struct
bd_info? Maybe it is part of ABI structure?
https://gitlab.denx.de/u-boot/custodians/u-boot-marvell/-/commit/7196447f2e708a83c653f39c97f2439960482ad6#688c66555c917f123c1d054aabd1c7023c6c4522_31_30Not changing the structure is what I tried and it still failed, unless I made a thinko when I was checking it out. Can you please look in to this a bit?
if I understand this correctly, the Maemo support in Linux parses
bd_infobut do not usebi_memstartandbi_memsizebut other member variables. If we removebi_memstartandbi_memsize, the offsets of all other member variables are changing and therefore the "ABI" to Linux breaks.Quoted 6 lines
If so, we can remove all usages of
bi_memstartandbi_memsizelike Stefan did, but not the variables themselves. Maybe we should just update the inline documentation forbi_memstartandbi_memsizeto state that them should not be used anymore and that offsets inbd_infomust not be changed (e.g. by removing variables or by changing variable types to different sizes) to maintain ABI compatibility?
Quoted 7 lines
I don't think we should keep
bd_infoaround long term, let alone fix its format. We use devicetree now.If we want to support such old kernels on this one board, how about adding a
Kconfigand a special header which has the file in the format that this one board needs? That way it shouldn't break in future, but we are not prevented from making future changes.
ATAGs for N900 are really required. It is not only for kernel, but also for reading parameters from first stage bootloader which starts uboot.
Anyway, look at my reply. That patch is either incorrect or incomplete because when I added at one place #if 0 ... #endif Maemo kernel started booting, even after removing those members from struct bd_info.
Quoted 2 lines
BTW it is great that we have a test for this board and were able to catch this quickly. I hope we will have more such tests!
I'm happy that my test script is useful! N900 support in u-boot was broken more times and finding problematic commit took me time. My idea was that this could save (my) time in finding change which is breaking something.
From my past experience I know that only full-integration tests can catch problems which unit tests or "one command line" tests in most cases could not.
PATCH v2 1/1 CONFIG_NR_DRAM_BANKS: Remove unreferenced code as its always defined
Hi Pali,
Quoted 138 lines · Pali Roh?r
Quoted 137 lines · On Tuesday 11 August 2020 10:22:44 Simon Glass wrote:
Hi Daniel,
Quoted 123 lines · Daniel Schwierzeck
Am Dienstag, den 11.08.2020, 10:58 -0400 schrieb Tom Rini:
Quoted 106 lines · Pali Roh?r
Quoted 105 lines · On Tuesday 11 August 2020 09:08:33 Tom Rini wrote:
Quoted 77 lines · Stefan Roese
Quoted 76 lines
Hi Pali,
Quoted 10 lines · Pali Roh?r
Hello!
Quoted 4 lines · On Tuesday 11 August 2020 08:37:46 Stefan Roese wrote:
Hi Tom,
Hi Pali,(added Pali because of the Nokia RX51 issue)
Could you please send me a link to "problematic" patch? As you have not inlined it in this email.
Its a rebase of the original patch.
Quoted 45 lines
Quoted 36 lines · Tom Rini
Quoted 21 lines · Stefan Roese
Quoted 12 lines
Since commit
86cf1c82850f("configs: MigrateCONFIG_NR_DRAM_BANKS") & commit999a772d9f24("Kconfig: MigrateCONFIG_NR_DRAM_BANKS"),CONFIG_NR_DRAM_BANKSis always defined with a value (4 is default). It makes no sense to still carry code that is guarded with "#ifndefCONFIG_NR_DRAM_BANKS" (and similar). This patch removes all these unreferenced code paths.Also complete remove
bi_memstart&bi_memsizefrom the board-info struct. As now bi_dram[] is always enabled and should be used instead. This removes the redundant varriables.Quoted 7 lines
Signed-off-by Stefan Roese <[email protected]>Cc Daniel Schwierzeck <[email protected]>Cc Tom Rini <[email protected]>Cc Ramon Fried <[email protected]>Cc Simon Glass <[email protected]>Cc Michal Simek <[email protected]>Reviewed-by Daniel Schwierzeck <[email protected]>Quoted 4 lines
I don't see quite how, but this is breaking running
test/nokia_rx51_test.sh(or, my fixup of this to apply to current master was wrong, and is what's breaking the test). Please rebase and confirm that test passes as well, thanks!I've checked the issue with
nokia_rx51_test.shand could not find any issues in the patch. My assumption now is, that the very old Linux kernel (2.6.28) that is used in this Nokia test, still uses thebd_infostruct in Linux to pass the memory information (viabd_memstart&bi_memsize), as was also done in the very old PowerPC days. With this patch now and the removal of these fields frombd_info, this might explain why this kernel does not boot any more (no output on the serial console at all).Quoted 3 lines
Pali, could you please check if my assumption is correct here? And if yes, could please switch the test to using a newer kernel version? Or remove the Linux kernel booting from the test?
Yes, Nokia N900 uses "old" ATAGs. But we cannot remove it. New kernel version does not contain Maemo patches which are required for Maemo system which is still widely used. And yes, people are using it with U-Boot.
Quoted 6 lines
Second reason why we cannot remove support for ATAGs is that Nokia's signed first stage bootloader pass other setup data via ATAGs for kernel and U-Boot N900 board code parses it, reuse it and pass to kernel.
And replacing first stage bootloader is not possible because it is signed and signing keys are secret (now probably lost).
Okay. But this patch is not removing ATAG support, but removes 2 member from the
bd_infostruct (bi_memstart&bi_memsize), which are replaced (superseeded) by the bi_dram[].start/.size values. And AFAICT, the generation of the memory ATAG is already done based on these values:Quoted 8 lines
Quoted 8 lines
setup_memory_tags()inarch/arm/lib/bootm.cSo I still fail to understand, why booting of this old kernel using ATAGs does not work with this patch applied. Perhaps you could give it a quick test? That would be really helpful. Here again the gitlab branch that you can use for some tests:
I can do some tests on real N900 device at the end of week. But I doubt that I could debug something on device if kernel does not print any message.
Running u-boot and kernel in N900 emulator with debug serial console is easier and you can do it too locally. If you look at that test script
test/nokia_rx51_test.shyou could see that it downloads & compile qemu and prepare OneNAND MTD image with compiled u-boot + kernel binary.You can also run that test script locally, it does not require root and all data it stores into temporary "
nokia_rx51_tmp" directory. This could help you to test your changes without need to push them to travis/gitlab ci testing.Quoted 3 lines
So, I also thought maybe changing
bd_twas it, and reverted just that part locally, and it was still breaking. It's also only breaking in one of the three boot tests, if I follow things correctly.Quoted 8 lines
Quoted 3 lines
What about trying to *not* remove first two members of struct
bd_info? Maybe it is part of ABI structure?
https://gitlab.denx.de/u-boot/custodians/u-boot-marvell/-/commit/7196447f2e708a83c653f39c97f2439960482ad6#688c66555c917f123c1d054aabd1c7023c6c4522_31_30Not changing the structure is what I tried and it still failed, unless I made a thinko when I was checking it out. Can you please look in to this a bit?
if I understand this correctly, the Maemo support in Linux parses
bd_infobut do not usebi_memstartandbi_memsizebut other member variables. If we removebi_memstartandbi_memsize, the offsets of all other member variables are changing and therefore the "ABI" to Linux breaks.Quoted 6 lines
If so, we can remove all usages of
bi_memstartandbi_memsizelike Stefan did, but not the variables themselves. Maybe we should just update the inline documentation forbi_memstartandbi_memsizeto state that them should not be used anymore and that offsets inbd_infomust not be changed (e.g. by removing variables or by changing variable types to different sizes) to maintain ABI compatibility?I don't think we should keep
bd_infoaround long term, let alone fix its format. We use devicetree now.
Quoted 7 lines
Quoted 4 lines
If we want to support such old kernels on this one board, how about adding a
Kconfigand a special header which has the file in the format that this one board needs? That way it shouldn't break in future, but we are not prevented from making future changes.ATAGs for N900 are really required. It is not only for kernel, but also for reading parameters from first stage bootloader which starts uboot.
Just to make is clear: ATAGs are *not* removed with this patch. Its "just" a change to the bd_info struct.
Thanks,
Stefan
PATCH v2 1/1 CONFIG_NR_DRAM_BANKS: Remove unreferenced code as its always defined
In reply to Daniel SchwierzeckHi Daniel,
Quoted 116 lines · Daniel Schwierzeck
Am Dienstag, den 11.08.2020, 10:58 -0400 schrieb Tom Rini:
Quoted 106 lines · Pali Roh?r
Quoted 105 lines · On Tuesday 11 August 2020 09:08:33 Tom Rini wrote:
Quoted 77 lines · Stefan Roese
Quoted 76 lines
Hi Pali,
Quoted 10 lines · Pali Roh?r
Hello!
Quoted 4 lines · On Tuesday 11 August 2020 08:37:46 Stefan Roese wrote:
Hi Tom,
Hi Pali,(added Pali because of the Nokia RX51 issue)
Could you please send me a link to "problematic" patch? As you have not inlined it in this email.
Its a rebase of the original patch.
Quoted 45 lines
Quoted 36 lines · Tom Rini
Quoted 21 lines · Stefan Roese
Quoted 12 lines
Since commit
86cf1c82850f("configs: MigrateCONFIG_NR_DRAM_BANKS") & commit999a772d9f24("Kconfig: MigrateCONFIG_NR_DRAM_BANKS"),CONFIG_NR_DRAM_BANKSis always defined with a value (4 is default). It makes no sense to still carry code that is guarded with "#ifndefCONFIG_NR_DRAM_BANKS" (and similar). This patch removes all these unreferenced code paths.Also complete remove
bi_memstart&bi_memsizefrom the board-info struct. As now bi_dram[] is always enabled and should be used instead. This removes the redundant varriables.Quoted 7 lines
Signed-off-by Stefan Roese <[email protected]>Cc Daniel Schwierzeck <[email protected]>Cc Tom Rini <[email protected]>Cc Ramon Fried <[email protected]>Cc Simon Glass <[email protected]>Cc Michal Simek <[email protected]>Reviewed-by Daniel Schwierzeck <[email protected]>Quoted 4 lines
I don't see quite how, but this is breaking running
test/nokia_rx51_test.sh(or, my fixup of this to apply to current master was wrong, and is what's breaking the test). Please rebase and confirm that test passes as well, thanks!I've checked the issue with
nokia_rx51_test.shand could not find any issues in the patch. My assumption now is, that the very old Linux kernel (2.6.28) that is used in this Nokia test, still uses thebd_infostruct in Linux to pass the memory information (viabd_memstart&bi_memsize), as was also done in the very old PowerPC days. With this patch now and the removal of these fields frombd_info, this might explain why this kernel does not boot any more (no output on the serial console at all).Quoted 3 lines
Pali, could you please check if my assumption is correct here? And if yes, could please switch the test to using a newer kernel version? Or remove the Linux kernel booting from the test?
Yes, Nokia N900 uses "old" ATAGs. But we cannot remove it. New kernel version does not contain Maemo patches which are required for Maemo system which is still widely used. And yes, people are using it with U-Boot.
Quoted 6 lines
Second reason why we cannot remove support for ATAGs is that Nokia's signed first stage bootloader pass other setup data via ATAGs for kernel and U-Boot N900 board code parses it, reuse it and pass to kernel.
And replacing first stage bootloader is not possible because it is signed and signing keys are secret (now probably lost).
Okay. But this patch is not removing ATAG support, but removes 2 member from the
bd_infostruct (bi_memstart&bi_memsize), which are replaced (superseeded) by the bi_dram[].start/.size values. And AFAICT, the generation of the memory ATAG is already done based on these values:Quoted 8 lines
Quoted 8 lines
setup_memory_tags()inarch/arm/lib/bootm.cSo I still fail to understand, why booting of this old kernel using ATAGs does not work with this patch applied. Perhaps you could give it a quick test? That would be really helpful. Here again the gitlab branch that you can use for some tests:
I can do some tests on real N900 device at the end of week. But I doubt that I could debug something on device if kernel does not print any message.
Running u-boot and kernel in N900 emulator with debug serial console is easier and you can do it too locally. If you look at that test script
test/nokia_rx51_test.shyou could see that it downloads & compile qemu and prepare OneNAND MTD image with compiled u-boot + kernel binary.You can also run that test script locally, it does not require root and all data it stores into temporary "
nokia_rx51_tmp" directory. This could help you to test your changes without need to push them to travis/gitlab ci testing.Quoted 3 lines
So, I also thought maybe changing
bd_twas it, and reverted just that part locally, and it was still breaking. It's also only breaking in one of the three boot tests, if I follow things correctly.Quoted 8 lines
Quoted 3 lines
What about trying to *not* remove first two members of struct
bd_info? Maybe it is part of ABI structure?
https://gitlab.denx.de/u-boot/custodians/u-boot-marvell/-/commit/7196447f2e708a83c653f39c97f2439960482ad6#688c66555c917f123c1d054aabd1c7023c6c4522_31_30Not changing the structure is what I tried and it still failed, unless I made a thinko when I was checking it out. Can you please look in to this a bit?
Quoted 5 lines
if I understand this correctly, the Maemo support in Linux parses
bd_infobut do not usebi_memstartandbi_memsizebut other member variables. If we removebi_memstartandbi_memsize, the offsets of all other member variables are changing and therefore the "ABI" to Linux breaks.
IIRC, only old PowerPC Linux uses the bd_info struct to pass the infos from the bootloader to the kernel.
Quoted 6 lines
If so, we can remove all usages of
bi_memstartandbi_memsizelike Stefan did, but not the variables themselves. Maybe we should just update the inline documentation forbi_memstartandbi_memsizeto state that them should not be used anymore and that offsets inbd_infomust not be changed (e.g. by removing variables or by changing variable types to different sizes) to maintain ABI compatibility?
I've changed the patch according to the "fix" from Pali (will post later today). And with this change all tests pass. So we need to decide if we want to maintain ABI compatibility (at least with old PowerPC kernels) or make the cut here and move forward with the "cleanup". My personal feeling is that we should just move on and remove the variables from bd_info.
Thanks,
Stefan
PATCH v2 1/1 CONFIG_NR_DRAM_BANKS: Remove unreferenced code as its always defined
In reply to Tom RiniQuoted 106 lines · On Tuesday 11 August 2020 10:58:47 Tom Rini wrote:
Quoted 105 lines · Pali Roh?r
Quoted 77 lines · On Tuesday 11 August 2020 09:08:33 Tom Rini wrote:
Quoted 76 lines · Stefan Roese
Hi Pali,
Quoted 10 lines · Pali Roh?r
Hello!
Quoted 4 lines · On Tuesday 11 August 2020 08:37:46 Stefan Roese wrote:
Hi Tom,
Hi Pali,(added Pali because of the Nokia RX51 issue)
Could you please send me a link to "problematic" patch? As you have not inlined it in this email.
Its a rebase of the original patch.
Quoted 45 lines
Quoted 36 lines · Tom Rini
Quoted 21 lines · Stefan Roese
Quoted 12 lines
Since commit
86cf1c82850f("configs: MigrateCONFIG_NR_DRAM_BANKS") & commit999a772d9f24("Kconfig: MigrateCONFIG_NR_DRAM_BANKS"),CONFIG_NR_DRAM_BANKSis always defined with a value (4 is default). It makes no sense to still carry code that is guarded with "#ifndefCONFIG_NR_DRAM_BANKS" (and similar). This patch removes all these unreferenced code paths.Also complete remove
bi_memstart&bi_memsizefrom the board-info struct. As now bi_dram[] is always enabled and should be used instead. This removes the redundant varriables.Quoted 7 lines
Signed-off-by Stefan Roese <[email protected]>Cc Daniel Schwierzeck <[email protected]>Cc Tom Rini <[email protected]>Cc Ramon Fried <[email protected]>Cc Simon Glass <[email protected]>Cc Michal Simek <[email protected]>Reviewed-by Daniel Schwierzeck <[email protected]>Quoted 4 lines
I don't see quite how, but this is breaking running
test/nokia_rx51_test.sh(or, my fixup of this to apply to current master was wrong, and is what's breaking the test). Please rebase and confirm that test passes as well, thanks!I've checked the issue with
nokia_rx51_test.shand could not find any issues in the patch. My assumption now is, that the very old Linux kernel (2.6.28) that is used in this Nokia test, still uses thebd_infostruct in Linux to pass the memory information (viabd_memstart&bi_memsize), as was also done in the very old PowerPC days. With this patch now and the removal of these fields frombd_info, this might explain why this kernel does not boot any more (no output on the serial console at all).Quoted 3 lines
Pali, could you please check if my assumption is correct here? And if yes, could please switch the test to using a newer kernel version? Or remove the Linux kernel booting from the test?
Yes, Nokia N900 uses "old" ATAGs. But we cannot remove it. New kernel version does not contain Maemo patches which are required for Maemo system which is still widely used. And yes, people are using it with U-Boot.
Quoted 6 lines
Second reason why we cannot remove support for ATAGs is that Nokia's signed first stage bootloader pass other setup data via ATAGs for kernel and U-Boot N900 board code parses it, reuse it and pass to kernel.
And replacing first stage bootloader is not possible because it is signed and signing keys are secret (now probably lost).
Okay. But this patch is not removing ATAG support, but removes 2 member from the
bd_infostruct (bi_memstart&bi_memsize), which are replaced (superseeded) by the bi_dram[].start/.size values. And AFAICT, the generation of the memory ATAG is already done based on these values:Quoted 8 lines
Quoted 8 lines
setup_memory_tags()inarch/arm/lib/bootm.cSo I still fail to understand, why booting of this old kernel using ATAGs does not work with this patch applied. Perhaps you could give it a quick test? That would be really helpful. Here again the gitlab branch that you can use for some tests:
I can do some tests on real N900 device at the end of week. But I doubt that I could debug something on device if kernel does not print any message.
Running u-boot and kernel in N900 emulator with debug serial console is easier and you can do it too locally. If you look at that test script
test/nokia_rx51_test.shyou could see that it downloads & compile qemu and prepare OneNAND MTD image with compiled u-boot + kernel binary.You can also run that test script locally, it does not require root and all data it stores into temporary "
nokia_rx51_tmp" directory. This could help you to test your changes without need to push them to travis/gitlab ci testing.Quoted 3 lines
So, I also thought maybe changing
bd_twas it, and reverted just that part locally, and it was still breaking. It's also only breaking in one of the three boot tests, if I follow things correctly.
Quoted 7 lines
Quoted 3 lines
What about trying to *not* remove first two members of struct
bd_info? Maybe it is part of ABI structure?
https://gitlab.denx.de/u-boot/custodians/u-boot-marvell/-/commit/7196447f2e708a83c653f39c97f2439960482ad6#688c66555c917f123c1d054aabd1c7023c6c4522_31_30Not changing the structure is what I tried and it still failed, unless I made a thinko when I was checking it out. Can you please look in to this a bit?
Yes, I looked at that patch and seems it is really breaking something related to dram banks.
I applied following debug patch
common/board_f.c +10 -0
@@ -9,6 +9,8 @@* Marius Groeger <[email protected]> */ +#define DEBUG +#include <common.h> #include <bloblist.h> #include <bootstage.h>
@@ -603,9 +606,17 @@ int setup_bdinfo(void) {struct bd_info *bd = gd->bd; +debug ("Calling setup_bdinfo\n" ); + +debug ("CONFIG_NR_DRAM_BANKS is %u\n" ,CONFIG_NR_DRAM_BANKS ); + +debug ("Previous bd->bi_dram[0].start=%u bd->bi_dram[0].size=%u\n" , bd->bi_dram[0 ].start, bd->bi_dram[0 ].size); + bd->bi_dram[0 ].start = gd->ram_base;/* start of memory */ bd->bi_dram[0 ].size = gd->ram_size;/* size in bytes */ +debug ("New bd->bi_dram[0].start=%u bd->bi_dram[0].size=%u\n" , bd->bi_dram[0 ].start, bd->bi_dram[0 ].size); +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 */
and run u-boot in qemu n900 emulator. It printed following:
Calling setup_bdinfo
CONFIG_NR_DRAM_BANKS is 2
Previous bd->bi_dram[0].start=2147483648 bd->bi_dram[0].size=134217728 New bd->bi_dram[0].start=2147483648 bd->bi_dram[0].size=268435456
So it looks like that Stefan's patch is overwriting bi_dram with incorrect value. It sets only bi_diram[0] (first member) even there are two banks.
I applied following patch on top of Stefan's
common/board_f.c +2 -0
@@ -603,8 +606,10 @@ int setup_bdinfo(void) {struct bd_info *bd = gd->bd; +#if 0 bd->bi_dram[0 ].start = gd->ram_base;/* start of memory */ bd->bi_dram[0 ].size = gd->ram_size;/* size in bytes */ +#endif if (IS_ENABLED (CONFIG_SYS_HAS_SRAM )) { bd->bi_sramstart =CONFIG_SYS_SRAM_BASE ;/* start of SRAM */
and then booting Maemo kernel started working.
So this just prove that above overwriting of bd->di_dram is incorrect or incomplete.
For me the most suspicious is why Stefan's patch is overwriting only bd->bi_dram[0] even when CONFIG_NR_DRAM_BANKS is set to 2.
It looks like that for OMAP3 is bi_dram structure filled by function dram_init_banksize() from file arch/arm/mach-omap2/omap3/sdrc.c
I hope that these information helps you to debug and fix Stefan patch. Now thanks to nokia_rx51_test.sh it is easy to test and debug all changes for N900 in simulator. Moreover it is possible to use gdb to connect to qemu which in which is running u-boot. So these kind of problems should be possible to debug without real N900 hw, just in qemu and gdb.
PATCH v2 1/1 CONFIG_NR_DRAM_BANKS: Remove unreferenced code as its always defined
Hi Pali,
Quoted 181 lines · Pali Roh?r
Quoted 106 lines · On Tuesday 11 August 2020 10:58:47 Tom Rini wrote:
Quoted 105 lines · Pali Roh?r
Quoted 77 lines · On Tuesday 11 August 2020 09:08:33 Tom Rini wrote:
Quoted 76 lines · Stefan Roese
Hi Pali,
Quoted 10 lines · Pali Roh?r
Hello!
Quoted 4 lines · On Tuesday 11 August 2020 08:37:46 Stefan Roese wrote:
Hi Tom,
Hi Pali,(added Pali because of the Nokia RX51 issue)
Could you please send me a link to "problematic" patch? As you have not inlined it in this email.
Its a rebase of the original patch.
Quoted 45 lines
Quoted 36 lines · Tom Rini
Quoted 21 lines · Stefan Roese
Quoted 12 lines
Since commit
86cf1c82850f("configs: MigrateCONFIG_NR_DRAM_BANKS") & commit999a772d9f24("Kconfig: MigrateCONFIG_NR_DRAM_BANKS"),CONFIG_NR_DRAM_BANKSis always defined with a value (4 is default). It makes no sense to still carry code that is guarded with "#ifndefCONFIG_NR_DRAM_BANKS" (and similar). This patch removes all these unreferenced code paths.Also complete remove
bi_memstart&bi_memsizefrom the board-info struct. As now bi_dram[] is always enabled and should be used instead. This removes the redundant varriables.Quoted 7 lines
Signed-off-by Stefan Roese <[email protected]>Cc Daniel Schwierzeck <[email protected]>Cc Tom Rini <[email protected]>Cc Ramon Fried <[email protected]>Cc Simon Glass <[email protected]>Cc Michal Simek <[email protected]>Reviewed-by Daniel Schwierzeck <[email protected]>Quoted 4 lines
I don't see quite how, but this is breaking running
test/nokia_rx51_test.sh(or, my fixup of this to apply to current master was wrong, and is what's breaking the test). Please rebase and confirm that test passes as well, thanks!I've checked the issue with
nokia_rx51_test.shand could not find any issues in the patch. My assumption now is, that the very old Linux kernel (2.6.28) that is used in this Nokia test, still uses thebd_infostruct in Linux to pass the memory information (viabd_memstart&bi_memsize), as was also done in the very old PowerPC days. With this patch now and the removal of these fields frombd_info, this might explain why this kernel does not boot any more (no output on the serial console at all).Quoted 3 lines
Pali, could you please check if my assumption is correct here? And if yes, could please switch the test to using a newer kernel version? Or remove the Linux kernel booting from the test?
Yes, Nokia N900 uses "old" ATAGs. But we cannot remove it. New kernel version does not contain Maemo patches which are required for Maemo system which is still widely used. And yes, people are using it with U-Boot.
Quoted 6 lines
Second reason why we cannot remove support for ATAGs is that Nokia's signed first stage bootloader pass other setup data via ATAGs for kernel and U-Boot N900 board code parses it, reuse it and pass to kernel.
And replacing first stage bootloader is not possible because it is signed and signing keys are secret (now probably lost).
Okay. But this patch is not removing ATAG support, but removes 2 member from the
bd_infostruct (bi_memstart&bi_memsize), which are replaced (superseeded) by the bi_dram[].start/.size values. And AFAICT, the generation of the memory ATAG is already done based on these values:Quoted 8 lines
Quoted 8 lines
setup_memory_tags()inarch/arm/lib/bootm.cSo I still fail to understand, why booting of this old kernel using ATAGs does not work with this patch applied. Perhaps you could give it a quick test? That would be really helpful. Here again the gitlab branch that you can use for some tests:
I can do some tests on real N900 device at the end of week. But I doubt that I could debug something on device if kernel does not print any message.
Running u-boot and kernel in N900 emulator with debug serial console is easier and you can do it too locally. If you look at that test script
test/nokia_rx51_test.shyou could see that it downloads & compile qemu and prepare OneNAND MTD image with compiled u-boot + kernel binary.You can also run that test script locally, it does not require root and all data it stores into temporary "
nokia_rx51_tmp" directory. This could help you to test your changes without need to push them to travis/gitlab ci testing.Quoted 3 lines
So, I also thought maybe changing
bd_twas it, and reverted just that part locally, and it was still breaking. It's also only breaking in one of the three boot tests, if I follow things correctly.Quoted 7 lines
Quoted 3 lines
What about trying to *not* remove first two members of struct
bd_info? Maybe it is part of ABI structure?
https://gitlab.denx.de/u-boot/custodians/u-boot-marvell/-/commit/7196447f2e708a83c653f39c97f2439960482ad6#688c66555c917f123c1d054aabd1c7023c6c4522_31_30Not changing the structure is what I tried and it still failed, unless I made a thinko when I was checking it out. Can you please look in to this a bit?
Yes, I looked at that patch and seems it is really breaking something related to dram banks.
I applied following debug patch
common/board_f.c +10
-0@@ -9,6 +9,8 @@* Marius Groeger <[email protected]> */ +#define DEBUG +#include <common.h> #include <bloblist.h> #include <bootstage.h> @@ -603,9 +606,17 @@ int setup_bdinfo(void) {struct bd_info *bd = gd->bd; +debug ("Calling setup_bdinfo\n" ); + +debug ("CONFIG_NR_DRAM_BANKS is %u\n" ,CONFIG_NR_DRAM_BANKS ); + +debug ("Previous bd->bi_dram[0].start=%u bd->bi_dram[0].size=%u\n" , bd->bi_dram[0 ].start, bd->bi_dram[0 ].size); + bd->bi_dram[0 ].start = gd->ram_base;/* start of memory */ bd->bi_dram[0 ].size = gd->ram_size;/* size in bytes */ +debug ("New bd->bi_dram[0].start=%u bd->bi_dram[0].size=%u\n" , bd->bi_dram[0 ].start, bd->bi_dram[0 ].size); +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 */ and run u-boot in qemu n900 emulator. It printed following:
Calling setup_bdinfo CONFIG_NR_DRAM_BANKS is 2 Previous bd->bi_dram[0].start=2147483648 bd->bi_dram[0].size=134217728 New bd->bi_dram[0].start=2147483648 bd->bi_dram[0].size=268435456So it looks like that Stefan's patch is overwriting
bi_dramwith incorrect value. It sets only bi_diram[0] (first member) even there are two banks.I applied following patch on top of Stefan's
common/board_f.c +2
-0@@ -603,8 +606,10 @@ int setup_bdinfo(void) {struct bd_info *bd = gd->bd; +#if 0 bd->bi_dram[0 ].start = gd->ram_base;/* start of memory */ bd->bi_dram[0 ].size = gd->ram_size;/* size in bytes */ +#endif if (IS_ENABLED (CONFIG_SYS_HAS_SRAM )) { bd->bi_sramstart =CONFIG_SYS_SRAM_BASE ;/* start of SRAM */
Quoted 4 lines
and then booting Maemo kernel started working.
So this just prove that above overwriting of
bd->di_dramis incorrect or incomplete.
Yes. Thanks for looking into this. I'll post a new patch version later today, which fixes this issue.
Quoted 5 lines
For me the most suspicious is why Stefan's patch is overwriting only bd->bi_dram[0] even when
CONFIG_NR_DRAM_BANKSis set to 2.It looks like that for OMAP3 is
bi_dramstructure filled by functiondram_init_banksize()from filearch/arm/mach-omap2/omap3/sdrc.c
Yes. Some platforms fill the bd_dram[x] values in local code and I need to make sure not to overwrite it in this case.
Thanks,
Stefan