Update the RRvision port to a modern version of u-boot.
PATCH 2/2 Update the RRvision port to a modern version of u-boot.
The port now uses the CFI-driver so board/RRvision/flash.c has been removed.
--- Makefile | 385 +++++++++++++++++++++++++++++++ board/RRvision/Makefile | 4 +- board/RRvision/RRvision.c | 9 +- board/RRvision/flash.c | 522 ------------------------------------------ common/lcd.c | 9 +- cpu/mpc8xx/cpu_init.c | 2 +- cpu/mpc8xx/fec.c | 8 + cpu/mpc8xx/lcd.c | 185 ++++++++++++++- cpu/mpc8xx/video.c | 22 ++- include/configs/RRvision.h | 210 +++++++++++++---- include/configs/TTTech_env.h | 99 ++++++++ tools/Makefile | 20 ++ 12 files changed, 891 insertions(+), 584 deletions(-) delete mode 100644 board/RRvision/flash.c create mode 100644 include/configs/TTTech_env.h
common/lcd.c +8 -1
@@ -70,6 +70,13 @@# if (CONSOLE_COLOR_WHITE >=BMP_LOGO_OFFSET )# error Default Color Map overlaps with Logo Color Map# endif + +# ifndef CONFIG_LCD_LOGO_X +# define CONFIG_LCD_LOGO_X 0 +# endif +# ifndef CONFIG_LCD_LOGO_Y +# define CONFIG_LCD_LOGO_Y 0 +# endif #endif DECLARE_GLOBAL_DATA_PTR ;
@@ -768,7 +775,7 @@ static void *lcd_logo (void)#endif /* CONFIG_SPLASH_SCREEN */ #ifdef CONFIG_LCD_LOGO -bitmap_plot (0 ,0 ); +bitmap_plot (CONFIG_LCD_LOGO_X ,CONFIG_LCD_LOGO_Y );#endif /* CONFIG_LCD_LOGO */ #ifdef CONFIG_MPC823
cpu/mpc8xx/cpu_init.c +1 -1
@@ -62,7 +62,7 @@ void cpu_init_f (volatile immap_t * immr)#endif /* CONFIG_WATCHDOG */ /* SIUMCR - contains debug pin configuration (11-6) */ -#ifndef CONFIG_SVM_SC8xx +#if !defined (CONFIG_SVM_SC8xx) && !defined (CONFIG_RRVISION ) immr->im_siu_conf.sc_siumcr |=CFG_SIUMCR ;#else immr->im_siu_conf.sc_siumcr =CFG_SIUMCR ;
cpu/mpc8xx/fec.c +8 -0
@@ -837,6 +837,8 @@ static void fec_halt(struct eth_device* dev)#define PHY_ID_LSI80225B 0x0016f880/* LSI 80225/B */ #define PHY_ID_DM9161 0x0181B880/* Davicom DM9161 */ #define PHY_ID_KSM8995M 0x00221450/* MICREL KS8995MA */ +#define PHY_ID_DP83846A 0x20005c20/* NatSem DP83846A */ +#define PHY_ID_DP83847 0x20005c30/* NatSem DP83847 */ /* send command to phy using mii, wait for result */ static uint
@@ -924,6 +926,12 @@ static int mii_discover_phy(struct eth_device *dev)case PHY_ID_KSM8995M :printf ("MICREL KS8995M\n" );break ; +case PHY_ID_DP83846A : +printf ("NatSem DP83846A\n" ); +break ; +case PHY_ID_DP83847 : +printf ("NatSem DP83847\n" ); +break ;default :printf ("0x%08x\n" , phytype);break ;
cpu/mpc8xx/lcd.c +178 -7
244 lines not on this page · raw message
cpu/mpc8xx/video.c +20 -2
@@ -68,6 +68,10 @@ DECLARE_GLOBAL_DATA_PTR;#define VIDEO_INFO_X VIDEO_LOGO_WIDTH+8#define VIDEO_INFO_Y 16 +#if defined(CONFIG_RRVISION ) && defined(TTTECH_NO_SCREEN_INFO ) +#undef VIDEO_INFO +#endif +/************************************************************************/ /* ** VIDEO ENCODER CONSTANTS */ /************************************************************************/
@@ -115,10 +119,15 @@ DECLARE_GLOBAL_DATA_PTR;#define VIDEO_BURST_LEN (VIDEO_COLS/8)#ifdef VIDEO_MODE_YUYV + +#if defined(CONFIG_RRVISION ) +#define VIDEO_BG_COL 0x80108010/* Background color in YUYV format */ +#else #define VIDEO_BG_COL 0x80D880D8/* Background color in YUYV format */ +#endif /* CONFIG_RRVISION */ #else #define VIDEO_BG_COL 0xF8F8F8F8/* Background color in RGB format */ -#endif +#endif /* VIDEO_MODE_YUYV */ /************************************************************************/ /* ** FONT AND LOGO DATA */
@@ -132,6 +141,14 @@ DECLARE_GLOBAL_DATA_PTR;#define VIDEO_LOGO_WIDTH DEF_U_BOOT_LOGO_WIDTH#define VIDEO_LOGO_HEIGHT DEF_U_BOOT_LOGO_HEIGHT#define VIDEO_LOGO_ADDR &u_boot_logo + +#ifndef CONFIG_VIDEO_LOGO_X +#define CONFIG_VIDEO_LOGO_X 0 +#endif +#ifndef CONFIG_VIDEO_LOGO_Y +#define CONFIG_VIDEO_LOGO_Y 0 +#endif +#endif /************************************************************************/
@@ -1171,7 +1188,8 @@ static void *video_logo (void)char info[80 ];#endif /* VIDEO_INFO */ -easylogo_plot (VIDEO_LOGO_ADDR , screen, width,0 ,0 ); +easylogo_plot (VIDEO_LOGO_ADDR , screen, width,CONFIG_VIDEO_LOGO_X , +CONFIG_VIDEO_LOGO_Y );#ifdef VIDEO_INFO sprintf (info,"%s (%s - %s) " ,U_BOOT_VERSION , __DATE__, __TIME__);
include/configs/RRvision.h +166 -44
317 lines not on this page · raw message
include/configs/TTTech_env.h new file +99 -0
99 lines not on this page · raw message
tools/Makefile +20 -0
@@ -41,6 +41,26 @@ LIBFDT_OBJ_FILES = $(obj)fdt.o $(obj)fdt_ro.o $(obj)fdt_rw.o $(obj)fdt_strerror. LOGO_H = $(OBJTREE)/include/bmp_logo.h +ifeq ($(LOGO),palfin) +LOGO_BMP= logos/linux_logo_ttcontrol_palfin.bmp +else +ifeq ($(LOGO),ttcontrol) +LOGO_BMP= logos/linux_logo_ttcontrol.bmp +else +ifeq ($(LOGO),patria) +LOGO_BMP= logos/linux_logo_ttcontrol_patria.bmp +else +ifeq ($(LOGO),eaton) +LOGO_BMP= logos/linux_logo_ttcontrol_eaton.bmp +else +ifeq ($(LOGO),void) +LOGO_BMP= logos/linux_logo_void.bmp +endif +endif +endif +endif +endif + ifeq ($(LOGO_BMP),) LOGO_BMP= logos/denx.bmp endif
Signature · 10 lines
1.5.4.3 --- Gary Jennejohn ********************************************************************* DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: [email protected] *********************************************************************
PATCH 2/2 Update the RRvision port to a modern version of u-boot.
Quoted 39 lines · In message <[email protected]> you wrote:
The port now uses the CFI-driver so
board/RRvision/flash.chas been removed.Signed-off-by Gary Jennejohn <[email protected]>--- Makefile | 385 +++++++++++++++++++++++++++++++ board/RRvision/Makefile | 4 +- board/RRvision/RRvision.c | 9 +- board/RRvision/flash.c | 522 ------------------------------------------ common/lcd.c | 9 +- cpu/mpc8xx/cpu_init.c | 2 +- cpu/mpc8xx/fec.c | 8 + cpu/mpc8xx/lcd.c | 185 ++++++++++++++- cpu/mpc8xx/video.c | 22 ++- include/configs/RRvision.h | 210 +++++++++++++---- include/configs/TTTech_env.h | 99 ++++++++ tools/Makefile | 20 ++ 12 files changed, 891 insertions(+), 584 deletions(-) delete mode 100644 board/RRvision/flash.c create mode 100644 include/configs/TTTech_env.hcommon/lcd.c +7
-0@@ -70,6 +70,13 @@# if (CONSOLE_COLOR_WHITE >=BMP_LOGO_OFFSET )# error Default Color Map overlaps with Logo Color Map# endif + +# ifndef CONFIG_LCD_LOGO_X +# define CONFIG_LCD_LOGO_X 0 +# endif +# ifndef CONFIG_LCD_LOGO_Y +# define CONFIG_LCD_LOGO_Y 0 +# endif #endif DECLARE_GLOBAL_DATA_PTR ;
common/lcd.c static void *lcd_logo (void) · line 779
Quoted 6 lines
common/lcd.c +1
-1@@ -768,7 +775,7 @@ static void *lcd_logo (void)#endif /* CONFIG_SPLASH_SCREEN */ #ifdef CONFIG_LCD_LOGO -bitmap_plot (0 ,0 ); +bitmap_plot (CONFIG_LCD_LOGO_X ,CONFIG_LCD_LOGO_Y );#endif /* CONFIG_LCD_LOGO */
Umm... this was already submitted with your previous patch, I think.
Please make sure to split your parts orthogonally.
cpu/mpc8xx/cpu_init.c void cpu_init_f (volatile immap_t * immr) · line 66
Quoted 11 lines
cpu/mpc8xx/cpu_init.c +1
-1@@ -62,7 +62,7 @@ void cpu_init_f (volatile immap_t * immr)#endif /* CONFIG_WATCHDOG */ /* SIUMCR - contains debug pin configuration (11-6) */ -#ifndef CONFIG_SVM_SC8xx +#if !defined (CONFIG_SVM_SC8xx) && !defined (CONFIG_RRVISION ) immr->im_siu_conf.sc_siumcr |=CFG_SIUMCR ;
Ditto.
cpu/mpc8xx/fec.c static void fec_halt(struct eth_device* dev) · line 841
Quoted 11 lines
cpu/mpc8xx/cpu_init.c +0
-0immr->im_siu_conf.sc_siumcr =CFG_SIUMCR ;cpu/mpc8xx/fec.c +2
-0@@ -837,6 +837,8 @@ static void fec_halt(struct eth_device* dev)#define PHY_ID_LSI80225B 0x0016f880/* LSI 80225/B */ #define PHY_ID_DM9161 0x0181B880/* Davicom DM9161 */ #define PHY_ID_KSM8995M 0x00221450/* MICREL KS8995MA */ +#define PHY_ID_DP83846A 0x20005c20/* NatSem DP83846A */ +#define PHY_ID_DP83847 0x20005c30/* NatSem DP83847 */
Ditto!!!
cpu/mpc8xx/lcd.c
Quoted 4 lines
cpu/mpc8xx/lcd.c +0
-0
Please make a separate patch so the responsible custodian can pick it up.
cpu/mpc8xx/lcd.c vidinfo_t panel_info = { · line 121
Quoted 4 lines
vidinfo_t panel_info = { 640, 480, 212, 158, CFG_HIGH, CFG_HIGH, CFG_LOW, CFG_LOW, CFG_HIGH,cpu/mpc8xx/lcd.c +1
-1-3 ,0 ,0 ,1 ,1 ,144 ,2 ,0 ,33 +3 ,0 ,0 ,1 ,1 ,88 ,2 ,0 ,33
Indentation by TABs, please (here and everywhere else).
cpu/mpc8xx/lcd.c
Quoted 2 lines
cpu/mpc8xx/lcd.c +2
-0+vidinfo_t panel_info = { +800 ,/* Number of columns (i.e. 640) */
...
Ditto. etc. etc.
include/configs/RRvision.h line 32
Quoted 9 lines
include/configs/RRvision.h +1
-0@@ -29,12 +29,19 @@#define __CONFIG_H/* +* Extra environment settings common for TTTech. Moved fron include
Typo - "from"
include/configs/RRvision.h line 58
Quoted 6 lines
include/configs/RRvision.h +1
-1@@ -48,39 +55,93 @@#define CONFIG_BOOTDELAY 3/* autoboot after 5 seconds */ #endif -#define CONFIG_CLOCKS_IN_MHZ 1/* clocks passsed to Linux in MHz */ +#undef CONFIG_CLOCKS_IN_MHZ/* clocks passsed to Linux in MHz */
Just delete this line, please.
include/configs/RRvision.h line 60
Quoted 2 lines
include/configs/RRvision.h +1
-1-#define CONFIG_PREBOOT "setenv stdout serial" +#define CONFIG_PREBOOT "run holdpower; run sensor_supply_on"
Alignment by TABs, please.
include/configs/RRvision.h line 68
Quoted 6 lines
include/configs/RRvision.h +6
-0+#define CONFIG_ETHADDR 00:50:C2:00:E0:70 +#define CONFIG_OVERWRITE_ETHADDR_ONCE 1 +#define CONFIG_IPADDR 10.120.30.2 +#define CONFIG_SERVERIP 10.120.20.27 +#define CONFIG_NETMASK 255.255.0.0 +#define CONFIG_GATEWAYIP 10.255.255.254
Please delete this block. We do not accept such settings in default config files.
include/configs/RRvision.h line 72
Quoted 3 lines
include/configs/RRvision.h +3
-0+#define CONFIG_STDIN "serial" +#define CONFIG_STDOUT "serial" +#define CONFIG_STDERR "serial"
Is this really necessary?
include/configs/RRvision.h line 160
Quoted 7 lines
include/configs/RRvision.h +6
-0+/* +* Note that the ocan driver under Linux does its own mapping, so we +* don't need it here. Also note that enabling this needs some work +* because the default mapping below is wrong (CS3 is the TTP-Controller +* not the CAN) +*/ #undef CONFIG_CAN_DRIVER/* CAN Driver support disabled */
Then please delete this, plus the wrong mappings below.
include/configs/RRvision.h line 217
Quoted 6 lines
include/configs/RRvision.h +2
-2-#define I2C_SDA (bit) if(bit) immr->im_cpm.cp_pbdat |= PB_SDA; \ +#define I2C_SDA (bit) if((bit)) immr->im_cpm.cp_pbdat |= PB_SDA; \ else immr->im_cpm.cp_pbdat &= ~PB_SDA -#define I2C_SCL (bit) if(bit) immr->im_cpm.cp_pbdat |= PB_SCL; \ +#define I2C_SCL (bit) if((bit)) immr->im_cpm.cp_pbdat |= PB_SCL; \ else immr->im_cpm.cp_pbdat &= ~PB_SCL
Please wrap these in do { ... } while (0) constructs.
include/configs/RRvision.h line 237
Quoted 5 lines
include/configs/RRvision.h +3
-0+#undef CONFIG_CMD_REGINFO/* could be useful */ #undef CONFIG_CMD_PCMCIA#undef CONFIG_CMD_IDE +#undef CONFIG_CMD_FPGA +#undef CONFIG_CMD_SETGETDCR/* DCR support on 4xx */
Is it really necessary to undef stuff that is not definued anyway?
include/configs/RRvision.h line 519
Quoted 7 lines
include/configs/RRvision.h +4
-0+/* +* Note that the CAN chip uses CS7 (not 3) so before enabling this, +* correct the setting. +*/ #ifndef CONFIG_CAN_DRIVER #define CFG_OR3_PRELIM CFG_OR2_PRELIM#define CFG_BR3_PRELIM ((SDRAM_BASE3_PRELIM & BR_BA_MSK) | BR_MS_UPMA | BR_V )
Please either correct it now, so it can be just enabled, or delete alltogether.
include/configs/TTTech_env.h line 3
Quoted 9 lines
include/configs/TTTech_env.h new file +3
-0@@ -0,0 +1,99 @@ +/* +* (C) Copyright 2008 +* Wolfgang Denk, DENX Software Engineering, wd at denx.de.
This is not correct. Please do not blame me foir this. I did not write this file.
Again - indentation and alignment by TABs, please.
Quoted 16 lines
index 8533a8e..f68acba 100644
tools/Makefile +9
-0@@ -41,6 +41,26 @@ LIBFDT_OBJ_FILES = $(obj)fdt.o $(obj)fdt_ro.o $(obj)fdt_rw.o $(obj)fdt_strerror. LOGO_H = $(OBJTREE)/include/bmp_logo.h +ifeq ($(LOGO),palfin) +LOGO_BMP= logos/linux_logo_ttcontrol_palfin.bmp +else +ifeq ($(LOGO),ttcontrol) +LOGO_BMP= logos/linux_logo_ttcontrol.bmp +else +ifeq ($(LOGO),patria) +LOGO_BMP= logos/linux_logo_ttcontrol_patria.bmp +else
tools/Makefile LIBFDT_OBJ_FILES = $(obj)fdt.o $(obj)fdt_ro.o $(obj)fdt_rw.o $(obj)fdt_strerror. · line 62
Quoted 10 lines
tools/Makefile +10
-0+ifeq ($(LOGO),eaton) +LOGO_BMP= logos/linux_logo_ttcontrol_eaton.bmp +else +ifeq ($(LOGO),void) +LOGO_BMP= logos/linux_logo_void.bmp +endif +endif +endif +endif +endif
Do we really need such a compelx construct here?
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 The one who says it cannot be done should never interrupt the one who is doing it.
PATCH 2/2 Update the RRvision port to a modern version of u-boot.
Quoted 10 lines · On Thu, 19 Jun 2008 16:51:52 +0200 Wolfgang Denk <[email protected]> wrote:
Quoted 8 lines · In message <[email protected]> you wrote:
+/*
+ * Note that the CAN chip uses CS7 (not 3) so before enabling this,
+ * correct the setting.
+ */
#ifndefCONFIG_CAN_DRIVER
#defineCFG_OR3_PRELIMCFG_OR2_PRELIM
#defineCFG_BR3_PRELIM((SDRAM_BASE3_PRELIM&BR_BA_MSK) |BR_MS_UPMA|BR_V)
Quoted 3 lines
Please either correct it now, so it can be just enabled, or delete alltogether.
This is a reminder from the customer to himself; that's why I left it there. I have no idea how to correct it. However, I'll remove it if you consider it to be inappropriate.
---
Gary Jennejohn
*********************************************************************
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de
*********************************************************************
PATCH 2/2 Update the RRvision port to a modern version of u-boot.
Quoted 7 lines · In message <[email protected]> you wrote:
Quoted 3 lines
Please either correct it now, so it can be just enabled, or delete alltogether.
This is a reminder from the customer to himself; that's why I left it there. I have no idea how to correct it. However, I'll remove it if you consider it to be inappropriate.
Please remove it if it cannot be corrected. We have git to track the history when needed.
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 Accident: A condition in which presence of mind is good, but absence of body is better.
PATCH 2/2 Update the RRvision port to a modern version of u-boot.
Quoted 5 lines · On Thu, 19 Jun 2008 20:34:38 +0200 Wolfgang Denk <[email protected]> wrote:
Quoted 4 lines · In message <[email protected]> you wrote:
Quoted 3 lines
Please either correct it now, so it can be just enabled, or delete alltogether.
Quoted 7 lines
Quoted 3 lines
This is a reminder from the customer to himself; that's why I left it there. I have no idea how to correct it. However, I'll remove it if you consider it to be inappropriate.
Please remove it if it cannot be corrected. We have git to track the history when needed.
There's no history in git. Almost all the changes come from a tree which the customer maintained locally. But I'll remove this and other customer-hacks anyway.
---
Gary Jennejohn
*********************************************************************
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de
*********************************************************************
PATCH 2/2 Update the RRvision port to a modern version of u-boot.
In reply to Wolfgang DenkQuoted 6 lines · On Thu, 19 Jun 2008 16:51:52 +0200 Wolfgang Denk <[email protected]> wrote:
cpu/mpc8xx/lcd.c vidinfo_t panel_info = { · line 121
Quoted 4 lines · In message <[email protected]> you wrote:
vidinfo_t panel_info = { 640, 480, 212, 158, CFG_HIGH, CFG_HIGH, CFG_LOW, CFG_LOW, CFG_HIGH,cpu/mpc8xx/lcd.c +1
-1-3 ,0 ,0 ,1 ,1 ,144 ,2 ,0 ,33 +3 ,0 ,0 ,1 ,1 ,88 ,2 ,0 ,33
Quoted 8 lines
Indentation by TABs, please (here and everywhere else).
Review
Quoted 2 lines
(quoted diff) +2
-0+vidinfo_t panel_info = { + 800, /* Number of columns (i.e. 640) */...
Ditto. etc. etc.
None of the entries in this file are indented using TABS. I merely followed the existing formatting (4 spaces).
---
Gary Jennejohn
*********************************************************************
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de
*********************************************************************
PATCH 2/2 Update the RRvision port to a modern version of u-boot.
Quoted 11 lines · In message <[email protected]> you wrote:
Quoted 11 lines
cpu/mpc8xx/lcd.c vidinfo_t panel_info = { · line 121
Quoted 4 lines · In message <[email protected]> you wrote:
vidinfo_t panel_info = { 640, 480, 212, 158, CFG_HIGH, CFG_HIGH, CFG_LOW, CFG_LOW, CFG_HIGH,cpu/mpc8xx/lcd.c +1
-1-3 ,0 ,0 ,1 ,1 ,144 ,2 ,0 ,33 +3 ,0 ,0 ,1 ,1 ,88 ,2 ,0 ,33 Indentation by TABs, please (here and everywhere else).
Quoted 2 lines
(quoted diff) +2
-0+vidinfo_t panel_info = { + 800, /* Number of columns (i.e. 640) */
Quoted 7 lines
Quoted 4 lines
...
Ditto. etc. etc.
None of the entries in this file are indented using TABS. I merely followed the existing formatting (4 spaces).
Well, since you change the file anyway, maybe you could be so kind and help and clean it up?
Best regards,
Wolfgang Denk
Signature · 6 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
Common sense and a sense of humor are the same thing, moving at
different speeds. A sense of humor is just common sense, dancing.
- Clive James