powerpc: clean up DIU macro definitions for the MPC8610HPCD and MPC5121ADS
PATCH v2 1/1 powerpc: clean up DIU macro definitions for the MPC8610HPCD and MPC5121ADS
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.
--- include/configs/MPC8610HPCD.h | 12 ++++-------- include/configs/mpc5121ads.h | 8 ++++---- 2 files changed, 8 insertions(+), 12 deletions(-)
include/configs/MPC8610HPCD.h +4 -8
@@ -21,12 +21,13 @@#define CONFIG_SYS_TEXT_BASE 0xfff00000 -#define CONFIG_FSL_DIU_FB 1/* FSL DIU */ /* video */ -#undef CONFIG_VIDEO +/* #define CONFIG_FSL_DIU_FB */ -#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 +89,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 +493,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 */
include/configs/mpc5121ads.h +4 -4
@@ -46,14 +46,15 @@*/ #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 +/* #define CONFIG_FSL_DIU_FB */ -#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 +75,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
Signature · 1 line
1.7.3.4
PATCH v2 1/1 powerpc: clean up DIU macro definitions for the MPC8610HPCD and MPC5121ADS
Dear Timur Tabi,
Quoted 15 lines · In message <[email protected]> you wrote:
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 <[email protected]>--- include/configs/MPC8610HPCD.h | 12 ++++-------- include/configs/mpc5121ads.h | 8 ++++---- 2 files changed, 8 insertions(+), 12 deletions(-)include/configs/MPC8610HPCD.h +0
-0
include/configs/MPC8610HPCD.h line 26
Quoted 8 lines
include/configs/MPC8610HPCD.h +1
-2@@ -21,12 +21,13 @@#define CONFIG_SYS_TEXT_BASE 0xfff00000 -#define CONFIG_FSL_DIU_FB 1/* FSL DIU */ /* video */ -#undef CONFIG_VIDEO +/* #define CONFIG_FSL_DIU_FB */
Please do not add dead code.
Quoted 5 lines
include/configs/mpc5121ads.h +0
-0
include/configs/mpc5121ads.h line 53
Quoted 10 lines
include/configs/mpc5121ads.h +1
-2@@ -46,14 +46,15 @@*/ #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 +/* #define CONFIG_FSL_DIU_FB */
Ditto.
Best regards,
Wolfgang Denk
Signature · 5 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de No man knows what true happiness is until he gets married. By then, of course, its too late.
PATCH v2 1/1 powerpc: clean up DIU macro definitions for the MPC8610HPCD and MPC5121ADS
Quoted 4 lines · Wolfgang Denk
Quoted 3 lines
Review
Quoted 3 lines
/* video */
(quoted diff) +1
-1-#undef CONFIG_VIDEO +/* #define CONFIG_FSL_DIU_FB */Please do not add dead code.
It's not dead code. It's a comment that tells people how to enable video support.
Signature · 2 lines
Timur Tabi Linux kernel developer at Freescale
PATCH v2 1/1 powerpc: clean up DIU macro definitions for the MPC8610HPCD and MPC5121ADS
Dear Timur Tabi,
Quoted 7 lines · In message <[email protected]> you wrote:
Quoted 4 lines · Wolfgang Denk
Quoted 3 lines
Review
Quoted 3 lines
/* video */
(quoted diff) +1
-1-#undef CONFIG_VIDEO +/* #define CONFIG_FSL_DIU_FB */Please do not add dead code.
It's not dead code. It's a comment that tells people how to enable video support.
It is dead code. Please remove it.
Documentation is already present in the README, isn't it?
Ouch - gotcha! Please fix _that_.
Best regards,
Wolfgang Denk
Signature · 4 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de The high cost of living hasn't affected its popularity.