Clean up the macro defintions used to enable DIU (video) support on the MPC8610HPCD and the MPC5121ADS so that they look more like the P1022DS, which is newer.
Signed-off-by: Timur Tabi <ti...@freescale.com> --- doc/README.mpc5121ads | 18 ++++++++++++++++++ doc/README.mpc8610hpcd | 7 +++++++ include/configs/MPC8610HPCD.h | 12 +++--------- include/configs/mpc5121ads.h | 8 +++----- 4 files changed, 31 insertions(+), 14 deletions(-) create mode 100644 doc/README.mpc5121ads diff --git a/doc/README.mpc5121ads b/doc/README.mpc5121ads new file mode 100644 index 0000000..78fc3c9 --- /dev/null +++ b/doc/README.mpc5121ads @@ -0,0 +1,18 @@ +Freescale MPC5121ADS board +=========================== + + +Building U-Boot +--------------- + + $ make mpc5121ads_config + Configuring for mpc5121ads board... + + $ make + + +Video Support +------------- +To enable DIU video support (console on a video display), define the macro +CONFIG_FSL_DIU_FB in the board header file (mpc5121ads.h) and set the +'monitor' environment variable appropriately. diff --git a/doc/README.mpc8610hpcd b/doc/README.mpc8610hpcd index 31a9af3..8f878c4 100644 --- a/doc/README.mpc8610hpcd +++ b/doc/README.mpc8610hpcd @@ -71,3 +71,10 @@ DIP Switch Settings ------------------- To manually switch the flash banks using the DIP switch settings, toggle both SW6:1 and SW6:2. + + +Video Support +------------- +To enable DIU video support (console on a video display), define the macro +CONFIG_FSL_DIU_FB in the board header file (MPC8610HPCD.h) and set the +'monitor' environment variable appropriately. diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h index 03ee394..1e321f4 100644 --- a/include/configs/MPC8610HPCD.h +++ b/include/configs/MPC8610HPCD.h @@ -21,12 +21,11 @@ #define CONFIG_SYS_TEXT_BASE 0xfff00000 -#define CONFIG_FSL_DIU_FB 1 /* FSL DIU */ /* video */ -#undef CONFIG_VIDEO - -#ifdef CONFIG_VIDEO +#ifdef CONFIG_FSL_DIU_FB +#define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x2c000) +#define CONFIG_VIDEO #define CONFIG_CMD_BMP #define CONFIG_CFB_CONSOLE #define CONFIG_VGA_AS_SINGLE_DEVICE @@ -88,8 +87,6 @@ #define CONFIG_SYS_CCSRBAR_PHYS_HIGH 0x0 #define CONFIG_SYS_CCSRBAR_PHYS CONFIG_SYS_CCSRBAR_PHYS_LOW -#define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR+0x2c000) - /* DDR Setup */ #define CONFIG_FSL_DDR2 #undef CONFIG_FSL_DDR_INTERACTIVE @@ -494,9 +491,6 @@ #define CONFIG_WATCHDOG /* watchdog enabled */ #define CONFIG_SYS_WATCHDOG_FREQ 5000 /* Feed interval, 5s */ -/*DIU Configuration*/ -#define DIU_CONNECT_TO_DVI /* DIU controller connects to DVI encoder*/ - /* * Miscellaneous configurable options */ diff --git a/include/configs/mpc5121ads.h b/include/configs/mpc5121ads.h index f966325..33a5b86 100644 --- a/include/configs/mpc5121ads.h +++ b/include/configs/mpc5121ads.h @@ -46,14 +46,13 @@ */ #define CONFIG_E300 1 /* E300 Family */ #define CONFIG_MPC512X 1 /* MPC512X family */ -#define CONFIG_FSL_DIU_FB 1 /* FSL DIU */ #define CONFIG_SYS_TEXT_BASE 0xFFF00000 /* video */ -#undef CONFIG_VIDEO - -#ifdef CONFIG_VIDEO +#ifdef CONFIG_FSL_DIU_FB +#define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_IMMR + 0x2100) +#define CONFIG_VIDEO #define CONFIG_CMD_BMP #define CONFIG_CFB_CONSOLE #define CONFIG_VGA_AS_SINGLE_DEVICE @@ -74,7 +73,6 @@ #define CONFIG_MISC_INIT_R #define CONFIG_SYS_IMMR 0x80000000 -#define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_IMMR+0x2100) #define CONFIG_SYS_MEMTEST_START 0x00200000 /* memtest region */ #define CONFIG_SYS_MEMTEST_END 0x00400000 -- 1.7.3.4 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
