POST cleanup V2 (incremental)
PATCH v2 1/1 POST cleanup V2 (incremental)
The patch implements step#3 of the POST framework cleanup suggested by Wolfgang Denk in the
http://lists.denx.de/pipermail/u-boot/2010-April/070400.html
This is an incremental patch, should be applied above its initial version.
http://lists.denx.de/pipermail/u-boot/2010-April/070559.html
--- arch/powerpc/cpu/mpc8260/commproc.c | 20 ------------ arch/powerpc/cpu/mpc85xx/commproc.c | 20 ------------ arch/powerpc/cpu/mpc8xx/commproc.c | 20 ------------ arch/powerpc/cpu/ppc4xx/Makefile | 1 - arch/powerpc/cpu/ppc4xx/commproc.c | 53 -------------------------------- board/barco/barco.c | 9 ----- board/bc3450/bc3450.c | 20 ------------ board/bf537-stamp/post.c | 14 -------- board/cm5200/cm5200.c | 16 ---------- board/ssv/common/post.c | 44 --------------------------- board/tqc/tqm5200/tqm5200.c | 19 ----------- board/xes/xpedite1000/xpedite1000.c | 16 ---------- include/common.h | 2 - include/configs/ADNPESC1.h | 3 +- include/configs/KAREF.h | 3 +- include/configs/METROBOX.h | 3 +- include/configs/MIP405.h | 4 -- include/configs/PMC440.h | 3 +- include/configs/TB5200.h | 2 +- include/configs/XPEDITE1000.h | 3 +- include/configs/alpr.h | 3 +- include/configs/barco.h | 2 + include/configs/bf537-stamp.h | 1 + include/configs/hcu4.h | 1 - include/configs/hcu5.h | 5 +-- include/configs/hmi1001.h | 6 ++- include/configs/inka4x0.h | 6 ++- include/configs/katmai.h | 3 +- include/configs/kilauea.h | 2 +- include/configs/korat.h | 3 +- include/configs/lwmon5.h | 2 +- include/configs/makalu.h | 3 +- include/configs/mcu25.h | 3 +- include/configs/ocotea.h | 3 +- include/configs/redwood.h | 3 +- include/configs/sequoia.h | 3 +- include/configs/taishan.h | 3 +- include/configs/yucca.h | 3 +- include/configs/zeus.h | 7 ++-- include/post.h | 57 ++++++++++++++++++++++++++++++++++- 40 files changed, 92 insertions(+), 302 deletions(-) delete mode 100644 arch/powerpc/cpu/ppc4xx/commproc.c delete mode 100644 board/ssv/common/post.c
arch/powerpc/cpu/mpc8260/commproc.c +0 -20
@@ -175,23 +175,3 @@ m8260_cpm_extcbrg(uint brg, uint rate, uint extclk, int pinsel)else *bp |=CPM_BRG_EXTC_CLK5_15 ; } - -#if defined(CONFIG_POST ) || defined(CONFIG_LOGBUFFER ) - -void post_word_store (ulong a) -{ -volatile ulong *save_addr = - (volatile ulong *)(CONFIG_SYS_IMMR +CPM_POST_WORD_ADDR ); - - *save_addr = a; -} - -ulong post_word_load (void ) -{ -volatile ulong *save_addr = - (volatile ulong *)(CONFIG_SYS_IMMR +CPM_POST_WORD_ADDR ); - -return *save_addr; -} - -#endif /* CONFIG_POST || CONFIG_LOGBUFFER*/
arch/powerpc/cpu/mpc85xx/commproc.c +0 -20
@@ -183,23 +183,3 @@ m8560_cpm_extcbrg(uint brg, uint rate, uint extclk, int pinsel)else *bp |=CPM_BRG_EXTC_CLK5_15 ; } - -#ifdef CONFIG_POST - -void post_word_store (ulong a) -{ -volatile ulong *save_addr = - (volatile ulong *)(CONFIG_SYS_IMMR +CPM_POST_WORD_ADDR ); - - *save_addr = a; -} - -ulong post_word_load (void ) -{ -volatile ulong *save_addr = - (volatile ulong *)(CONFIG_SYS_IMMR +CPM_POST_WORD_ADDR ); - -return *save_addr; -} - -#endif /* CONFIG_POST */
arch/powerpc/cpu/mpc8xx/commproc.c +0 -20
@@ -83,23 +83,3 @@ uint dpram_base_align (uint align) return (gd->dp_alloc_base + mask) & ~mask; }#endif /* CONFIG_SYS_ALLOC_DPRAM */ - -#if defined(CONFIG_POST ) || defined(CONFIG_LOGBUFFER ) - -void post_word_store (ulong a) -{ -volatile void *save_addr = - ((immap_t *)CONFIG_SYS_IMMR )->im_cpm.cp_dpmem +CPM_POST_WORD_ADDR ; - - *(volatile ulong *) save_addr = a; -} - -ulong post_word_load (void ) -{ -volatile void *save_addr = - ((immap_t *)CONFIG_SYS_IMMR )->im_cpm.cp_dpmem +CPM_POST_WORD_ADDR ; - -return *(volatile ulong *) save_addr; -} - -#endif /* CONFIG_POST || CONFIG_LOGBUFFER*/
arch/powerpc/cpu/ppc4xx/Makefile +0 -1
@@ -45,7 +45,6 @@ COBJS += bedbug_405.o ifdef CONFIG_CMD_CHIP_CONFIG COBJS += cmd_chip_config.o endif -COBJS += commproc.o COBJS += cpu.o COBJS += cpu_init.o COBJS += denali_data_eye.o
arch/powerpc/cpu/ppc4xx/commproc.c deleted +0 -53
53 lines not on this page · raw message
board/barco/barco.c +0 -9
@@ -352,12 +352,3 @@ int serial_tstc (void) {return 0 ; } - -unsigned long post_word_load (void ) -{ -return 0l ; -} -void post_word_store (unsigned long val) -{ -return ; -}
board/bc3450/bc3450.c +0 -20
@@ -290,26 +290,6 @@ int post_hotkeys_pressed(void) }#endif -#if defined(CONFIG_POST ) || defined(CONFIG_LOGBUFFER ) - -void post_word_store (ulong a) -{ -volatile ulong *save_addr = - (volatile ulong *)(MPC5XXX_SRAM +MPC5XXX_SRAM_POST_SIZE ); - - *save_addr = a; -} - -ulong post_word_load (void ) -{ -volatile ulong *save_addr = - (volatile ulong *)(MPC5XXX_SRAM +MPC5XXX_SRAM_POST_SIZE ); - -return *save_addr; -} -#endif /* CONFIG_POST || CONFIG_LOGBUFFER*/ - -#ifdef CONFIG_BOARD_EARLY_INIT_R int board_early_init_r (void ) {
board/bf537-stamp/post.c +0 -14
@@ -13,8 +13,6 @@#include <command.h> #include <asm/blackfin.h> -#define POST_WORD_ADDR 0xFF903FFC -/* Using sw10-PF5 as the hotkey */ int post_hotkeys_pressed (void ) {
@@ -47,18 +45,6 @@ int post_hotkeys_pressed(void) } } -void post_word_store (ulong a) -{ -volatile ulong *save_addr = (volatile ulong *)POST_WORD_ADDR ; - *save_addr = a; -} - -ulong post_word_load (void ) -{ -volatile ulong *save_addr = (volatile ulong *)POST_WORD_ADDR ; -return *save_addr; -} -int uart_post_test (int flags) {return 0 ;
board/cm5200/cm5200.c +0 -16
@@ -323,22 +323,6 @@ int board_early_init_r(void) } -#if defined(CONFIG_POST ) || defined(CONFIG_LOGBUFFER ) -void post_word_store (ulong a) -{ -vu_long *save_addr = (vu_long *)(MPC5XXX_SRAM +MPC5XXX_SRAM_POST_SIZE ); - *save_addr = a; -} - - -ulong post_word_load (void ) -{ -vu_long *save_addr = (vu_long *)(MPC5XXX_SRAM +MPC5XXX_SRAM_POST_SIZE ); -return *save_addr; -} -#endif /* CONFIG_POST || CONFIG_LOGBUFFER */ - -#ifdef CONFIG_MISC_INIT_R int misc_init_r (void ) {
board/ssv/common/post.c deleted +0 -44
44 lines not on this page · raw message
board/tqc/tqm5200/tqm5200.c +0 -19
@@ -375,25 +375,6 @@ int post_hotkeys_pressed(void) }#endif -#if defined(CONFIG_POST ) || defined(CONFIG_LOGBUFFER ) - -void post_word_store (ulong a) -{ -volatile ulong *save_addr = - (volatile ulong *)(MPC5XXX_SRAM +MPC5XXX_SRAM_POST_SIZE ); - - *save_addr = a; -} - -ulong post_word_load (void ) -{ -volatile ulong *save_addr = - (volatile ulong *)(MPC5XXX_SRAM +MPC5XXX_SRAM_POST_SIZE ); - -return *save_addr; -} -#endif /* CONFIG_POST || CONFIG_LOGBUFFER*/ -#ifdef CONFIG_BOARD_EARLY_INIT_R int board_early_init_r (void ) {
board/xes/xpedite1000/xpedite1000.c +0 -16
@@ -196,20 +196,4 @@ int post_hotkeys_pressed(void) {return ctrlc (); } - -void post_word_store (ulong a) -{ -volatile ulong *save_addr = - (volatile ulong *)(CONFIG_SYS_POST_WORD_ADDR ); - - *save_addr = a; -} - -ulong post_word_load (void ) -{ -volatile ulong *save_addr = - (volatile ulong *)(CONFIG_SYS_POST_WORD_ADDR ); - -return *save_addr; -}#endif
include/common.h +0 -2
@@ -586,8 +586,6 @@ uint dpram_base(void);uint dpram_base_align (uint align);uint dpram_alloc (uint size);uint dpram_alloc_align (uint size,uint align); -void post_word_store (ulong ); -ulong post_word_load (void );void bootcount_store (ulong );ulong bootcount_load (void );#define BOOTCOUNT_MAGIC 0xB001C041
include/configs/ADNPESC1.h +2 -1
@@ -562,7 +562,8 @@* Diagnostics / Power On Self Tests *----------------------------------------------------------------------*/ #define CONFIG_POST CONFIG_SYS_POST_RTC -#define CONFIG_SYS_NIOS_POST_WORD_ADDR (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) +#define CONFIG_SYS_POST_WORD_ADDR \ + (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)/* * BOOTP options
include/configs/KAREF.h +1 -2
@@ -82,8 +82,7 @@#define CONFIG_SYS_GBL_DATA_SIZE 128/* num bytes initial data */ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) -#define CONFIG_SYS_POST_WORD_ADDR (CONFIG_SYS_GBL_DATA_OFFSET - 0x4) -#define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_POST_WORD_ADDR +#define CONFIG_SYS_INIT_SP_OFFSET (CONFIG_SYS_GBL_DATA_OFFSET - 0x4)#define CONFIG_SYS_MONITOR_LEN (256 * 1024)/* Rsrv 256kB for Mon */ #define CONFIG_SYS_MALLOC_LEN (128 * 1024)/* Rsrv 128kB for malloc */
include/configs/METROBOX.h +1 -2
@@ -144,8 +144,7 @@#define CONFIG_SYS_GBL_DATA_SIZE 128/* num bytes initial data */ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) -#define CONFIG_SYS_POST_WORD_ADDR (CONFIG_SYS_GBL_DATA_OFFSET - 0x4) -#define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_POST_WORD_ADDR +#define CONFIG_SYS_INIT_SP_OFFSET (CONFIG_SYS_GBL_DATA_OFFSET - 0x4)#define CONFIG_SYS_MONITOR_LEN (256 * 1024)/* Rsrv 256kB for Mon */ #define CONFIG_SYS_MALLOC_LEN (128 * 1024)/* Rsrv 128kB for malloc */
include/configs/MIP405.h +0 -4
@@ -305,10 +305,6 @@/* reserve some memory for POST and BOOT limit info */ #define CONFIG_SYS_INIT_SP_OFFSET (CONFIG_SYS_GBL_DATA_OFFSET - 32) -#ifdef CONFIG_POST /* reserve one word for POST Info */ -#define CONFIG_SYS_POST_WORD_ADDR (CONFIG_SYS_GBL_DATA_OFFSET - 4) -#endif -#ifdef CONFIG_BOOTCOUNT_LIMIT /* reserve 2 word for bootcount limit */ #define CONFIG_SYS_BOOTCOUNT_ADDR (CONFIG_SYS_GBL_DATA_OFFSET - 12)#endif
include/configs/PMC440.h +1 -2
@@ -90,7 +90,7 @@#define CONFIG_SYS_INIT_RAM_END (4 << 10)#define CONFIG_SYS_GBL_DATA_SIZE 256/* num bytes initial data */ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) -#define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_POST_WORD_ADDR +#define CONFIG_SYS_INIT_SP_OFFSET (CONFIG_SYS_GBL_DATA_OFFSET - 0x4)/*----------------------------------------------------------------------- * Serial Port
@@ -373,7 +373,6 @@ CONFIG_SYS_POST_ETHER | \ CONFIG_SYS_POST_SPR) -#define CONFIG_SYS_POST_WORD_ADDR (CONFIG_SYS_GBL_DATA_OFFSET - 0x4)#define CONFIG_LOGBUFFER #define CONFIG_SYS_POST_CACHE_ADDR 0x7fff0000/* free virtual address */
include/configs/TB5200.h +1 -1
@@ -126,7 +126,7 @@#endif #ifdef CONFIG_POST -#define CONFIG__CMD_DIAG +#define CONFIG_CMD_DIAG #endif
include/configs/XPEDITE1000.h +1 -2
@@ -103,8 +103,7 @@ extern void out32(unsigned int, unsigned long);#define CONFIG_SYS_INIT_RAM_END 0x2000/* End of used area in RAM */ #define CONFIG_SYS_GBL_DATA_SIZE 128/* num bytes initial data */ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) -#define CONFIG_SYS_POST_WORD_ADDR (CONFIG_SYS_GBL_DATA_OFFSET - 0x4) -#define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_POST_WORD_ADDR +#define CONFIG_SYS_INIT_SP_OFFSET (CONFIG_SYS_GBL_DATA_OFFSET - 0x4)#define CONFIG_SYS_MONITOR_LEN (512 * 1024)/* Reserve 512 KB for Mon */ #define CONFIG_SYS_MALLOC_LEN (1024 * 1024)/* Reserved for malloc */
include/configs/alpr.h +1 -2
@@ -66,8 +66,7 @@#define CONFIG_SYS_GBL_DATA_SIZE 128/* num bytes initial data */ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) -#define CONFIG_SYS_POST_WORD_ADDR (CONFIG_SYS_GBL_DATA_OFFSET - 0x4) -#define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_POST_WORD_ADDR +#define CONFIG_SYS_INIT_SP_OFFSET (CONFIG_SYS_GBL_DATA_OFFSET - 0x4)#define CONFIG_SYS_MONITOR_LEN (256 * 1024)/* Reserve 256 kB for Mon */ #define CONFIG_SYS_MALLOC_LEN (128 * 1024)/* Reserve 128 kB for malloc*/
include/configs/barco.h +2 -0
@@ -136,6 +136,8 @@#define CONFIG_LOGBUFFER #ifdef CONFIG_LOGBUFFER #define CONFIG_SYS_STDOUT_ADDR 0x1FFC000 +#define CONFIG_SYS_POST_WORD_ADDR \ + (CONFIG_SYS_SDRAM_BASE + CONFIG_SYS_MAX_RAM_SIZE - 4)#else #define CONFIG_SYS_STDOUT_ADDR 0x2B9000#endif
include/configs/bf537-stamp.h +1 -0
@@ -276,6 +276,7 @@#define FLASH_START_POST_BLOCK 11/* Should > = 11 */ #define FLASH_END_POST_BLOCK 71/* Should < = 71 */ #endif +#define CONFIG_SYS_POST_WORD_ADDR 0xFF903FFC/* These are for board tests */ #if 0
include/configs/hcu4.h +0 -1
@@ -192,7 +192,6 @@ CONFIG_SYS_POST_SPR)#define CONFIG_SYS_POST_UART_TABLE {UART0_BASE} -#define CONFIG_SYS_POST_WORD_ADDR (CONFIG_SYS_GBL_DATA_OFFSET - 0x4)#undef CONFIG_LOGBUFFER#define CONFIG_SYS_POST_CACHE_ADDR 0x00800000/* free virtual address */ #define CONFIG_SYS_CONSOLE_IS_IN_ENV /* Otherwise it catches logbuffer as output */
include/configs/hcu5.h +2 -3
@@ -86,7 +86,7 @@#define CONFIG_SYS_INIT_RAM_END (4 << 10)#define CONFIG_SYS_GBL_DATA_SIZE 256/* num bytes initial data */ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) -#define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_POST_WORD_ADDR +#define CONFIG_SYS_INIT_SP_OFFSET (CONFIG_SYS_GBL_DATA_OFFSET - 0x4)/*----------------------------------------------------------------------- * Serial Port
@@ -212,9 +212,8 @@ CONFIG_SYS_POST_FPU | \ CONFIG_SYS_POST_ETHER | \ CONFIG_SYS_POST_SPR) -#define CONFIG_SYS_POST_UART_TABLE {UART0_BASE} -#define CONFIG_SYS_POST_WORD_ADDR (CONFIG_SYS_GBL_DATA_OFFSET - 0x4) +#define CONFIG_SYS_POST_UART_TABLE {UART0_BASE}#define CONFIG_SYS_POST_CACHE_ADDR 0x7fff0000/* free virtual address */ #define CONFIG_SYS_CONSOLE_IS_IN_ENV /* Otherwise it catches logbuffer as output */
include/configs/hmi1001.h +4 -2
@@ -190,14 +190,16 @@/* Use ON-Chip SRAM until RAM will be available */ #define CONFIG_SYS_INIT_RAM_ADDR MPC5XXX_SRAM -#ifdef CONFIG_POST +/* preserve space for the post_word at end of on-chip SRAM */ +#define MPC5XXX_SRAM_POST_SIZE (MPC5XXX_SRAM_SIZE - 4) + +#ifdef CONFIG_POST #define CONFIG_SYS_INIT_RAM_END MPC5XXX_SRAM_POST_SIZE#else #define CONFIG_SYS_INIT_RAM_END MPC5XXX_SRAM_SIZE#endif -#define CONFIG_SYS_GBL_DATA_SIZE 128/* size in bytes reserved for initial data */ #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
include/configs/inka4x0.h +4 -2
@@ -200,14 +200,16 @@/* Use ON-Chip SRAM until RAM will be available */ #define CONFIG_SYS_INIT_RAM_ADDR MPC5XXX_SRAM -#ifdef CONFIG_POST +/* preserve space for the post_word@end of on-chip SRAM */ +#define MPC5XXX_SRAM_POST_SIZE (MPC5XXX_SRAM_SIZE - 4) + +#ifdef CONFIG_POST #define CONFIG_SYS_INIT_RAM_END MPC5XXX_SRAM_POST_SIZE#else #define CONFIG_SYS_INIT_RAM_END MPC5XXX_SRAM_SIZE#endif -#define CONFIG_SYS_GBL_DATA_SIZE 128/* size in bytes reserved for initial data */ #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
include/configs/katmai.h +1 -2
@@ -106,8 +106,7 @@#define CONFIG_SYS_GBL_DATA_SIZE 128/* num bytes initial data */ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) -#define CONFIG_SYS_POST_WORD_ADDR (CONFIG_SYS_GBL_DATA_OFFSET - 0x4) -#define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_POST_WORD_ADDR +#define CONFIG_SYS_INIT_SP_OFFSET (CONFIG_SYS_GBL_DATA_OFFSET - 0x4)/*----------------------------------------------------------------------- * Serial Port
include/configs/kilauea.h +1 -1
@@ -103,7 +103,7 @@#if defined(CONFIG_SYS_INIT_DCACHE_CS )# define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET -# define CONFIG_SYS_POST_ALT_WORD_ADDR (CONFIG_SYS_PERIPHERAL_BASE + GPT0_COMP6) +# define CONFIG_SYS_POST_WORD_ADDR (CONFIG_SYS_PERIPHERAL_BASE + GPT0_COMP6)#else # define CONFIG_SYS_INIT_EXTRA_SIZE 16# define CONFIG_SYS_INIT_SP_OFFSET (CONFIG_SYS_GBL_DATA_OFFSET - CONFIG_SYS_INIT_EXTRA_SIZE)
include/configs/korat.h +1 -2
@@ -88,7 +88,7 @@#define CONFIG_SYS_INIT_RAM_END (4 << 10)#define CONFIG_SYS_GBL_DATA_SIZE 256/* num bytes initial data */ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) -#define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_POST_WORD_ADDR +#define CONFIG_SYS_INIT_SP_OFFSET (CONFIG_SYS_GBL_DATA_OFFSET - 0x4)/* * Serial Port
@@ -306,7 +306,6 @@ CONFIG_SYS_POST_SPR | \ CONFIG_SYS_POST_UART) -#define CONFIG_SYS_POST_WORD_ADDR (CONFIG_SYS_GBL_DATA_OFFSET - 0x4)#define CONFIG_LOGBUFFER #define CONFIG_SYS_POST_CACHE_ADDR 0xC8000000/* free virtual address */
include/configs/lwmon5.h +1 -1
@@ -84,7 +84,7 @@#define CONFIG_SYS_GBL_DATA_SIZE 256/* num bytes initial data*/ #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_POST_ALT_WORD_ADDR (CONFIG_SYS_PERIPHERAL_BASE + GPT0_COMP6) +#define CONFIG_SYS_POST_WORD_ADDR (CONFIG_SYS_PERIPHERAL_BASE + GPT0_COMP6)/* unused GPT0 COMP reg */ #define CONFIG_SYS_MEM_TOP_HIDE (4 << 10)/* don't use last 4kbytes */ /* 440EPx errata CHIP 11 */
include/configs/makalu.h +1 -2
@@ -101,11 +101,10 @@#if defined(CONFIG_SYS_INIT_DCACHE_CS )# define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET -# define CONFIG_SYS_POST_ALT_WORD_ADDR (CONFIG_SYS_PERIPHERAL_BASE + GPT0_COMP6) +# define CONFIG_SYS_POST_WORD_ADDR (CONFIG_SYS_PERIPHERAL_BASE + GPT0_COMP6)#else # define CONFIG_SYS_INIT_EXTRA_SIZE 16# define CONFIG_SYS_INIT_SP_OFFSET (CONFIG_SYS_GBL_DATA_OFFSET - CONFIG_SYS_INIT_EXTRA_SIZE) -# define CONFIG_SYS_POST_WORD_ADDR (CONFIG_SYS_GBL_DATA_OFFSET - 4)# define CONFIG_SYS_OCM_DATA_ADDR CONFIG_SYS_INIT_RAM_ADDR#endif /* defined(CONFIG_SYS_INIT_DCACHE_CS) */
include/configs/mcu25.h +1 -2
@@ -72,7 +72,7 @@#define CONFIG_SYS_INIT_RAM_END CONFIG_SYS_OCM_DATA_SIZE#define CONFIG_SYS_GBL_DATA_SIZE 256/* num bytes initial data */ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) -#define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_POST_WORD_ADDR +#define CONFIG_SYS_INIT_SP_OFFSET (CONFIG_SYS_GBL_DATA_OFFSET - 0x4)/*----------------------------------------------------------------------- * Serial Port
@@ -200,7 +200,6 @@ CONFIG_SYS_POST_SPR)#define CONFIG_SYS_POST_UART_TABLE {UART0_BASE} -#define CONFIG_SYS_POST_WORD_ADDR (CONFIG_SYS_GBL_DATA_OFFSET - 0x4)#undef CONFIG_LOGBUFFER#define CONFIG_SYS_POST_CACHE_ADDR 0x00800000/* free virtual address */ #define CONFIG_SYS_CONSOLE_IS_IN_ENV /* Otherwise it catches logbuffer as output */
include/configs/ocotea.h +1 -2
@@ -75,8 +75,7 @@#define CONFIG_SYS_GBL_DATA_SIZE 128/* num bytes initial data */ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) -#define CONFIG_SYS_POST_WORD_ADDR (CONFIG_SYS_GBL_DATA_OFFSET - 0x4) -#define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_POST_WORD_ADDR +#define CONFIG_SYS_INIT_SP_OFFSET (CONFIG_SYS_GBL_DATA_OFFSET - 0x4)/*----------------------------------------------------------------------- * Serial Port
include/configs/redwood.h +1 -2
@@ -87,8 +87,7 @@#define CONFIG_SYS_GBL_DATA_SIZE 128/* num bytes initial data */ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) -#define CONFIG_SYS_POST_WORD_ADDR (CONFIG_SYS_GBL_DATA_OFFSET - 0x4) -#define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_POST_WORD_ADDR +#define CONFIG_SYS_INIT_SP_OFFSET (CONFIG_SYS_GBL_DATA_OFFSET - 0x4)/*----------------------------------------------------------------------- * DDR SDRAM
include/configs/sequoia.h +1 -2
@@ -100,7 +100,7 @@#define CONFIG_SYS_INIT_RAM_END (4 << 10)#define CONFIG_SYS_GBL_DATA_SIZE 256/* num bytes initial data */ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) -#define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_POST_WORD_ADDR +#define CONFIG_SYS_INIT_SP_OFFSET (CONFIG_SYS_GBL_DATA_OFFSET - 0x4)/* * Serial Port
@@ -357,7 +357,6 @@ CONFIG_SYS_POST_SPR | \ CONFIG_SYS_POST_UART) -#define CONFIG_SYS_POST_WORD_ADDR (CONFIG_SYS_GBL_DATA_OFFSET - 0x4)#define CONFIG_LOGBUFFER #define CONFIG_SYS_POST_CACHE_ADDR 0x7fff0000/* free virtual address */
include/configs/taishan.h +1 -2
@@ -71,8 +71,7 @@#define CONFIG_SYS_GBL_DATA_SIZE 128/* num bytes initial data*/ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) -#define CONFIG_SYS_POST_WORD_ADDR (CONFIG_SYS_GBL_DATA_OFFSET - 0x4) -#define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_POST_WORD_ADDR +#define CONFIG_SYS_INIT_SP_OFFSET (CONFIG_SYS_GBL_DATA_OFFSET - 0x4)/*----------------------------------------------------------------------- * Serial Port
include/configs/yucca.h +1 -2
@@ -100,8 +100,7 @@#define CONFIG_SYS_GBL_DATA_SIZE 128/* num bytes initial data */ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) -#define CONFIG_SYS_POST_WORD_ADDR (CONFIG_SYS_GBL_DATA_OFFSET - 0x4) -#define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_POST_WORD_ADDR +#define CONFIG_SYS_INIT_SP_OFFSET (CONFIG_SYS_GBL_DATA_OFFSET - 0x4)/*----------------------------------------------------------------------- * Serial Port
include/configs/zeus.h +4 -3
@@ -255,9 +255,10 @@#define CONFIG_SYS_INIT_SP_OFFSET (CONFIG_SYS_GBL_DATA_OFFSET - 16)/* extra data in OCM */ -#define CONFIG_SYS_POST_WORD_ADDR (CONFIG_SYS_GBL_DATA_OFFSET - 4) -#define CONFIG_SYS_POST_MAGIC (CONFIG_SYS_OCM_DATA_ADDR + CONFIG_SYS_GBL_DATA_OFFSET - 8) -#define CONFIG_SYS_POST_VAL (CONFIG_SYS_OCM_DATA_ADDR + CONFIG_SYS_GBL_DATA_OFFSET - 12) +#define CONFIG_SYS_POST_MAGIC \ + (CONFIG_SYS_OCM_DATA_ADDR + CONFIG_SYS_GBL_DATA_OFFSET - 8) +#define CONFIG_SYS_POST_VAL \ + (CONFIG_SYS_OCM_DATA_ADDR + CONFIG_SYS_GBL_DATA_OFFSET - 12)/*----------------------------------------------------------------------- * External Bus Controller (EBC) Setup
include/post.h +56 -1
71 lines not on this page · raw message
Signature · 1 line
1.6.3.3
PATCH v2 1/1 POST cleanup V2 (incremental)
Dear Michael Zaidman,
Quoted 7 lines · In message <[email protected]> you…
The patch implements step#3 of the POST framework cleanup suggested by Wolfgang Denk in the
http://lists.denx.de/pipermail/u-boot/2010-April/070400.htmlThis is an incremental patch, should be applied above its initial version.
http://lists.denx.de/pipermail/u-boot/2010-April/070559.html
Now that Stefan's version of the first patch is in mainline, could you please rebase and squash your two incremental patches and re-submit as a new one? Thanks.
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 Q: How do you spell "onomatopoeia"? A: The way it sounds.