phone-side
/
uboot-mt623x
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix Makefile for "CHANGELOG" target 

Merge with /home/sr/git/u-boot/4xx-idcr
This commit is contained in:
Wolfgang Denk 2006-10-25 00:43:17 +02:00
parent 7c52c4b943 af9e1f5b9e
commit 4e53a25855
3 changed files with 140 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG
View File

@ -1,3 +1,10 @@
commit 7c52c4b943ff52bbe8796a7e2d3e476ceaf3f512
Author: Wolfgang Denk <wd@denx.de>
Date: Tue Oct 24 21:35:55 2006 +0200
Switch to automatically generated CHANGELOG file.
(use "make CHANGELOG" to update it from time to time)
commit 7ade0c634a979c32fa91a74e8f5775f24651fbe6 commit 7ade0c634a979c32fa91a74e8f5775f24651fbe6
Author: Stefan Roese <sr@denx.de> Author: Stefan Roese <sr@denx.de>
Date: Tue Oct 24 18:06:48 2006 +0200 Date: Tue Oct 24 18:06:48 2006 +0200

7
Makefile
View File

@ -318,9 +318,6 @@ $(obj)System.map: $(obj)u-boot
grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | \ grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | \
sort > $(obj)System.map sort > $(obj)System.map
CHANGELOG:
git log --no-merges U-Boot-1_1_5.. > $@
######################################################################### #########################################################################
else else
all $(obj)u-boot.hex $(obj)u-boot.srec $(obj)u-boot.bin \ all $(obj)u-boot.hex $(obj)u-boot.srec $(obj)u-boot.bin \
@ -331,6 +328,10 @@ dep tags ctags etags $(obj)System.map:
@ exit 1 @ exit 1
endif endif
.PHONY : CHANGELOG
CHANGELOG:
git log --no-merges U-Boot-1_1_5.. > $@
######################################################################### #########################################################################
unconfig: unconfig:

131
common/cmd_dcr.c
View File

