FSL: Moved BR_PHYS_ADDR for localbus to common header
PATCH 2/3 FSL: Moved BR_PHYS_ADDR for localbus to common header
The BR_PHYS_ADDR macro is useful on all machines that have local bus which is pretty much all 83xx/85xx/86xx chips.
Additionally most 85xx & 86xx will need it if they want to support 36-bit physical addresses.
Signed-off-by Kumar Gala <[email protected]>
--- include/asm-ppc/fsl_lbc.h | 8 ++++++++ include/configs/MPC8641HPCN.h | 9 --------- 2 files changed, 8 insertions(+), 9 deletions(-)
include/asm-ppc/fsl_lbc.h +8 -0
@@ -69,6 +69,14 @@#define BR_RES ~(BR_BA | BR_PS | BR_DECC | BR_WP | BR_MSEL | BR_ATOM | BR_V)#endif +/* Convert an address into the right format for the BR registers */ +#ifdef CONFIG_PHYS_64BIT +#define BR_PHYS_ADDR (x) ((unsigned long)((x & 0x0ffff8000ULL) | \ + ((x & 0x300000000ULL) >> 19))) +#else +#define BR_PHYS_ADDR (x) (x & 0xffff8000) +#endif +/* OR - Option Registers */ #define OR0 0x5004/* Register offset to immr */
include/configs/MPC8641HPCN.h +0 -9
@@ -186,17 +186,8 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);#define CONFIG_SYS_FLASH_BASE_PHYS (CONFIG_SYS_FLASH_BASE \ | CONFIG_SYS_PHYS_ADDR_HIGH) -#define CONFIG_SYS_FLASH_BANKS_LIST {CONFIG_SYS_FLASH_BASE} -/* Convert an address into the right format for the BR registers */ -#ifdef CONFIG_PHYS_64BIT -#define BR_PHYS_ADDR (x) ((unsigned long)((x & 0x0ffff8000ULL) | \ - ((x & 0x300000000ULL) >> 19))) -#else -#define BR_PHYS_ADDR (x) (x & 0xffff8000) -#endif -#define CONFIG_SYS_BR0_PRELIM (BR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE_PHYS) \ | 0x00001001)/* port size 16bit */ #define CONFIG_SYS_OR0_PRELIM 0xff806ff7/* 8MB Boot Flash area*/
Signature · 1 line
1.5.6.5