From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Tyser Date: Thu, 02 Dec 2010 14:21:06 -0600 Subject: [U-Boot] [PATCH] powerpc/8xxx: Fix _POST_WORD_ADDR on 85xx & 86xx systems In-Reply-To: <1291207778-32298-1-git-send-email-galak@kernel.crashing.org> References: <1291207778-32298-1-git-send-email-galak@kernel.crashing.org> Message-ID: <1291321266.20072.571.camel@petert> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi Kumar, > #elif defined (CONFIG_MPC85xx) > #include > -#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 > -#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 diff --git a/include/post.h b/include/post.h index 957ce3b..15a20c1 100644 --- a/include/post.h +++ b/include/post.h @@ -56,14 +56,8 @@ #include #define _POST_WORD_ADDR (CONFIG_SYS_IMMR + CPM_POST_WORD_ADDR) -#elif defined (CONFIG_MPC85xx) -#include -#define _POST_WORD_ADDR (CONFIG_SYS_IMMR + offsetof(ccsr_pic_t, tfrr)) - -#elif defined (CONFIG_MPC86xx) -#include -#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)