POST cleanup v3 (incremental)
PATCH v3 1/1 POST cleanup v3 (incremental)
Incremental patch. Should be applied above its v2:
http://lists.denx.de/pipermail/u-boot/2010-April/070729.html
(Sorry for inconvenience. I will use --in-reply-to option next time)
In the patch:
- Fix for hcu4 board;
- post.h - preprocessor conditional inclusions optimization.
--- include/configs/hcu4.h | 2 +- include/post.h | 18 +++++------------- 2 files changed, 6 insertions(+), 14 deletions(-)
include/configs/hcu4.h +1 -1
@@ -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
include/post.h +5 -13
@@ -35,31 +35,24 @@#ifdef CONFIG_MPC5xxx#define _POST_WORD_ADDR (MPC5XXX_SRAM + MPC5XXX_SRAM_POST_SIZE) -#endif -#if defined(CONFIG_MPC821 ) || defined(CONFIG_MPC823 ) || \ - defined(CONFIG_MPC855 ) || defined(CONFIG_MPC855T )|| \ - defined(CONFIG_MPC850 ) || defined(CONFIG_MPC86x) +#elif defined(CONFIG_8xx)#define _POST_WORD_ADDR \ (((immap_t *)CONFIG_SYS_IMMR)->im_cpm.cp_dpmem + CPM_POST_WORD_ADDR) -#endif -#ifdef CONFIG_MPC8260 +#elif defined(CONFIG_MPC8260 )#include <asm/cpm_8260.h> #define _POST_WORD_ADDR (CONFIG_SYS_IMMR + CPM_POST_WORD_ADDR) -#endif -#ifdef CONFIG_MPC8360 +#elif defined(CONFIG_MPC8360 )#include <asm/immap_qe.h> #define _POST_WORD_ADDR (CONFIG_SYS_IMMR + CPM_POST_WORD_ADDR) -#endif -#ifdef CONFIG_MPC85xx +#elif defined (CONFIG_MPC85xx)#include <asm/cpm_85xx.h> #define _POST_WORD_ADDR (CONFIG_SYS_IMMR + CPM_POST_WORD_ADDR) -#endif -#ifdef CONFIG_4xx +#elif defined (CONFIG_4xx)#define _POST_WORD_ADDR \ (CONFIG_SYS_OCM_DATA_ADDR + CONFIG_SYS_GBL_DATA_OFFSET - 0x4)#endif
@@ -67,7 +60,6 @@#ifndef _POST_WORD_ADDR#error "_POST_WORD_ADDR currently not implemented for this platform!"#endif -#endif /* CONFIG_SYS_POST_WORD_ADDR */ static inline ulong post_word_load (void )
Signature · 1 line
1.6.3.3
PATCH v3 1/1 POST cleanup v3 (incremental)
Dear Michael Zaidman,
Quoted 3 lines · In message <a0610faf1d39c14a57163f3639145e832a2399f6.1272794305.git.michael.zai…
Incremental patch. Should be applied above its v2:
http://lists.denx.de/pipermail/u-boot/2010-April/070729.html
(Sorry for inconvenience. I will use --in-reply-to option next time)
Please move any such comments which are not supposed to become part of the commit message *below* the "---" line. Thanks.
See previous message - please combine all your remaining patches into
one and resubmit. 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 Peace was the way. -- Kirk, "The City on the Edge of Forever", stardate unknown
PATCH v4 1/1 POST cleanup.
Combine previously submitted POST cleanup patch series into single patch. Fix plain POST support introduced recently for mpc812x arch.
- Revives POST for blackfin arch;
- Removes redundant code:
arch/blackfin/lib/post.c
board/ssv/common/post.c
arch/powerpc/cpu/ppc4xx/commproc.c
arch/powerpc/cpu/mpc512x/common.c
- fixes up the post_word_{load|store} usage;
--- arch/blackfin/lib/Makefile | 2 +- arch/blackfin/lib/board.c | 1 - arch/blackfin/lib/post.c | 421 ----------------------------------- arch/powerpc/cpu/mpc512x/Makefile | 1 - arch/powerpc/cpu/mpc512x/common.c | 25 -- 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/Makefile | 2 +- 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 | 5 +- 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/bfin_adi_common.h | 1 + include/configs/hcu4.h | 3 +- include/configs/hcu5.h | 5 +- include/configs/hmi1001.h | 6 +- include/configs/icon.h | 3 +- include/configs/inka4x0.h | 6 +- include/configs/katmai.h | 3 +- include/configs/kilauea.h | 3 +- include/configs/korat.h | 3 +- include/configs/lwmon5.h | 2 +- include/configs/makalu.h | 3 +- include/configs/mcu25.h | 3 +- include/configs/mpc5121-common.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 +++++- post/Makefile | 3 +- 50 files changed, 103 insertions(+), 759 deletions(-) delete mode 100644 arch/blackfin/lib/post.c delete mode 100644 arch/powerpc/cpu/mpc512x/common.c delete mode 100644 arch/powerpc/cpu/ppc4xx/commproc.c delete mode 100644 board/ssv/common/post.c
arch/blackfin/lib/Makefile +1 -1
@@ -46,7 +46,7 @@ COBJS-y += clocks.o COBJS-$(CONFIG_CMD_CACHE_DUMP) += cmd_cache_dump.o COBJS-$(CONFIG_CMD_KGDB) += kgdb.o COBJS-y += muldi3.o -COBJS-$(CONFIG_POST) += post.o tests.o +COBJS-$(CONFIG_POST_ALT_LIST) += tests.o COBJS-y += string.o SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
arch/blackfin/lib/board.c +0 -1
@@ -321,7 +321,6 @@ void board_init_r(gd_t * id, ulong dest_addr)#if defined(CONFIG_POST )post_output_backlog (); -post_reloc ();#endif /* initialize malloc() area */
arch/blackfin/lib/post.c deleted +0 -421
421 lines not on this page · raw message
arch/powerpc/cpu/mpc512x/Makefile +0 -1
@@ -29,7 +29,6 @@ LIB = $(obj)lib$(CPU).a START = start.o COBJS-y := cpu.o COBJS-y += traps.o -COBJS-y += common.o COBJS-y += cpu_init.o COBJS-y += fixed_sdram.o COBJS-y += i2c.o
arch/powerpc/cpu/mpc512x/common.c deleted +0 -25
@@ -1,25 +0,0 @@ -#include <common.h> -#include <asm/io.h> - -#if defined(CONFIG_POST ) || defined(CONFIG_LOGBUFFER ) - -#if defined(CONFIG_SYS_POST_WORD_ADDR ) -# define _POST_ADDR (CONFIG_SYS_POST_WORD_ADDR) -#else -#error echo "No POST word address defined" -#endif - -void post_word_store (ulong a) -{ -volatile void *save_addr = (volatile void *)(_POST_ADDR); - -out_be32 (save_addr, a); -} - -ulong post_word_load (void ) -{ -volatile void *save_addr = (volatile void *)(_POST_ADDR); - -return in_be32 (save_addr); -} -#endif /* CONFIG_POST || CONFIG_LOGBUFFER */
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
@@ -348,12 +348,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/Makefile +1 -1
@@ -32,7 +32,7 @@ LIB = $(obj)lib$(BOARD).a COBJS-y := $(BOARD).o cmd_bf537led.o COBJS-$(CONFIG_BFIN_IDE) += ide-cf.o COBJS-$(CONFIG_CMD_EEPROM) += spi_flash.o -COBJS-$(CONFIG_POST) += post.o post-memory.o +COBJS-$(CONFIG_HAS_POST) += post.o post-memory.o SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c) OBJS := $(addprefix $(obj),$(COBJS-y))
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 +3 -2
@@ -585,8 +585,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
@@ -727,6 +725,9 @@ int cpu_release(int nr, int argc, char *argv[]);#ifdef CONFIG_POST #define CONFIG_HAS_POST +#ifndef CONFIG_POST_ALT_LIST +#define CONFIG_POST_STD_LIST +#endif #endif #ifdef CONFIG_INIT_CRITICAL
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/bfin_adi_common.h +1 -0
@@ -50,6 +50,7 @@# endif # ifdef CONFIG_POST # define CONFIG_CMD_DIAG +# define CONFIG_POST_ALT_LIST # endif # ifdef CONFIG_RTC_BFIN # define CONFIG_CMD_DATE
include/configs/hcu4.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
@@ -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/icon.h +1 -2
@@ -100,8 +100,7 @@#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/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 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/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 -2
@@ -103,11 +103,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/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/mpc5121-common.h +1 -2
@@ -30,8 +30,7 @@#define CONFIG_SYS_GBL_DATA_SIZE 0x100/* num bytes of 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_MEMTEST_START 0x00200000/* memtest region */ #define CONFIG_SYS_MEMTEST_END 0x00400000
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
77 lines not on this page · raw message
post/Makefile +2 -1
@@ -26,7 +26,8 @@ include $(OBJTREE)/include/autoconf.mk LIB = libpost.a GPLIB-$(CONFIG_HAS_POST) += libgenpost.a -COBJS-$(CONFIG_HAS_POST) += post.o tests.o +COBJS-$(CONFIG_HAS_POST) += post.o +COBJS-$(CONFIG_POST_STD_LIST) += tests.o SPLIB-$(CONFIG_HAS_POST) = drivers/libpostdrivers.a SPLIB-$(CONFIG_HAS_POST) += $(shell if [ -d lib_$(ARCH) ]; then echo \
Signature · 1 line
1.6.3.3
PATCH v4 1/1 POST cleanup.
Hi Michael,
Quoted 11 lines
Combine previously submitted POST cleanup patch series into single patch. Fix plain POST support introduced recently for mpc812x arch.
- Revives POST for blackfin arch;
- Removes redundant code:
arch/blackfin/lib/post.c
board/ssv/common/post.c
arch/powerpc/cpu/ppc4xx/commproc.c
arch/powerpc/cpu/mpc512x/common.c
- fixes up the post_word_{load|store} usage;
Thanks for the big work.
It would have been really nice if you put the maintainers on CC (simply include a CC: ... in the patch git-send-email does the rest) of the boards that you change config files. This way they knew that there was a change which they should test and ack.
For the powerpc parts, you have my
Quoted 7 lines
board/barco/barco.c +0
-0@@ -348,12 +348,3 @@ int serial_tstc (void) {return 0 ;
board/barco/barco.c int serial_tstc (void) · line 359
Quoted 10 lines
board/barco/barco.c +0
-9} - -unsigned long post_word_load (void ) -{ -return 0l ; -} -void post_word_store (unsigned long val) -{ -return ; -}
This never worked :) The config file has no trace of any POST, so the change you do is pretty useless:
include/configs/barco.h line 143
Quoted 13 lines
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
But then again, it doesn't matter.
Cheers
Detlev
Signature · 7 lines
If you currently have a 32-bit UNIX system, you are advised to trade it in for a 64-bit one sometime before the year 2106. -- Andrew S. Tanenbaum: Modern Operating Systems, 2nd Edition -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-40 Fax: (+49)-8142-66989-80 Email: dzu at denx.de
PATCH v4 1/1 POST cleanup.
Quoted 16 lines · Detlev Zundel
Hi Michael,
Quoted 11 lines
Combine previously submitted POST cleanup patch series into single patch. Fix plain POST support introduced recently for mpc812x arch.
- Revives POST for blackfin arch;
- Removes redundant code:
? ? ?arch/blackfin/lib/post.c
? ? ?board/ssv/common/post.c
? ? ?arch/powerpc/cpu/ppc4xx/commproc.c
? ? ?arch/powerpc/cpu/mpc512x/common.c
- fixes up the post_word_{load|store} usage;Thanks for the big work.
Quoted 9 lines
It would have been really nice if you put the maintainers on CC (simply include a CC: ... in the patch git-send-email does the rest) of the boards that you change config files. ?This way they knew that there was a change which they should test and ack.
For the powerpc parts, you have my
Acked-by Detlev Zundel <[email protected]>
Ok, will be done.
Quoted 12 lines
Quoted 12 lines
board/barco/barco.c +0
-4@@ -348,12 +348,3 @@ int serial_tstc (void) ?{ ? ? ? return 0; ?} - -unsigned long post_word_load (void ) -{ - ? ? return 0l;
Quoted 8 lines
board/barco/barco.c int serial_tstc (void) · line 359
Quoted 5 lines
board/barco/barco.c +0
-5-} -void post_word_store (unsigned long val) -{ - ? ? return; -}This never worked :) ?The config file has no trace of any POST, so the change you do is pretty useless:
These changes are necessary for CONFIG_LOGBUFFER which barco board defines that in turn requires the post_word_load and post_word_store support.
Quoted 16 lines
Quoted 6 lines
include/configs/barco.h +0
-0@@ -136,6 +136,8 @@Quoted 8 lines
?#define
CONFIG_LOGBUFFER
?#ifdef ? ? ?CONFIG_LOGBUFFER
?#defineCONFIG_SYS_STDOUT_ADDR? ? ? ? ? ? ?0x1FFC000+#defineCONFIG_SYS_POST_WORD_ADDR? ?\
+ ? ? ? ? ? ? (CONFIG_SYS_SDRAM_BASE+CONFIG_SYS_MAX_RAM_SIZE- 4) ?#else
?#defineCONFIG_SYS_STDOUT_ADDR? ? ? ? ? ? ?0x2B9000?#endifBut then again, it doesn't matter.
This matters for the CONFIG_LOGBUFFER support as I explained above.
Thanks,
Michael
PATCH v4 1/1 POST cleanup.
Hi Michael,
Quoted 21 lines
Quoted 12 lines
Quoted 12 lines
board/barco/barco.c +0
-4@@ -348,12 +348,3 @@ int serial_tstc (void) ?{ ? ? ? return 0; ?} - -unsigned long post_word_load (void ) -{ - ? ? return 0l;Quoted 8 lines
board/barco/barco.c int serial_tstc (void) · line 359
Quoted 5 lines
board/barco/barco.c +0
-5-} -void post_word_store (unsigned long val) -{ - ? ? return; -}This never worked :) ?The config file has no trace of any POST, so the change you do is pretty useless:
Quoted 3 lines
These changes are necessary for
CONFIG_LOGBUFFERwhich barco board defines that in turn requires thepost_word_loadandpost_word_storesupport.
Hm. It amazes me that CONFIG_LOGBUFFER needs a CONFIG_SYS_POST_WORD_ADDR - I simply did not realize this.
Ah, I see now that post.h produces these values when CONFIG_POST _or_ CONFIG_LOGBUFFER is defined. I guess this works, but it is non-obvious that we need post.h if no POST is used. But still this is no reason to NAK the patch.
Cheers
Detlev
Signature · 8 lines
This is not the first time my views on some topic have inspired in someone the desire to psychoanalyze me. Previous experience leads me to ask about your couch. Is it comfortable? Are its springs in good shape? -- Jonh McCarthy -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-40 Fax: (+49)-8142-66989-80 Email: dzu at denx.de
PATCH v4 1/1 POST cleanup.
Quoted 27 lines · Detlev Zundel
Hi Michael,
Quoted 21 lines
Quoted 12 lines
Quoted 12 lines
board/barco/barco.c +0
-4@@ -348,12 +348,3 @@ int serial_tstc (void) ?{ ? ? ? return 0; ?} - -unsigned long post_word_load (void ) -{ - ? ? return 0l;Quoted 8 lines
board/barco/barco.c int serial_tstc (void) · line 359
Quoted 5 lines
board/barco/barco.c +0
-5-} -void post_word_store (unsigned long val) -{ - ? ? return; -}This never worked :) ?The config file has no trace of any POST, so the change you do is pretty useless:
Quoted 3 lines
These changes are necessary for
CONFIG_LOGBUFFERwhich barco board defines that in turn requires thepost_word_loadandpost_word_storesupport.
Quoted 8 lines
Hm. ?It amazes me that
CONFIG_LOGBUFFERneeds aCONFIG_SYS_POST_WORD_ADDR- I simply did not realize this.Ah, I see now that
post.hproduces these values whenCONFIG_POST_or_CONFIG_LOGBUFFERis defined. ?I guess this works, but it is non-obvious that we needpost.hif no POST is used. ?But still this is no reason to NAK the patch.
Actually we do not need to include post.h if post is not used. Only cmd_log.c includes it.
In this respect patch did not change anything.
Regards,
Michael
PATCH v4 1/1 POST cleanup.
Hi Wolfgang,
Is there any particular reason why this patch is not in the main stream yet?
Thanks,
Michael
PATCH v4 1/1 POST cleanup.
In reply to Detlev ZundelQuoted 6 lines · Detlev Zundel
It would have been really nice if you put the maintainers on CC (simply include a CC: ... in the patch git-send-email does the rest) of the boards that you change config files. ?This way they knew that there was a change which they should test and ack.
The following boards are not mentioned in the MAINTAINERS file:
TB5200
barco
hmi1001
yucca
Regards,
Michael.
PATCH v5 1/1 POST cleanup.
In reply to Detlev ZundelCombine previously submitted POST cleanup patch series into single patch. Fix plain POST support introduced recently for mpc812x arch.
- Revives POST for blackfin arch;
- Removes redundant code:
arch/blackfin/lib/post.c
board/ssv/common/post.c
arch/powerpc/cpu/ppc4xx/commproc.c
arch/powerpc/cpu/mpc512x/common.c
- fixes up the post_word_{load|store} usage;
List of the maintainers of the affected by patch boards:
Cc: Stephan Linz <[email protected]>
Cc: Travis Sawyer <[email protected]>
Cc: Denis Peter <[email protected]>
Cc: Matthias Fuchs <[email protected]>
Cc: Peter Tyser <[email protected]>
Cc: Stefan Roese <[email protected]>
Cc: Mike Frysinger <[email protected]>
Cc: Niklaus Giger <[email protected]>
Cc: Larry Johnson <[email protected]>
Cc: Feng Kan <[email protected]>
--- arch/blackfin/lib/Makefile | 2 +- arch/blackfin/lib/board.c | 1 - arch/blackfin/lib/post.c | 421 ----------------------------------- arch/powerpc/cpu/mpc512x/Makefile | 1 - arch/powerpc/cpu/mpc512x/common.c | 25 -- 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/Makefile | 2 +- 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 | 5 +- 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/bfin_adi_common.h | 1 + include/configs/hcu4.h | 3 +- include/configs/hcu5.h | 5 +- include/configs/hmi1001.h | 6 +- include/configs/icon.h | 3 +- include/configs/inka4x0.h | 6 +- include/configs/katmai.h | 3 +- include/configs/kilauea.h | 3 +- include/configs/korat.h | 3 +- include/configs/lwmon5.h | 2 +- include/configs/makalu.h | 3 +- include/configs/mcu25.h | 3 +- include/configs/mpc5121-common.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 +++++- post/Makefile | 3 +- 50 files changed, 103 insertions(+), 759 deletions(-) delete mode 100644 arch/blackfin/lib/post.c delete mode 100644 arch/powerpc/cpu/mpc512x/common.c delete mode 100644 arch/powerpc/cpu/ppc4xx/commproc.c delete mode 100644 board/ssv/common/post.c
arch/blackfin/lib/Makefile +1 -1
@@ -46,7 +46,7 @@ COBJS-y += clocks.o COBJS-$(CONFIG_CMD_CACHE_DUMP) += cmd_cache_dump.o COBJS-$(CONFIG_CMD_KGDB) += kgdb.o COBJS-y += muldi3.o -COBJS-$(CONFIG_POST) += post.o tests.o +COBJS-$(CONFIG_POST_ALT_LIST) += tests.o COBJS-y += string.o SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
arch/blackfin/lib/board.c +0 -1
@@ -321,7 +321,6 @@ void board_init_r(gd_t * id, ulong dest_addr)#if defined(CONFIG_POST )post_output_backlog (); -post_reloc ();#endif /* initialize malloc() area */
arch/blackfin/lib/post.c deleted +0 -421
421 lines not on this page · raw message
arch/powerpc/cpu/mpc512x/Makefile +0 -1
@@ -29,7 +29,6 @@ LIB = $(obj)lib$(CPU).a START = start.o COBJS-y := cpu.o COBJS-y += traps.o -COBJS-y += common.o COBJS-y += cpu_init.o COBJS-y += fixed_sdram.o COBJS-y += i2c.o
arch/powerpc/cpu/mpc512x/common.c deleted +0 -25
@@ -1,25 +0,0 @@ -#include <common.h> -#include <asm/io.h> - -#if defined(CONFIG_POST ) || defined(CONFIG_LOGBUFFER ) - -#if defined(CONFIG_SYS_POST_WORD_ADDR ) -# define _POST_ADDR (CONFIG_SYS_POST_WORD_ADDR) -#else -#error echo "No POST word address defined" -#endif - -void post_word_store (ulong a) -{ -volatile void *save_addr = (volatile void *)(_POST_ADDR); - -out_be32 (save_addr, a); -} - -ulong post_word_load (void ) -{ -volatile void *save_addr = (volatile void *)(_POST_ADDR); - -return in_be32 (save_addr); -} -#endif /* CONFIG_POST || CONFIG_LOGBUFFER */
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
@@ -348,12 +348,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/Makefile +1 -1
@@ -32,7 +32,7 @@ LIB = $(obj)lib$(BOARD).a COBJS-y := $(BOARD).o cmd_bf537led.o COBJS-$(CONFIG_BFIN_IDE) += ide-cf.o COBJS-$(CONFIG_CMD_EEPROM) += spi_flash.o -COBJS-$(CONFIG_POST) += post.o post-memory.o +COBJS-$(CONFIG_HAS_POST) += post.o post-memory.o SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c) OBJS := $(addprefix $(obj),$(COBJS-y))
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 +3 -2
@@ -585,8 +585,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
@@ -727,6 +725,9 @@ int cpu_release(int nr, int argc, char *argv[]);#ifdef CONFIG_POST #define CONFIG_HAS_POST +#ifndef CONFIG_POST_ALT_LIST +#define CONFIG_POST_STD_LIST +#endif #endif #ifdef CONFIG_INIT_CRITICAL
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/bfin_adi_common.h +1 -0
@@ -50,6 +50,7 @@# endif # ifdef CONFIG_POST # define CONFIG_CMD_DIAG +# define CONFIG_POST_ALT_LIST # endif # ifdef CONFIG_RTC_BFIN # define CONFIG_CMD_DATE
include/configs/hcu4.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
@@ -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/icon.h +1 -2
@@ -100,8 +100,7 @@#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/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 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/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 -2
@@ -103,11 +103,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/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/mpc5121-common.h +1 -2
@@ -30,8 +30,7 @@#define CONFIG_SYS_GBL_DATA_SIZE 0x100/* num bytes of 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_MEMTEST_START 0x00200000/* memtest region */ #define CONFIG_SYS_MEMTEST_END 0x00400000
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
77 lines not on this page · raw message
post/Makefile +2 -1
@@ -26,7 +26,8 @@ include $(OBJTREE)/include/autoconf.mk LIB = libpost.a GPLIB-$(CONFIG_HAS_POST) += libgenpost.a -COBJS-$(CONFIG_HAS_POST) += post.o tests.o +COBJS-$(CONFIG_HAS_POST) += post.o +COBJS-$(CONFIG_POST_STD_LIST) += tests.o SPLIB-$(CONFIG_HAS_POST) = drivers/libpostdrivers.a SPLIB-$(CONFIG_HAS_POST) += $(shell if [ -d lib_$(ARCH) ]; then echo \
Signature · 1 line
1.6.3.3
PATCH v5 1/1 POST cleanup.
Dear Michael Zaidman,
Quoted 3 lines · In message <630a18874b3365b814e6d28288770f2d9b437dfa.1273498052.git.michael.zai…
Combine previously submitted POST cleanup patch series into single patch. Fix plain POST support introduced recently for mpc812x arch.
Please remove this part from the commit message (or replace it by a better desccription).
Quoted 71 lines
- Revives POST for blackfin arch;
- Removes redundant code:
arch/blackfin/lib/post.c
board/ssv/common/post.c
arch/powerpc/cpu/ppc4xx/commproc.c
arch/powerpc/cpu/mpc512x/common.c
- fixes up the post_word_{load|store} usage;Signed-off-by Michael Zaidman <[email protected]>Acked-by Detlev Zundel <[email protected]>Tested-by Anatolij Gustschin <[email protected]>List of the maintainers of the affected by patch boards:
Cc: Stephan Linz <[email protected]>
Cc: Travis Sawyer <[email protected]>
Cc: Denis Peter <[email protected]>
Cc: Matthias Fuchs <[email protected]>
Cc: Peter Tyser <[email protected]>
Cc: Stefan Roese <[email protected]>
Cc: Mike Frysinger <[email protected]>
Cc: Niklaus Giger <[email protected]>
Cc: Larry Johnson <[email protected]>
Cc: Feng Kan <[email protected]>--- arch/blackfin/lib/Makefile | 2 +- arch/blackfin/lib/board.c | 1 - arch/blackfin/lib/post.c | 421 ----------------------------------- arch/powerpc/cpu/mpc512x/Makefile | 1 - arch/powerpc/cpu/mpc512x/common.c | 25 -- 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/Makefile | 2 +- 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 | 5 +- 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/bfin_adi_common.h | 1 + include/configs/hcu4.h | 3 +- include/configs/hcu5.h | 5 +- include/configs/hmi1001.h | 6 +- include/configs/icon.h | 3 +- include/configs/inka4x0.h | 6 +- include/configs/katmai.h | 3 +- include/configs/kilauea.h | 3 +- include/configs/korat.h | 3 +- include/configs/lwmon5.h | 2 +- include/configs/makalu.h | 3 +- include/configs/mcu25.h | 3 +- include/configs/mpc5121-common.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 +-
Quoted 8 lines
include/configs/zeus.h | 7 +- include/post.h | 57 +++++- post/Makefile | 3 +- 50 files changed, 103 insertions(+), 759 deletions(-) delete mode 100644 arch/blackfin/lib/post.c delete mode 100644 arch/powerpc/cpu/mpc512x/common.c delete mode 100644 arch/powerpc/cpu/ppc4xx/commproc.c delete mode 100644 board/ssv/common/post.c
This doesn't apply any more:
Applying: POST cleanup.
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
CONFLICT (rename/delete): Rename
board/ssv/common/post.c->tools/gen_eth_addr.c in HEAD and deleted in
POST cleanup.
Removing arch/blackfin/lib/post.c
Auto-merging arch/powerpc/cpu/mpc512x/Makefile
Removing arch/powerpc/cpu/mpc512x/common.c
Removing arch/powerpc/cpu/ppc4xx/commproc.c
CONFLICT (delete/modify): include/configs/ADNPESC1.h deleted in HEAD and modified in POST cleanup.. Version POST cleanup. of include/configs/ADNPESC1.h left in tree.
Auto-merging include/configs/icon.h
Failed to merge in the changes.
Patch failed at 0001 POST cleanup.
When you have resolved this problem run "git am -i -3 --resolved".
If you would prefer to skip this patch, instead run "git am -i -3 --skip".
To restore the original branch and stop patching run "git am -i -3 --abort".
Please rebase against "next" branch and resubmit. Sorry for the inconvenience.
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 [Braddock:] Mr. Churchill, you are drunk. [Churchill:] And you madam, are ugly. But I shall be sober tomorrow.
PATCH v6 1/1 POST cleanup.
- Revives POST for blackfin arch;
- Removes redundant code:
arch/blackfin/lib/post.c
board/ssv/common/post.c
arch/powerpc/cpu/ppc4xx/commproc.c
arch/powerpc/cpu/mpc512x/common.c
- fixes up the post_word_{load|store} usage;
List of the maintainers of the affected by patch boards:
Cc: Stephan Linz <[email protected]>
Cc: Denis Peter <[email protected]>
Cc: Matthias Fuchs <[email protected]>
Cc: Peter Tyser <[email protected]>
Cc: Stefan Roese <[email protected]>
Cc: Mike Frysinger <[email protected]>
Cc: Niklaus Giger <[email protected]>
Cc: Larry Johnson <[email protected]>
Cc: Feng Kan <[email protected]>
--- arch/blackfin/lib/Makefile | 2 +- arch/blackfin/lib/board.c | 1 - arch/blackfin/lib/post.c | 421 ----------------------------------- arch/powerpc/cpu/mpc512x/common.c | 25 -- 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/Makefile | 2 +- board/bf537-stamp/post.c | 14 -- board/cm5200/cm5200.c | 16 -- board/tqc/tqm5200/tqm5200.c | 19 -- board/xes/xpedite1000/xpedite1000.c | 16 -- include/common.h | 5 +- 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/bfin_adi_common.h | 1 + include/configs/hcu4.h | 3 +- include/configs/hcu5.h | 5 +- include/configs/hmi1001.h | 6 +- include/configs/icon.h | 3 +- include/configs/inka4x0.h | 6 +- include/configs/katmai.h | 3 +- include/configs/kilauea.h | 3 +- include/configs/korat.h | 3 +- include/configs/lwmon5.h | 2 +- include/configs/makalu.h | 3 +- include/configs/mcu25.h | 3 +- include/configs/mpc5121-common.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 +++++- post/Makefile | 3 +- 47 files changed, 101 insertions(+), 713 deletions(-) delete mode 100644 arch/blackfin/lib/post.c delete mode 100644 arch/powerpc/cpu/mpc512x/common.c delete mode 100644 arch/powerpc/cpu/ppc4xx/commproc.c
arch/blackfin/lib/Makefile +1 -1
@@ -46,7 +46,7 @@ COBJS-y += clocks.o COBJS-$(CONFIG_CMD_CACHE_DUMP) += cmd_cache_dump.o COBJS-$(CONFIG_CMD_KGDB) += kgdb.o COBJS-y += muldi3.o -COBJS-$(CONFIG_POST) += post.o tests.o +COBJS-$(CONFIG_POST_ALT_LIST) += tests.o COBJS-y += string.o SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
arch/blackfin/lib/board.c +0 -1
@@ -321,7 +321,6 @@ void board_init_r(gd_t * id, ulong dest_addr)#if defined(CONFIG_POST )post_output_backlog (); -post_reloc ();#endif /* initialize malloc() area */
arch/blackfin/lib/post.c deleted +0 -421
421 lines not on this page · raw message
arch/powerpc/cpu/mpc512x/common.c deleted +0 -25
@@ -1,25 +0,0 @@ -#include <common.h> -#include <asm/io.h> - -#if defined(CONFIG_POST ) || defined(CONFIG_LOGBUFFER ) - -#if defined(CONFIG_SYS_POST_WORD_ADDR ) -# define _POST_ADDR (CONFIG_SYS_POST_WORD_ADDR) -#else -#error echo "No POST word address defined" -#endif - -void post_word_store (ulong a) -{ -volatile void *save_addr = (volatile void *)(_POST_ADDR); - -out_be32 (save_addr, a); -} - -ulong post_word_load (void ) -{ -volatile void *save_addr = (volatile void *)(_POST_ADDR); - -return in_be32 (save_addr); -} -#endif /* CONFIG_POST || CONFIG_LOGBUFFER */
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
@@ -348,12 +348,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/Makefile +1 -1
@@ -32,7 +32,7 @@ LIB = $(obj)lib$(BOARD).a COBJS-y := $(BOARD).o cmd_bf537led.o COBJS-$(CONFIG_BFIN_IDE) += ide-cf.o COBJS-$(CONFIG_CMD_EEPROM) += spi_flash.o -COBJS-$(CONFIG_POST) += post.o post-memory.o +COBJS-$(CONFIG_HAS_POST) += post.o post-memory.o SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c) OBJS := $(addprefix $(obj),$(COBJS-y))
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/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 +3 -2
@@ -585,8 +585,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
@@ -727,6 +725,9 @@ int cpu_release(int nr, int argc, char *argv[]);#ifdef CONFIG_POST #define CONFIG_HAS_POST +#ifndef CONFIG_POST_ALT_LIST +#define CONFIG_POST_STD_LIST +#endif #endif #ifdef CONFIG_INIT_CRITICAL
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/bfin_adi_common.h +1 -0
@@ -50,6 +50,7 @@# endif # ifdef CONFIG_POST # define CONFIG_CMD_DIAG +# define CONFIG_POST_ALT_LIST # endif # ifdef CONFIG_RTC_BFIN # define CONFIG_CMD_DATE
include/configs/hcu4.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
@@ -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/icon.h +1 -2
@@ -100,8 +100,7 @@#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/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 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/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 -2
@@ -103,11 +103,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/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/mpc5121-common.h +1 -2
@@ -30,8 +30,7 @@#define CONFIG_SYS_GBL_DATA_SIZE 0x100/* num bytes of 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_MEMTEST_START 0x00200000/* memtest region */ #define CONFIG_SYS_MEMTEST_END 0x00400000
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
77 lines not on this page · raw message
post/Makefile +2 -1
@@ -26,7 +26,8 @@ include $(OBJTREE)/include/autoconf.mk LIB = libpost.a GPLIB-$(CONFIG_HAS_POST) += libgenpost.a -COBJS-$(CONFIG_HAS_POST) += post.o tests.o +COBJS-$(CONFIG_HAS_POST) += post.o +COBJS-$(CONFIG_POST_STD_LIST) += tests.o SPLIB-$(CONFIG_HAS_POST) = drivers/libpostdrivers.a SPLIB-$(CONFIG_HAS_POST) += $(shell if [ -d lib_$(ARCH) ]; then echo \
Signature · 1 line
1.7.0.4
PATCH v6 1/1 POST cleanup.
Dear Wolfgang,
Quoted 12 lines · Michael Zaidman
- Revives POST for blackfin arch;
- Removes redundant code:
? ?arch/blackfin/lib/post.c
? ?board/ssv/common/post.c
? ?arch/powerpc/cpu/ppc4xx/commproc.c
? ?arch/powerpc/cpu/mpc512x/common.c
- fixes up the post_word_{load|store} usage;Signed-off-by Michael Zaidman <[email protected]>Acked-by Detlev Zundel <[email protected]>Tested-by Anatolij Gustschin <[email protected]>
Quoted 11 lines
List of the maintainers of the affected by patch boards:
Cc: Stephan Linz <[email protected]>
Cc: Denis Peter <[email protected]>
Cc: Matthias Fuchs <[email protected]>
Cc: Peter Tyser <[email protected]>
Cc: Stefan Roese <[email protected]>
Cc: Mike Frysinger <[email protected]>
Cc: Niklaus Giger <[email protected]>
Cc: Larry Johnson <[email protected]>
Cc: Feng Kan <[email protected]>
---
More than 5 week ago I rebased and resubmitted this patch as you asked but did not receive any response yet.
Best regards,
Michael.
PATCH v6 1/1 POST cleanup.
Dear Michael Zaidman,
Quoted 27 lines · In message <[email protected]> you…
Quoted 12 lines · Michael Zaidman
- Revives POST for blackfin arch;
- Removes redundant code:
arch/blackfin/lib/post.c
board/ssv/common/post.c
arch/powerpc/cpu/ppc4xx/commproc.c
arch/powerpc/cpu/mpc512x/common.c
- fixes up the post_word_{load|store} usage;Signed-off-by Michael Zaidman <[email protected]>Acked-by Detlev Zundel <[email protected]>Tested-by Anatolij Gustschin <[email protected]>Quoted 11 lines
List of the maintainers of the affected by patch boards:
Cc: Stephan Linz <[email protected]>
Cc: Denis Peter <[email protected]>
Cc: Matthias Fuchs <[email protected]>
Cc: Peter Tyser <[email protected]>
Cc: Stefan Roese <[email protected]>
Cc: Mike Frysinger <[email protected]>
Cc: Niklaus Giger <[email protected]>
Cc: Larry Johnson <[email protected]>
Cc: Feng Kan <[email protected]>
---
Quoted 2 lines
More than 5 week ago I rebased and resubmitted this patch as you asked but did not receive any response yet.
Sorry, but this does not apply any more:
Applying: POST cleanup.
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging arch/blackfin/lib/board.c
CONFLICT (delete/modify): arch/blackfin/lib/post.c deleted in POST cleanup. and modified in HEAD. Version HEAD of arch/blackfin/lib/post.c left in tree. Removing arch/powerpc/cpu/mpc512x/common.c
Auto-merging arch/powerpc/cpu/ppc4xx/Makefile
Removing arch/powerpc/cpu/ppc4xx/commproc.c
Auto-merging board/barco/barco.c
Auto-merging board/bf537-stamp/Makefile
CONFLICT (content): Merge conflict in board/bf537-stamp/Makefile
Auto-merging include/common.h
Auto-merging include/configs/bf537-stamp.h
Auto-merging include/configs/bfin_adi_common.h
Auto-merging include/configs/katmai.h
Failed to merge in the changes.
Patch failed at 0001 POST cleanup.
The merge conflict in board/bf537-stamp/Makefile is trivial to resolve, but I'm not sure about the "arch/blackfin/lib/post.c deleted in POST cleanup. and modified in HEAD."
Please rebase and resubmit. Thanks.
Best regards,
Wolfgang Denk
Signature · 4 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 How does a project get to be a year late? ... One day at a time.
PATCH v6 1/1 POST cleanup.
Dear Wolfgang,
Quoted 4 lines · Wolfgang Denk
Dear Michael Zaidman,
Quoted 2 lines
On Wed, Jun 30, 2010 at 7:16 PM, Michael Zaidman
<[email protected]> wrote:
...
Quoted 4 lines
Quoted 2 lines
More than 5 week ago I rebased and resubmitted this patch as you asked but did not receive any response yet.
Sorry, but this does not apply any more:
...
Quoted 10 lines
The merge conflict in board/bf537-stamp/Makefile is trivial to resolve, but I'm not sure about the "
arch/blackfin/lib/post.cdeleted in POST cleanup. and modified in HEAD."Please rebase and resubmit. ?Thanks.
Best regards,
Wolfgang Denk
I will do it in the second half of September after returning from vacation.
Best regards,
Michael
PATCH v7 1/1 POST cleanup.
In reply to Wolfgang Denk- Revives POST for blackfin arch;
- Removes redundant code:
arch/blackfin/lib/post.c
arch/powerpc/cpu/ppc4xx/commproc.c
arch/powerpc/cpu/mpc512x/common.c
- fixes up the post_word_{load|store} usage.
List of the maintainers of the affected by patch boards:
Cc: Stephan Linz <[email protected]>
Cc: Denis Peter <[email protected]>
Cc: Matthias Fuchs <[email protected]>
Cc: Peter Tyser <[email protected]>
Cc: Stefan Roese <[email protected]>
Cc: Mike Frysinger <[email protected]>
Cc: Niklaus Giger <[email protected]>
Cc: Larry Johnson <[email protected]>
Cc: Feng Kan <[email protected]>
--- arch/blackfin/lib/Makefile | 2 +- arch/blackfin/lib/board.c | 1 - arch/blackfin/lib/post.c | 421 ----------------------------------- arch/powerpc/cpu/mpc512x/common.c | 25 -- 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/Makefile | 2 +- board/bf537-stamp/post.c | 14 -- board/cm5200/cm5200.c | 16 -- board/tqc/tqm5200/tqm5200.c | 19 -- board/xes/xpedite1000/xpedite1000.c | 16 -- include/common.h | 5 +- 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/bfin_adi_common.h | 1 + include/configs/hcu4.h | 3 +- include/configs/hcu5.h | 5 +- include/configs/hmi1001.h | 6 +- include/configs/icon.h | 3 +- include/configs/inka4x0.h | 6 +- include/configs/katmai.h | 3 +- include/configs/kilauea.h | 3 +- include/configs/korat.h | 3 +- include/configs/lwmon5.h | 2 +- include/configs/makalu.h | 3 +- include/configs/mcu25.h | 3 +- include/configs/mpc5121-common.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 +++++- post/Makefile | 3 +- 47 files changed, 101 insertions(+), 713 deletions(-) delete mode 100644 arch/blackfin/lib/post.c delete mode 100644 arch/powerpc/cpu/mpc512x/common.c delete mode 100644 arch/powerpc/cpu/ppc4xx/commproc.c
arch/blackfin/lib/Makefile +1 -1
@@ -46,7 +46,7 @@ COBJS-y += clocks.o COBJS-$(CONFIG_CMD_CACHE_DUMP) += cmd_cache_dump.o COBJS-$(CONFIG_CMD_KGDB) += kgdb.o COBJS-y += muldi3.o -COBJS-$(CONFIG_POST) += post.o tests.o +COBJS-$(CONFIG_POST_ALT_LIST) += tests.o COBJS-y += string.o SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
arch/blackfin/lib/board.c +0 -1
@@ -322,7 +322,6 @@ void board_init_r(gd_t * id, ulong dest_addr)#if defined(CONFIG_POST )post_output_backlog (); -post_reloc ();#endif /* initialize malloc() area */
arch/blackfin/lib/post.c deleted +0 -421
421 lines not on this page · raw message
arch/powerpc/cpu/mpc512x/common.c deleted +0 -25
@@ -1,25 +0,0 @@ -#include <common.h> -#include <asm/io.h> - -#if defined(CONFIG_POST ) || defined(CONFIG_LOGBUFFER ) - -#if defined(CONFIG_SYS_POST_WORD_ADDR ) -# define _POST_ADDR (CONFIG_SYS_POST_WORD_ADDR) -#else -#error echo "No POST word address defined" -#endif - -void post_word_store (ulong a) -{ -volatile void *save_addr = (volatile void *)(_POST_ADDR); - -out_be32 (save_addr, a); -} - -ulong post_word_load (void ) -{ -volatile void *save_addr = (volatile void *)(_POST_ADDR); - -return in_be32 (save_addr); -} -#endif /* CONFIG_POST || CONFIG_LOGBUFFER */
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
@@ -342,12 +342,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/Makefile +1 -1
@@ -31,7 +31,7 @@ LIB = $(obj)lib$(BOARD).a COBJS-y := $(BOARD).o COBJS-$(CONFIG_BFIN_IDE) += ide-cf.o -COBJS-$(CONFIG_POST) += post.o post-memory.o +COBJS-$(CONFIG_HAS_POST) += post.o post-memory.o SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c) OBJS := $(addprefix $(obj),$(COBJS-y))
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/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 +3 -2
@@ -585,8 +585,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
@@ -727,6 +725,9 @@ int cpu_release(int nr, int argc, char * const argv[]);#ifdef CONFIG_POST #define CONFIG_HAS_POST +#ifndef CONFIG_POST_ALT_LIST +#define CONFIG_POST_STD_LIST +#endif #endif #ifdef CONFIG_INIT_CRITICAL
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
@@ -265,6 +265,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/bfin_adi_common.h +1 -0
@@ -50,6 +50,7 @@# endif # ifdef CONFIG_POST # define CONFIG_CMD_DIAG +# define CONFIG_POST_ALT_LIST # endif # ifdef CONFIG_RTC_BFIN # define CONFIG_CMD_DATE
include/configs/hcu4.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
@@ -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/icon.h +1 -2
@@ -100,8 +100,7 @@#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/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 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/katmai.h +1 -2
@@ -99,8 +99,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 -2
@@ -103,11 +103,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/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/mpc5121-common.h +1 -2
@@ -30,8 +30,7 @@#define CONFIG_SYS_GBL_DATA_SIZE 0x100/* num bytes of 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_MEMTEST_START 0x00200000/* memtest region */ #define CONFIG_SYS_MEMTEST_END 0x00400000
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
77 lines not on this page · raw message
post/Makefile +2 -1
@@ -26,7 +26,8 @@ include $(OBJTREE)/include/autoconf.mk LIB = libpost.a GPLIB-$(CONFIG_HAS_POST) += libgenpost.a -COBJS-$(CONFIG_HAS_POST) += post.o tests.o +COBJS-$(CONFIG_HAS_POST) += post.o +COBJS-$(CONFIG_POST_STD_LIST) += tests.o SPLIB-$(CONFIG_HAS_POST) = drivers/libpostdrivers.a SPLIB-$(CONFIG_HAS_POST) += $(shell if [ -d lib_$(ARCH) ]; then echo \
Signature · 1 line
1.7.0.4
Wolfgang Denk
AppliedPATCH v7 1/1 POST cleanup.
Dear Michael Zaidman,
Quoted 65 lines · In message <d520c6ef298416a03789ebfa4e05e257b5331693.1284965175.git.michael.zai…
- Revives POST for blackfin arch;
- Removes redundant code:
arch/blackfin/lib/post.c
arch/powerpc/cpu/ppc4xx/commproc.c
arch/powerpc/cpu/mpc512x/common.c
- fixes up the post_word_{load|store} usage.Signed-off-by Michael Zaidman <[email protected]>Acked-by Detlev Zundel <[email protected]>Tested-by Anatolij Gustschin <[email protected]>List of the maintainers of the affected by patch boards:
Cc: Stephan Linz <[email protected]>
Cc: Denis Peter <[email protected]>
Cc: Matthias Fuchs <[email protected]>
Cc: Peter Tyser <[email protected]>
Cc: Stefan Roese <[email protected]>
Cc: Mike Frysinger <[email protected]>
Cc: Niklaus Giger <[email protected]>
Cc: Larry Johnson <[email protected]>
Cc: Feng Kan <[email protected]>--- arch/blackfin/lib/Makefile | 2 +- arch/blackfin/lib/board.c | 1 - arch/blackfin/lib/post.c | 421 ----------------------------------- arch/powerpc/cpu/mpc512x/common.c | 25 -- 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/Makefile | 2 +- board/bf537-stamp/post.c | 14 -- board/cm5200/cm5200.c | 16 -- board/tqc/tqm5200/tqm5200.c | 19 -- board/xes/xpedite1000/xpedite1000.c | 16 -- include/common.h | 5 +- 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/bfin_adi_common.h | 1 + include/configs/hcu4.h | 3 +- include/configs/hcu5.h | 5 +- include/configs/hmi1001.h | 6 +- include/configs/icon.h | 3 +- include/configs/inka4x0.h | 6 +- include/configs/katmai.h | 3 +- include/configs/kilauea.h | 3 +- include/configs/korat.h | 3 +- include/configs/lwmon5.h | 2 +- include/configs/makalu.h | 3 +- include/configs/mcu25.h | 3 +- include/configs/mpc5121-common.h | 3 +- include/configs/ocotea.h | 3 +- include/configs/redwood.h | 3 +- include/configs/sequoia.h | 3 +- include/configs/taishan.h | 3 +-
Quoted 8 lines
include/configs/yucca.h | 3 +- include/configs/zeus.h | 7 +- include/post.h | 57 +++++- post/Makefile | 3 +- 47 files changed, 101 insertions(+), 713 deletions(-) delete mode 100644 arch/blackfin/lib/post.c delete mode 100644 arch/powerpc/cpu/mpc512x/common.c delete mode 100644 arch/powerpc/cpu/ppc4xx/commproc.c
Applied, thanks.
Best regards,
Wolfgang Denk
Signature · 9 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
Software entities are more complex for their size than perhaps any
other human construct because no two parts are alike. If they are, we
make the two similar parts into a subroutine -- open or closed. In
this respect, software systems differ profoundly from computers,
buildings, or automobiles, where repeated elements abound.
- Fred Brooks, Jr.PATCH v7 1/1 POST cleanup.
In reply to Michael ZaidmanDear Michael Zaidman,
Quoted 6 lines · In message <d520c6ef298416a03789ebfa4e05e257b5331693.1284965175.git.michael.zai…
- Revives POST for blackfin arch;
- Removes redundant code:
arch/blackfin/lib/post.c
arch/powerpc/cpu/ppc4xx/commproc.c
arch/powerpc/cpu/mpc512x/common.c
- fixes up the post_word_{load|store} usage.
Unfortunately it turns out that the code now contains a few nasty bugs...
...
include/configs/KAREF.h line 85
Quoted 4 lines
#define
CONFIG_SYS_GBL_DATA_OFFSET(CONFIG_SYS_INIT_RAM_END-CONFIG_SYS_GBL_DATA_SIZE)include/configs/KAREF.h +1
-2-#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)
This is a seriously broken design, as it sneaks in storage for a variable in a storage location where it is not expected.
The "official" layout is that we have CONFIG_SYS_INIT_RAM_BYTES available; the top CONFIG_SYS_GBL_DATA_SIZE bytes (now GENERATED_GBL_DATA_SIZE) are used for global data, and the part below is used for the stack. No other room is reserved there.
Shifting down the stack by 4 bytes as it's done here causes that the stack is not correctly aligned any more, which may cause really nasty subsequent errors.
But it's even worse.
Quoted 4 lines
include/configs/mpc5121-common.h +0
-0
...
include/configs/mpc5121-common.h
Quoted 3 lines
include/configs/mpc5121-common.h +1
-2-#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)
There the same is done, but what happens actually?
Have a look how the stack setup gets implemented in "arch/powerpc/cpu/mpc512x/start.S":
...
244 in_flash:
245 lis r1, (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_GBL_DATA_OFFSET)@h 246 ori r1, r1, (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_GBL_DATA_OFFSET)@l 247 248 li r0, 0 /* Make room for stack frame header and */ 249 stwu r0, -4(r1) /* clear final stack frame so that */ 250 stwu r0, -4(r1) /* stack backtraces terminate cleanly */
...
As you can see, the code does not use CONFIG_SYS_INIT_SP_OFFSET at all; instead it performs a calculation which should be redundant, but in the current code it means that the location of the POST_WORD is right in the initial stack.
I did not check if the code for other processors has similar issues.
"Reserving" private storage like that is bad, as other involved parties probably have no knowledge of such a private reservation.
Why do we not simply reserve a word in the global data structure instead?
This bug needs pretty urgent fixing.
Best regards,
Wolfgang Denk
Signature · 6 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
I wish Captain Vimes were here. He wouldn't have known what to do
either, but he's got a much better vocabulary to be baffled in.
- Terry Pratchett, _Guards! Guards!_PATCH v7 1/1 POST cleanup.
Dear Michael,
Ping!
Quoted 72 lines · In message <[email protected]> I wrote:
Dear Michael Zaidman,
Quoted 6 lines · In message <d520c6ef298416a03789ebfa4e05e257b5331693.1284965175.git.michael.zai…
- Revives POST for blackfin arch;
- Removes redundant code:
arch/blackfin/lib/post.c
arch/powerpc/cpu/ppc4xx/commproc.c
arch/powerpc/cpu/mpc512x/common.c
- fixes up the post_word_{load|store} usage.Unfortunately it turns out that the code now contains a few nasty bugs...
...
include/configs/KAREF.h line 85
Quoted 4 lines
#define
CONFIG_SYS_GBL_DATA_OFFSET(CONFIG_SYS_INIT_RAM_END-CONFIG_SYS_GBL_DATA_SIZE)include/configs/KAREF.h +1
-2-#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)This is a seriously broken design, as it sneaks in storage for a variable in a storage location where it is not expected.
The "official" layout is that we have
CONFIG_SYS_INIT_RAM_BYTESavailable; the topCONFIG_SYS_GBL_DATA_SIZEbytes (nowGENERATED_GBL_DATA_SIZE) are used for global data, and the part below is used for the stack. No other room is reserved there.Shifting down the stack by 4 bytes as it's done here causes that the stack is not correctly aligned any more, which may cause really nasty subsequent errors.
But it's even worse.
Quoted 4 lines
include/configs/mpc5121-common.h +0
-0...
include/configs/mpc5121-common.h
Quoted 3 lines
include/configs/mpc5121-common.h +1
-2-#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)There the same is done, but what happens actually?
Have a look how the stack setup gets implemented in "
arch/powerpc/cpu/mpc512x/start.S":...
244in_flash:245 lis r1, (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_GBL_DATA_OFFSET)@h 246 ori r1, r1, (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_GBL_DATA_OFFSET)@l 247 248 li r0, 0 /* Make room for stack frame header and */ 249 stwu r0, -4(r1) /* clear final stack frame so that */ 250 stwu r0, -4(r1) /* stack backtraces terminate cleanly */...
As you can see, the code does not use
CONFIG_SYS_INIT_SP_OFFSETat all; instead it performs a calculation which should be redundant, but in the current code it means that the location of thePOST_WORDis right in the initial stack.I did not check if the code for other processors has similar issues.
"Reserving" private storage like that is bad, as other involved parties probably have no knowledge of such a private reservation.
Why do we not simply reserve a word in the global data structure instead?
Quoted 6 lines
This bug needs pretty urgent fixing.
Best regards,
Wolfgang Denk
Viele Gr??e,
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
If a train station is a place where a train stops,
then what's a workstation?PATCH v7 1/1 POST cleanup.
In reply to Wolfgang DenkDear Wolfgang,
Sorry for delayed response, I did not follow the u-boot list for few weeks an missed your e-mails somehow.
Please see my comments below.
Quoted 10 lines · Wolfgang Denk
Dear Michael Zaidman,
Quoted 6 lines · In message <d520c6ef298416a03789ebfa4e05e257b5331693.1284965175.git.michael.zai…
- Revives POST for blackfin arch;
- Removes redundant code:
? ? ?arch/blackfin/lib/post.c
? ? ?arch/powerpc/cpu/ppc4xx/commproc.c
? ? ?arch/powerpc/cpu/mpc512x/common.c
- fixes up the post_word_{load|store} usage.
Quoted 2 lines
Unfortunately it turns out that the code now contains a few nasty bugs...
Thanks for catching this, I expected a feedback due to a huge number of boards and architectures the patch has touched...
Quoted 8 lines
...
Review
Quoted 4 lines
?#define
CONFIG_SYS_GBL_DATA_OFFSET? (CONFIG_SYS_INIT_RAM_END-CONFIG_SYS_GBL_DATA_SIZE)(quoted diff) +1
-2-#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)This is a seriously broken design, as it sneaks in storage for a variable in a storage location where it is not expected.
There were a number of boards implemented this design (alpr, karef, katmai, metrobox, ocotea, redwood, taishan, xpedite1000, yucca, etc...) I just grouped their definitions in a single place. But, you are right, it should be fixed.
Quoted 11 lines
But it's even worse.
244
in_flash:
245 ? ? ? ? lis ? ? r1, (CONFIG_SYS_INIT_RAM_ADDR+ CONFIG_SYS_GBL_DATA_OFFSET)@h 246 ? ? ? ? ori ? ? r1, r1, (CONFIG_SYS_INIT_RAM_ADDR+ CONFIG_SYS_GBL_DATA_OFFSET)@l 247
248 ? ? ? ? li ? ? ?r0, 0 ? ? ? ? ? /* Make room for stack frame header and */ 249 ? ? ? ? stwu ? ?r0, -4(r1) ? ? ?/* clear final stack frame so that ? ? ?*/ 250 ? ? ? ? stwu ? ?r0, -4(r1) ? ? ?/* stack backtraces terminate cleanly ? */
...
Quoted 4 lines
As you can see, the code does not use
CONFIG_SYS_INIT_SP_OFFSETat all; instead it performs a calculation which should be redundant, but in the current code it means that the location of thePOST_WORDis right in the initial stack.
This code should use the CONFIG_SYS_INIT_SP_OFFSET. This should be fixed regardless of the POST_WORD location.
I figured out that there a number of architectures that implement this redundancy.
Quoted 2 lines
Why do we not simply reserve a word in the global data structure instead?
I guess, because the global data structure is cleared in the cpu_init_f() upon startup?
memset ((void *) gd, 0, sizeof (gd_t));
We can prevent part or single field of the gd structure from to be cleared. Does this make sense to you?
Regards,
Michael
PATCH v7 1/1 POST cleanup.
Dear Wolfgang,
On Sun, Nov 21, 2010 at 2:34 PM, Michael Zaidman
<[email protected]> wrote:
...
Quoted 1 line · Wolfgang Denk
...
Quoted 1 line
Quoted 1 line
Why do we not simply reserve a word in the global data structure instead?
Please correct me if I am wrong, but the global data structure is destined to keep its data integrity while switching from flash to RAM. For this purpose, it is temporary located in the data cache (for those architectures that do not have static ram on chip) which is available from very beginning before RAM controller is initialized, afterwards it is moved into RAM. The POST_WORD is destined for different purpose
- to preserve the data while passing through the watchdog reset and this is the reason why it was placed into some kind of on chip memory such as one of unused locations of the PowerQUICC dual port RAM for mpc8xx/mpc8xxx architectures. In order to achieve the same effect with data cache the desired data should be locked in the cache prior the reset and unlocked afterwards. The data cache reaction on the SW reset is architecture dependent and even if it is possible, that is not obvious, not sure it worth the effort. For example, any kind of mpc83xx reset will cause hard reseting of e300 core which in turn will invalidate caches.
Regards,
Michael
PATCH v4 1/1 POST cleanup.
In reply to Michael ZaidmanQuoted 11 lines · On Sun, 9 May 2010 18:27:10 +0300 Michael Zaidman <[email protected]>…
Combine previously submitted POST cleanup patch series into single patch. Fix plain POST support introduced recently for mpc812x arch.
- Revives POST for blackfin arch;
- Removes redundant code:
arch/blackfin/lib/post.c
board/ssv/common/post.c
arch/powerpc/cpu/ppc4xx/commproc.c
arch/powerpc/cpu/mpc512x/common.c
- fixes up the post_word_{load|store} usage;
mpc512x related changes are OK. I tested them on mpc5121 based pdm360ng board. Thanks again for this work! For mpc5121 part you can add
Best regards,
Anatolij
PATCH v4 1/1 POST cleanup.
On Mon, May 10, 2010 at 2:51 PM, Anatolij Gustschin <[email protected]> wrote:
...
Quoted 5 lines
mpc512x related changes are OK. I tested them on mpc5121 based pdm360ng board. Thanks again for this work! For mpc5121 part you can add
Tested-by Anatolij Gustschin <[email protected]>
Ok, thanks for testing.
Michael