minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-13 14:06:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

powerpc/qixis: enable qixis dump command and add switch dumping command

Browse Source 
Remove #ifdef so that "qixis dump" command is always available

Add "qixis_reset switch" command to dump switch settings
Qixis doesn't have 1:1 switch mapping. We need to reverse engineer from
registers to figure out switch settings. Not all bits are available.

Signed-off-by: York Sun <yorksun@freescale.com>
Signed-off-by: Shaveta Leekha <shaveta@freescale.com>
Signed-off-by: Poonam Aggrwal <poonam.aggrwal@freescale.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>
This commit is contained in:
Shaveta Leekha 2012-12-23 19:25:35 +00:00 committed by Andy Fleming
parent b5b06fb7b0
commit c6cef92f63
2 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
board/freescale/common/qixis.c
View File

@ -76,6 +76,27 @@ char *qixis_read_tag(char *buf)
return buf; return buf;
} }
/*
* return the string of binary of u8 in the format of
* 1010 10_0. The masked bit is filled as underscore.
*/
const char *byte_to_binary_mask(u8 val, u8 mask, char *buf)
{
char *ptr;
int i;
ptr = buf;
for (i = 0x80; i > 0x08 ; i >>= 1, ptr++)
*ptr = (val & i) ? '1' : ((mask & i) ? '_' : '0');
*(ptr++) = ' ';
for (i = 0x08; i > 0 ; i >>= 1, ptr++)
*ptr = (val & i) ? '1' : ((mask & i) ? '_' : '0');
*ptr = '\0';
return buf;
}
void qixis_reset(void) void qixis_reset(void)
{ {
QIXIS_WRITE(rst_ctl, QIXIS_RST_CTL_RESET); QIXIS_WRITE(rst_ctl, QIXIS_RST_CTL_RESET);
@ -107,7 +128,6 @@ void set_altbank(void)
QIXIS_WRITE(brdcfg[0], reg); QIXIS_WRITE(brdcfg[0], reg);
} }
#ifdef DEBUG
static void qixis_dump_regs(void) static void qixis_dump_regs(void)
{ {
int i; int i;
@ -137,7 +157,14 @@ static void qixis_dump_regs(void)
printf("stat_sys = %02x\n", QIXIS_READ(stat_sys)); printf("stat_sys = %02x\n", QIXIS_READ(stat_sys));
printf("stat_alrm = %02x\n", QIXIS_READ(stat_alrm)); printf("stat_alrm = %02x\n", QIXIS_READ(stat_alrm));
} }
#endif
static void __qixis_dump_switch(void)
{
puts("Reverse engineering switch is not implemented for this board\n");
}
void qixis_dump_switch(void)
__attribute__((weak, alias("__qixis_dump_switch")));
int qixis_reset_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int qixis_reset_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
@ -168,16 +195,13 @@ int qixis_reset_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
return 0; return 0;
} }
} }
} } else if (strcmp(argv[1], "dump") == 0) {
#ifdef DEBUG
else if (strcmp(argv[1], "dump") == 0) {
qixis_dump_regs(); qixis_dump_regs();
return 0; return 0;
} } else if (strcmp(argv[1], "switch") == 0) {
#endif qixis_dump_switch();
return 0;
else { } else {
printf("Invalid option: %s\n", argv[1]); printf("Invalid option: %s\n", argv[1]);
return 1; return 1;
} }
@ -192,7 +216,6 @@ U_BOOT_CMD(
"qixis_reset altbank - reset to alternate bank\n" "qixis_reset altbank - reset to alternate bank\n"
"qixis watchdog <watchdog_period> - set the watchdog period\n" "qixis watchdog <watchdog_period> - set the watchdog period\n"
" period: 1s 2s 4s 8s 16s 32s 1min 2min 4min 8min\n" " period: 1s 2s 4s 8s 16s 32s 1min 2min 4min 8min\n"
#ifdef DEBUG
"qixis_reset dump - display the QIXIS registers\n" "qixis_reset dump - display the QIXIS registers\n"
#endif "qixis_reset switch - display switch\n"
); );

1
board/freescale/common/qixis.h
View File

@ -91,6 +91,7 @@ void qixis_write(unsigned int reg, u8 value);
u16 qixis_read_minor(void); u16 qixis_read_minor(void);
char *qixis_read_time(char *result); char *qixis_read_time(char *result);
char *qixis_read_tag(char *buf); char *qixis_read_tag(char *buf);
const char *byte_to_binary_mask(u8 val, u8 mask, char *buf);
#define QIXIS_READ(reg) qixis_read(offsetof(struct qixis, reg)) #define QIXIS_READ(reg) qixis_read(offsetof(struct qixis, reg))
#define QIXIS_WRITE(reg, value) qixis_write(offsetof(struct qixis, reg), value) #define QIXIS_WRITE(reg, value) qixis_write(offsetof(struct qixis, reg), value)