powerpc/8xxx: Fix _POST_WORD_ADDR on 85xx & 86xx systems
PATCH 1/1 powerpc/8xxx: Fix _POST_WORD_ADDR on 85xx & 86xx systems
We intended to use the PIC TFRR register however we where missing adding in the PIC register base offset from IMMR when we defined _POST_WORD_ADDR.
Signed-off-by Kumar Gala <[email protected]>
--- include/post.h | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
include/post.h +4 -2
@@ -58,11 +58,13 @@#elif defined (CONFIG_MPC85xx)#include <asm/immap_85xx.h> -#define _POST_WORD_ADDR (CONFIG_SYS_IMMR + offsetof(ccsr_pic_t, tfrr)) +#define _POST_WORD_ADDR (CONFIG_SYS_IMMR + CONFIG_SYS_MPC85xx_PIC_OFFSET + \ + offsetof(ccsr_pic_t, tfrr))#elif defined (CONFIG_MPC86xx)#include <asm/immap_86xx.h> -#define _POST_WORD_ADDR (CONFIG_SYS_IMMR + offsetof(ccsr_pic_t, tfrr)) +#define _POST_WORD_ADDR (CONFIG_SYS_IMMR + CONFIG_SYS_MPC86xx_PIC_OFFSET + \ + offsetof(ccsr_pic_t, tfrr))#elif defined (CONFIG_4xx)#define _POST_WORD_ADDR \
Signature · 1 line
1.7.2.3
PATCH 1/1 powerpc/8xxx: Fix _POST_WORD_ADDR on 85xx & 86xx systems
Hi Kumar,
Review
Quoted 13 lines
#elif defined (
CONFIG_MPC85xx)
#include <asm/immap_85xx.h>(quoted diff) +4
-2-#define _POST_WORD_ADDR (CONFIG_SYS_IMMR + offsetof(ccsr_pic_t, tfrr)) +#define _POST_WORD_ADDR (CONFIG_SYS_IMMR + CONFIG_SYS_MPC85xx_PIC_OFFSET + \ + offsetof(ccsr_pic_t, tfrr)) #elif defined (CONFIG_MPC86xx) #include <asm/immap_86xx.h> -#define _POST_WORD_ADDR (CONFIG_SYS_IMMR + offsetof(ccsr_pic_t, tfrr)) +#define _POST_WORD_ADDR (CONFIG_SYS_IMMR + CONFIG_SYS_MPC86xx_PIC_OFFSET + \ + offsetof(ccsr_pic_t, tfrr)) #elif defined (CONFIG_4xx) #define _POST_WORD_ADDR \
John Schmoller just submitted the same patch internally, but used CONFIG_SYS_MPC8xxx_PIC_ADDR instead of (IMMR + OFFSET). Its a bit cleaner, and allows combining the 85xx and 86xx case. common.h should already include asm/immap8[56]xx.h.
Best,
Peter
include/post.h +2 -8
@@ -56,14 +56,8 @@#include <asm/immap_qe.h> #define _POST_WORD_ADDR (CONFIG_SYS_IMMR + CPM_POST_WORD_ADDR) -#elif defined (CONFIG_MPC85xx) -#include <asm/immap_85xx.h> -#define _POST_WORD_ADDR (CONFIG_SYS_IMMR + offsetof(ccsr_pic_t, tfrr)) - -#elif defined (CONFIG_MPC86xx) -#include <asm/immap_86xx.h> -#define _POST_WORD_ADDR (CONFIG_SYS_IMMR + offsetof(ccsr_pic_t, tfrr)) - +#elif defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx) +#define _POST_WORD_ADDR (CONFIG_SYS_MPC8xxx_PIC_ADDR + offsetof(ccsr_pic_t, tfrr))#elif defined (CONFIG_4xx)#define _POST_WORD_ADDR \ (CONFIG_SYS_OCM_DATA_ADDR + CONFIG_SYS_GBL_DATA_OFFSET - 0x4)