@ -31,6 +31,9 @@
#if defined(CONFIG_4xx) && (CONFIG_COMMANDS & CFG_CMD_SETGETDCR) #if defined(CONFIG_4xx) && (CONFIG_COMMANDS & CFG_CMD_SETGETDCR)
unsigned long get_dcr (unsigned short);
unsigned long set_dcr (unsigned short, unsigned long);
/* ======================================================================= /* =======================================================================
* Interpreter command to retrieve an AMCC PPC 4xx Device Control Register * Interpreter command to retrieve an AMCC PPC 4xx Device Control Register
* ======================================================================= * =======================================================================
@ -64,8 +67,6 @@ int do_getdcr ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[] )
*/ */
int do_setdcr (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) int do_setdcr (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
{ {
unsigned long get_dcr (unsigned short);
unsigned long set_dcr (unsigned short, unsigned long);
unsigned short dcrn; /* Device Control Register Num */ unsigned short dcrn; /* Device Control Register Num */
unsigned long value; unsigned long value;
@ -106,6 +107,120 @@ int do_setdcr (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
return 0; return 0;
} }
/* =======================================================================
* Interpreter command to retrieve an register value through AMCC PPC 4xx
* Device Control Register inderect addressing.
* =======================================================================
*/
int do_getidcr (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
unsigned short adr_dcrn; /* Device Control Register Num for Address */
unsigned short dat_dcrn; /* Device Control Register Num for Data */
unsigned short offset; /* Register's offset */
unsigned long value; /* Register's value */
char *ptr = NULL;
char buf[80];
/* Validate arguments */
if (argc < 3) {
printf ("Usage:\n%s\n", cmdtp->usage);
return 1;
}
/* Find out whether ther is '.' (dot) symbol in the first parameter. */
strncpy (buf, argv[1], sizeof(buf)-1);
buf[sizeof(buf)-1] = 0; /* will guarantee zero-end string */
ptr = strchr (buf, '.');
if (ptr != NULL) {
/* First parameter has format adr_dcrn.dat_dcrn */
*ptr++ = 0; /* erase '.', create zero-end string */
adr_dcrn = (unsigned short) simple_strtoul (buf, NULL, 16);
dat_dcrn = (unsigned short) simple_strtoul (ptr, NULL, 16);
} else {
/*
* First parameter has format adr_dcrn; dat_dcrn will be
* calculated as adr_dcrn+1.
*/
adr_dcrn = (unsigned short) simple_strtoul (buf, NULL, 16);
dat_dcrn = adr_dcrn+1;
}
/* Register's offset */
offset = (unsigned short) simple_strtoul (argv[2], NULL, 16);
/* Disable interrupts */
disable_interrupts ();
/* Set offset */
set_dcr (adr_dcrn, offset);
/* get data */
value = get_dcr (dat_dcrn);
/* Enable interrupts */
enable_interrupts ();
printf ("%04x.%04x-%04x Read %08lx\n", adr_dcrn, dat_dcrn, offset, value);
return 0;
}
/* =======================================================================
* Interpreter command to update an register value through AMCC PPC 4xx
* Device Control Register inderect addressing.
* =======================================================================
*/
int do_setidcr (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
{
unsigned short adr_dcrn; /* Device Control Register Num for Address */
unsigned short dat_dcrn; /* Device Control Register Num for Data */
unsigned short offset; /* Register's offset */
unsigned long value; /* Register's value */
char *ptr = NULL;
char buf[80];
/* Validate arguments */
if (argc < 4) {
printf ("Usage:\n%s\n", cmdtp->usage);
return 1;
}
/* Find out whether ther is '.' (dot) symbol in the first parameter. */
strncpy (buf, argv[1], sizeof(buf)-1);
buf[sizeof(buf)-1] = 0; /* will guarantee zero-end string */
ptr = strchr (buf, '.');
if (ptr != NULL) {
/* First parameter has format adr_dcrn.dat_dcrn */
*ptr++ = 0; /* erase '.', create zero-end string */
adr_dcrn = (unsigned short) simple_strtoul (buf, NULL, 16);
dat_dcrn = (unsigned short) simple_strtoul (ptr, NULL, 16);
} else {
/*
* First parameter has format adr_dcrn; dat_dcrn will be
* calculated as adr_dcrn+1.
*/
adr_dcrn = (unsigned short) simple_strtoul (buf, NULL, 16);
dat_dcrn = adr_dcrn+1;
}
/* Register's offset */
offset = (unsigned short) simple_strtoul (argv[2], NULL, 16);
/* New value */
value = (unsigned long) simple_strtoul (argv[3], NULL, 16);
/* Disable interrupts */
disable_interrupts ();
/* Set offset */
set_dcr (adr_dcrn, offset);
/* set data */
set_dcr (dat_dcrn, value);
/* Enable interrupts */
enable_interrupts ();
printf ("%04x.%04x-%04x Write %08lx\n", adr_dcrn, dat_dcrn, offset, value);
return 0;
}
/***************************************************/ /***************************************************/
U_BOOT_CMD( U_BOOT_CMD(
@ -119,4 +234,16 @@ U_BOOT_CMD(
"dcrn - set a DCR's value.\n" "dcrn - set a DCR's value.\n"
); );
U_BOOT_CMD(
getidcr, 3, 1, do_getidcr,
"getidcr - Get a register value via indirect DCR addressing\n",
"adr_dcrn[.dat_dcrn] offset - write offset to adr_dcrn, read value from dat_dcrn.\n"
);
U_BOOT_CMD(
setidcr, 4, 1, do_setidcr,
"setidcr - Set a register value via indirect DCR addressing\n",
"adr_dcrn[.dat_dcrn] offset value - write offset to adr_dcrn, write value to dat_dcrn.\n"
);
#endif /* CONFIG_4xx & CFG_CMD_SETGETDCR */ #endif /* CONFIG_4xx & CFG_CMD_SETGETDCR */