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/configs | |
| parent | 45d65b7f285b17d21270ff002127c246431bd668 (diff) | |
| parent | d5908b093955415f3d340706378b991f911af671 (diff) | |
| download | u-boot-imx-6a2dcaf1ee014008f90143cf1045ac80d9d25d1f.zip u-boot-imx-6a2dcaf1ee014008f90143cf1045ac80d9d25d1f.tar.gz u-boot-imx-6a2dcaf1ee014008f90143cf1045ac80d9d25d1f.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc86xx
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/MPC8610HPCD.h | 2 | ||||
| -rw-r--r-- | include/configs/sbc8641d.h | 10 |
2 files changed, 4 insertions, 8 deletions
diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h index 3920147..9e70198 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 1991a8c..18cedff 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 |