diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-02-22 13:03:28 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-02-22 13:03:28 +0100 |
| commit | 6a2dcaf1ee014008f90143cf1045ac80d9d25d1f (patch) | |
| tree | ba6b87b625b0bb2056147799797faf67ed443171 /include | |
| parent | 45d65b7f285b17d21270ff002127c246431bd668 (diff) | |
| parent | d5908b093955415f3d340706378b991f911af671 (diff) | |
| download | talos-obmc-uboot-6a2dcaf1ee014008f90143cf1045ac80d9d25d1f.tar.gz talos-obmc-uboot-6a2dcaf1ee014008f90143cf1045ac80d9d25d1f.zip | |
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc86xx
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ppc/immap_86xx.h | 12 | ||||
| -rw-r--r-- | include/configs/MPC8610HPCD.h | 2 | ||||
| -rw-r--r-- | include/configs/sbc8641d.h | 10 |
3 files changed, 12 insertions, 12 deletions
diff --git a/include/asm-ppc/immap_86xx.h b/include/asm-ppc/immap_86xx.h index a15c6ec12a..7526061d5a 100644 --- a/include/asm-ppc/immap_86xx.h +++ b/include/asm-ppc/immap_86xx.h @@ -1256,12 +1256,16 @@ typedef struct ccsr_rio { typedef struct ccsr_gur { uint porpllsr; /* 0xe0000 - POR PLL ratio status register */ uint porbmsr; /* 0xe0004 - POR boot mode status register */ -#define MPC86xx_PORBMSR_HA 0x00060000 -#define MPC85xx_PORBMSR_HA 0x00070000 +#define MPC8610_PORBMSR_HA 0x00070000 +#define MPC8610_PORBMSR_HA_SHIFT 16 +#define MPC8641_PORBMSR_HA 0x00060000 +#define MPC8641_PORBMSR_HA_SHIFT 17 uint porimpscr; /* 0xe0008 - POR I/O impedance status and control register */ uint pordevsr; /* 0xe000c - POR I/O device status regsiter */ -#define MPC86xx_PORDEVSR_IO_SEL 0x000F0000 -#define MPC85xx_PORDEVSR_IO_SEL 0x00380000 /* 85xx platform type */ +#define MPC8610_PORDEVSR_IO_SEL 0x00380000 +#define MPC8610_PORDEVSR_IO_SEL_SHIFT 19 +#define MPC8641_PORDEVSR_IO_SEL 0x000F0000 +#define MPC8641_PORDEVSR_IO_SEL_SHIFT 16 #define MPC86xx_PORDEVSR_CORE1TE 0x00000080 /* ASMP (Core1 addr trans) */ uint pordbgmsr; /* 0xe0010 - POR debug mode status register */ char res1[12]; diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h index 39201474e9..9e70198e42 100644 --- a/include/configs/MPC8610HPCD.h +++ b/include/configs/MPC8610HPCD.h @@ -24,7 +24,7 @@ #define CONFIG_FSL_DIU_FB 1 /* FSL DIU */ /* video */ -#define CONFIG_VIDEO +#undef CONFIG_VIDEO #if defined(CONFIG_VIDEO) #define CONFIG_CFB_CONSOLE diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h index 1991a8cc87..18cedff929 100644 --- a/include/configs/sbc8641d.h +++ b/include/configs/sbc8641d.h @@ -268,13 +268,9 @@ /* * Pass open firmware flat tree to kernel */ -#define CONFIG_OF_FLAT_TREE 1 -#define CONFIG_OF_BOARD_SETUP 1 - -#define OF_CPU "PowerPC,8641@0" -#define OF_SOC "soc@f8000000" -#define OF_TBCLK (bd->bi_busfreq / 4) -#define OF_STDOUT_PATH "/soc@f8000000/serial@4500" +#define CONFIG_OF_LIBFDT 1 +#define CONFIG_OF_BOARD_SETUP 1 +#define CONFIG_OF_STDOUT_VIA_ALIAS 1 #define CFG_64BIT_VSPRINTF 1 #define CFG_64BIT_STRTOUL 1 |
