TQM834x: configuration update
cover TQM834x: configuration update
The following 3 patches update the configuration for the TQM834x board:
Wolfgang Denk (3):
TQM834x: fix environment size; add redundant env.
TQM834x: add FDT support
TQM834x: use buffered writes to accelerate writing to flash
PATCH 1/3 TQM834x: fix environment size; add redundant env.
Also reserve more space for U-Boot as it will probably grow soon.
--- include/configs/TQM834x.h | 26 ++++++++++++-------------- 1 files changed, 12 insertions(+), 14 deletions(-)
include/configs/TQM834x.h +12 -14
@@ -179,8 +179,8 @@ extern int tqm834x_num_flash_banks;#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)#define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET -#define CONFIG_SYS_MONITOR_LEN (256 * 1024)/* Reserve 256 kB for Mon */ -#define CONFIG_SYS_MALLOC_LEN (256 * 1024)/* Reserve 256 kB for malloc */ +#define CONFIG_SYS_MONITOR_LEN (384 * 1024)/* Reserve 384 kB = 3 sect. for Mon */ +#define CONFIG_SYS_MALLOC_LEN (512 * 1024)/* Reserve 512 kB for malloc */ /* * Serial Port
@@ -295,22 +295,20 @@ extern int tqm834x_num_flash_banks;/* * Environment */ -#define CONFIG_ENV_OVERWRITE - -#ifndef CONFIG_SYS_RAMBOOT -#define CONFIG_ENV_IS_IN_FLASH 1 -#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + 0x40000) -#define CONFIG_ENV_SECT_SIZE 0x40000/* 256K(one sector) for env */ -#define CONFIG_ENV_SIZE 0x2000 +#ifdef CONFIG_SYS_RAMBOOT +# define CONFIG_SYS_NO_FLASH 1/* Flash is not usable now */ #else -#define CONFIG_SYS_NO_FLASH 1/* Flash is not usable now */ -#define CONFIG_ENV_IS_NOWHERE 1/* Store ENV in memory only */ -#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) -#define CONFIG_ENV_SIZE 0x2000 +# define CONFIG_ENV_IS_IN_FLASH 1#endif +#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) +#define CONFIG_ENV_SECT_SIZE 0x20000/* 128K (one sector) for env */ +#define CONFIG_ENV_SIZE 0x8000/* 32K max size */ +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) +#define CONFIG_LOADS_ECHO 1/* echo on for serial download */ -#define CONFIG_SYS_LOADS_BAUD_CHANGE 1/* allow baudrate change */ +#define CONFIG_SYS_LOADS_BAUD_CHANGE 1/* allow baudrate change */ /* * BOOTP options
Signature · 1 line
1.6.0.6
PATCH 2/3 TQM834x: add FDT support
In reply to Wolfgang Denk--- board/tqc/tqm834x/pci.c | 45 ++++++++++++++++++++++++++++++++ board/tqc/tqm834x/tqm834x.c | 11 ++++++++ include/configs/TQM834x.h | 59 ++++++++++++++++++++++++++++-------------- 3 files changed, 95 insertions(+), 20 deletions(-)
board/tqc/tqm834x/pci.c +45 -0
@@ -24,7 +24,15 @@#include <asm/mmu.h> #include <common.h> +#include <asm/global_data.h> #include <pci.h> +#include <asm/mpc8349_pci.h> +#if defined(CONFIG_OF_LIBFDT ) +#include <libfdt.h> +#include <fdt_support.h> +#endif + +DECLARE_GLOBAL_DATA_PTR ;#ifdef CONFIG_PCI
@@ -217,4 +225,41 @@ pci_init_board(void)*/ hose->last_busno =pci_hose_scan (hose); } + +#if defined(CONFIG_OF_LIBFDT ) +void ft_pci_setup (void *blob,bd_t *bd) +{ +int nodeoffset; +int tmp[2 ]; +const char *path; + + nodeoffset =fdt_path_offset (blob,"/aliases" ); +if (nodeoffset >=0 ) { + path =fdt_getprop (blob, nodeoffset,"pci0" ,NULL ); +if (path) { + tmp[0 ] =cpu_to_be32 (pci1_hose.first_busno); + tmp[1 ] =cpu_to_be32 (pci1_hose.last_busno); +do_fixup_by_path (blob, path,"bus-range" , + &tmp,sizeof (tmp),1 ); + + tmp[0 ] =cpu_to_be32 (gd->pci_clk); +do_fixup_by_path (blob, path,"clock-frequency" , + &tmp,sizeof (tmp[0 ]),1 ); + } +#ifdef CONFIG_MPC83XX_PCI2 + path =fdt_getprop (blob, nodeoffset,"pci1" ,NULL ); +if (path) { + tmp[0 ] =cpu_to_be32 (pci2_hose.first_busno); + tmp[1 ] =cpu_to_be32 (pci2_hose.last_busno); +do_fixup_by_path (blob, path,"bus-range" , + &tmp,sizeof (tmp),1 ); + + tmp[0 ] =cpu_to_be32 (gd->pci_clk); +do_fixup_by_path (blob, path,"clock-frequency" , + &tmp,sizeof (tmp[0 ]),1 ); + } +#endif + } +} +#endif /* CONFIG_OF_LIBFDT */ #endif /* CONFIG_PCI */
board/tqc/tqm834x/tqm834x.c +11 -0
@@ -431,3 +431,14 @@ static void set_ddr_config(void) {#endif } } + +#ifdef CONFIG_OF_BOARD_SETUP +void ft_board_setup (void *blob,bd_t *bd) +{ +ft_cpu_setup (blob, bd); + +#ifdef CONFIG_PCI +ft_pci_setup (blob, bd); +#endif /* CONFIG_PCI */ +} +#endif /* CONFIG_OF_BOARD_SETUP */
include/configs/TQM834x.h +39 -20
100 lines not on this page · raw message
Signature · 1 line
1.6.0.6
PATCH 3/3 TQM834x: use buffered writes to accelerate writing to flash
In reply to Wolfgang DenkAlso enable display of 'E'mpty sectors in "lsinfo" output.
--- include/configs/TQM834x.h | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-)
include/configs/TQM834x.h +3 -4
@@ -78,13 +78,12 @@* FLASH on the Local Bus */ #define CONFIG_SYS_FLASH_CFI /* use the Common Flash Interface */ -#define CONFIG_FLASH_CFI_DRIVER /* use the CFI driver */ +#define CONFIG_FLASH_CFI_DRIVER /* use the CFI driver */ #undef CONFIG_SYS_FLASH_CHECKSUM#define CONFIG_SYS_FLASH_BASE 0x80000000/* start of FLASH */ #define CONFIG_SYS_FLASH_SIZE 8/* FLASH size in MB */ - -/* buffered writes in the AMD chip set is not supported yet */ -#undef CONFIG_SYS_FLASH_USE_BUFFER_WRITE +#define CONFIG_SYS_FLASH_EMPTY_INFO /* print 'E' for empty sectors */ +#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE /* * FLASH bank number detection
Signature · 1 line
1.6.0.6
PATCH 3/3 TQM834x: use buffered writes to accelerate writing to flash
Hi Wolfgang,
Quoted 1 line · On Thursday 14 May 2009 23:18:35 Wolfgang Denk wrote:
Also enable display of 'E'mpty sectors in "lsinfo" output.
s lsinfo/flinfo.
Best regards,
Stefan
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de
=====================================================================
PATCH v2 3/3 TQM834x: use buffered writes to accelerate writing to flash
Also enable display of 'E'mpty sectors in "flinfo" output.
---
v2: fix "flinfo" misspelling
include/configs/TQM834x.h | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-)
include/configs/TQM834x.h +3 -4
@@ -78,13 +78,12 @@* FLASH on the Local Bus */ #define CONFIG_SYS_FLASH_CFI /* use the Common Flash Interface */ -#define CONFIG_FLASH_CFI_DRIVER /* use the CFI driver */ +#define CONFIG_FLASH_CFI_DRIVER /* use the CFI driver */ #undef CONFIG_SYS_FLASH_CHECKSUM#define CONFIG_SYS_FLASH_BASE 0x80000000/* start of FLASH */ #define CONFIG_SYS_FLASH_SIZE 8/* FLASH size in MB */ - -/* buffered writes in the AMD chip set is not supported yet */ -#undef CONFIG_SYS_FLASH_USE_BUFFER_WRITE +#define CONFIG_SYS_FLASH_EMPTY_INFO /* print 'E' for empty sectors */ +#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE /* * FLASH bank number detection
Signature · 1 line
1.6.0.6
PATCH 3/3 TQM834x: use buffered writes to accelerate writing to flash
In reply to Stefan RoeseDear Stefan Roese,
Quoted 6 lines · In message <[email protected]> you wrote:
Hi Wolfgang,
Quoted 1 line · On Thursday 14 May 2009 23:18:35 Wolfgang Denk wrote:
Also enable display of 'E'mpty sectors in "lsinfo" output.
s lsinfo/flinfo.
Thanks for catching this. Will fix.
Best regards,
Wolfgang Denk
Signature · 5 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de The number you have dialed is imaginary. Please divide by 0 and try again.
cover TQM834x: configuration update
In reply to Wolfgang DenkQuoted 7 lines · On Thu, 14 May 2009 23:18:32 +0200 Wolfgang Denk <[email protected]> wrote:
The following 3 patches update the configuration for the TQM834x board:
Wolfgang Denk (3):
TQM834x: fix environment size; add redundant env.
TQM834x: add FDT support
TQM834x: use buffered writes to accelerate writing to flash
applied 1-3/3 to u-boot-mpc83xx next branch.
Kim