Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-14 08:57:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

85xx: Change case of MPC85XX_PORBMSR_ROMLOC_SHIFT

Browse source 
All the other constants use lowercase 'x' in "MPC85xx", so we
duplicate that here.

Signed-off-by: Andy Fleming <afleming@freescale.com>
This commit is contained in:
Andy Fleming 2013-06-20 14:54:33 -05:00
parent 6770c5e2e8
commit 8bd00c9494
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/powerpc/include/asm/immap_85xx.h
View file

@ -2160,7 +2160,7 @@ typedef struct ccsr_gur {
u32 porbmsr; /* POR boot mode status */ u32 porbmsr; /* POR boot mode status */
#define MPC85xx_PORBMSR_HA 0x00070000 #define MPC85xx_PORBMSR_HA 0x00070000
#define MPC85xx_PORBMSR_HA_SHIFT 16 #define MPC85xx_PORBMSR_HA_SHIFT 16
#define MPC85XX_PORBMSR_ROMLOC_SHIFT 24 #define MPC85xx_PORBMSR_ROMLOC_SHIFT 24
#define PORBMSR_ROMLOC_SPI 0x6 #define PORBMSR_ROMLOC_SPI 0x6
#define PORBMSR_ROMLOC_SDHC 0x7 #define PORBMSR_ROMLOC_SDHC 0x7
#define PORBMSR_ROMLOC_NAND_2K 0x9 #define PORBMSR_ROMLOC_NAND_2K 0x9

4
board/freescale/bsc9132qds/bsc9132qds.c
View file

@ -258,7 +258,7 @@ int misc_init_r(void)
u8 val; u8 val;
ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
u32 porbmsr = in_be32(&gur->porbmsr); u32 porbmsr = in_be32(&gur->porbmsr);
u32 romloc = (porbmsr >> MPC85XX_PORBMSR_ROMLOC_SHIFT) & 0xf; u32 romloc = (porbmsr >> MPC85xx_PORBMSR_ROMLOC_SHIFT) & 0xf;
/*Configure 1588 clock-in source from RF Card*/ /*Configure 1588 clock-in source from RF Card*/
val = QIXIS_READ_I2C(brdcfg[5]); val = QIXIS_READ_I2C(brdcfg[5]);
@ -360,7 +360,7 @@ void ft_board_setup(void *blob, bd_t *bd)
ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
u32 porbmsr = in_be32(&gur->porbmsr); u32 porbmsr = in_be32(&gur->porbmsr);
u32 romloc = (porbmsr >> MPC85XX_PORBMSR_ROMLOC_SHIFT) & 0xf; u32 romloc = (porbmsr >> MPC85xx_PORBMSR_ROMLOC_SHIFT) & 0xf;
if (!(hwconfig("uart2") && hwconfig("usb1"))) { if (!(hwconfig("uart2") && hwconfig("usb1"))) {
/* If uart2 is there in hwconfig remove usb node from /* If uart2 is there in hwconfig remove usb node from