Merge branch 'master' of git://www.denx.de/git/u-boot-tq-group
This commit is contained in:
commit
8410d39070
3 changed files with 13 additions and 8 deletions
|
@ -561,7 +561,7 @@ void led_init(void)
|
||||||
gpt->gpt6.emsr |= 0x00000024;
|
gpt->gpt6.emsr |= 0x00000024;
|
||||||
gpt->gpt7.emsr |= 0x00000024;
|
gpt->gpt7.emsr |= 0x00000024;
|
||||||
|
|
||||||
|
#ifndef CONFIG_TQM5200S
|
||||||
/* enable SM501 GPIO control (in both power modes) */
|
/* enable SM501 GPIO control (in both power modes) */
|
||||||
*(vu_long *) (SM501_MMIO_BASE+SM501_POWER_MODE0_GATE) |=
|
*(vu_long *) (SM501_MMIO_BASE+SM501_POWER_MODE0_GATE) |=
|
||||||
POWER_MODE_GATE_GPIO_PWM_I2C;
|
POWER_MODE_GATE_GPIO_PWM_I2C;
|
||||||
|
@ -574,6 +574,7 @@ void led_init(void)
|
||||||
|
|
||||||
/* configure SM501 gpio pins 48-51 as output */
|
/* configure SM501 gpio pins 48-51 as output */
|
||||||
*(vu_long *) (SM501_MMIO_BASE+SM501_GPIO_DATA_DIR_HIGH) |= (0xF << 16);
|
*(vu_long *) (SM501_MMIO_BASE+SM501_GPIO_DATA_DIR_HIGH) |= (0xF << 16);
|
||||||
|
#endif /* !CONFIG_TQM5200S */
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -650,7 +651,7 @@ int do_led(char *argv[])
|
||||||
gpt->gpt7.emsr &= ~(1 << 4);
|
gpt->gpt7.emsr &= ~(1 << 4);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
#ifndef CONFIG_TQM5200S
|
||||||
case 24:
|
case 24:
|
||||||
if (strcmp (argv[3], "on") == 0) {
|
if (strcmp (argv[3], "on") == 0) {
|
||||||
*(vu_long *) (SM501_MMIO_BASE+SM501_GPIO_DATA_LOW) |=
|
*(vu_long *) (SM501_MMIO_BASE+SM501_GPIO_DATA_LOW) |=
|
||||||
|
@ -730,7 +731,7 @@ int do_led(char *argv[])
|
||||||
~(0x1 << 19);
|
~(0x1 << 19);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
#endif /* !CONFIG_TQM5200S */
|
||||||
default:
|
default:
|
||||||
printf ("%s: invalid led number %s\n", __FUNCTION__, argv[2]);
|
printf ("%s: invalid led number %s\n", __FUNCTION__, argv[2]);
|
||||||
return 1;
|
return 1;
|
||||||
|
@ -1110,7 +1111,7 @@ int do_rs232(char *argv[])
|
||||||
return error_status;
|
return error_status;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef CONFIG_FO300
|
#if !defined(CONFIG_FO300) && !defined(CONFIG_TQM5200S)
|
||||||
static void sm501_backlight (unsigned int state)
|
static void sm501_backlight (unsigned int state)
|
||||||
{
|
{
|
||||||
if (state == BL_ON) {
|
if (state == BL_ON) {
|
||||||
|
@ -1120,7 +1121,7 @@ static void sm501_backlight (unsigned int state)
|
||||||
*(vu_long *)(SM501_MMIO_BASE+SM501_PANEL_DISPLAY_CONTROL) &=
|
*(vu_long *)(SM501_MMIO_BASE+SM501_PANEL_DISPLAY_CONTROL) &=
|
||||||
~((1 << 26) | (1 << 27));
|
~((1 << 26) | (1 << 27));
|
||||||
}
|
}
|
||||||
#endif
|
#endif /* !CONFIG_FO300 & !CONFIG_TQM5200S */
|
||||||
|
|
||||||
int cmd_fkt(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
int cmd_fkt(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||||
{
|
{
|
||||||
|
@ -1160,7 +1161,7 @@ int cmd_fkt(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||||
else
|
else
|
||||||
printf ("Error\n");
|
printf ("Error\n");
|
||||||
return rcode;
|
return rcode;
|
||||||
#ifndef CONFIG_FO300
|
#if !defined(CONFIG_FO300) && !defined(CONFIG_TQM5200S)
|
||||||
} else if (strncmp (argv[1], "backlight", 4) == 0) {
|
} else if (strncmp (argv[1], "backlight", 4) == 0) {
|
||||||
if (strncmp (argv[2], "on", 2) == 0) {
|
if (strncmp (argv[2], "on", 2) == 0) {
|
||||||
sm501_backlight (BL_ON);
|
sm501_backlight (BL_ON);
|
||||||
|
@ -1170,7 +1171,7 @@ int cmd_fkt(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||||
sm501_backlight (BL_OFF);
|
sm501_backlight (BL_OFF);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
#endif
|
#endif /* !CONFIG_FO300 & !CONFIG_TQM5200S */
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -1228,8 +1229,10 @@ U_BOOT_CMD(
|
||||||
" - loopback plug for X83 required\n"
|
" - loopback plug for X83 required\n"
|
||||||
"fkt rs232 number\n"
|
"fkt rs232 number\n"
|
||||||
" - loopback plug(s) for X2 required\n"
|
" - loopback plug(s) for X2 required\n"
|
||||||
|
#ifndef CONFIG_TQM5200S
|
||||||
"fkt backlight on/off\n"
|
"fkt backlight on/off\n"
|
||||||
" - switch backlight on or off\n"
|
" - switch backlight on or off\n"
|
||||||
|
#endif /* !CONFIG_TQM5200S */
|
||||||
);
|
);
|
||||||
#elif defined(CONFIG_FO300)
|
#elif defined(CONFIG_FO300)
|
||||||
U_BOOT_CMD(
|
U_BOOT_CMD(
|
||||||
|
|
|
@ -543,6 +543,7 @@ int last_stage_init (void)
|
||||||
__asm__ volatile ("sync");
|
__asm__ volatile ("sync");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifndef CONFIG_TQM5200S /* The TQM5200S has no SM501 grafic controller */
|
||||||
/*
|
/*
|
||||||
* Check for Grafic Controller
|
* Check for Grafic Controller
|
||||||
*/
|
*/
|
||||||
|
@ -586,6 +587,7 @@ int last_stage_init (void)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
#endif /* !CONFIG_TQM5200S */
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_VIDEO_SM501
|
#ifdef CONFIG_VIDEO_SM501
|
||||||
|
|
|
@ -547,7 +547,7 @@
|
||||||
# if defined (CONFIG_TQM5200_REV100)
|
# if defined (CONFIG_TQM5200_REV100)
|
||||||
# error TQM5200 REV100 not supported on STK52XX REV200 or above
|
# error TQM5200 REV100 not supported on STK52XX REV200 or above
|
||||||
# else/* TQM5200 REV200 and above */
|
# else/* TQM5200 REV200 and above */
|
||||||
# define CFG_GPS_PORT_CONFIG 0x91500004
|
# define CFG_GPS_PORT_CONFIG 0x91500404
|
||||||
# endif
|
# endif
|
||||||
# endif
|
# endif
|
||||||
#elif defined (CONFIG_FO300)
|
#elif defined (CONFIG_FO300)
|
||||||
|
|
Loading…
Reference in a new issue