ppc4xx: Fix PMC440 BSP commands
This patch fixes the PMC440 BSP commands painit and selfreset Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com> Signed-off-by: Stefan Roese <sr@denx.de>
This commit is contained in:
parent
76b565b69f
commit
75183b1a7f
|
@ -26,6 +26,9 @@
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
#include <asm/cache.h>
|
#include <asm/cache.h>
|
||||||
#include <asm/processor.h>
|
#include <asm/processor.h>
|
||||||
|
#if defined(CONFIG_LOGBUFFER)
|
||||||
|
#include <logbuff.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "pmc440.h"
|
#include "pmc440.h"
|
||||||
|
|
||||||
|
@ -343,14 +346,11 @@ extern env_t *env_ptr;
|
||||||
|
|
||||||
int do_painit(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
int do_painit(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||||
{
|
{
|
||||||
u32 memsize;
|
u32 pram, nextbase, base;
|
||||||
u32 pram, env_base;
|
|
||||||
char *v;
|
char *v;
|
||||||
u32 param;
|
u32 param;
|
||||||
ulong *lptr;
|
ulong *lptr;
|
||||||
|
|
||||||
memsize = gd->bd->bi_memsize;
|
|
||||||
|
|
||||||
v = getenv("pram");
|
v = getenv("pram");
|
||||||
if (v)
|
if (v)
|
||||||
pram = simple_strtoul(v, NULL, 10);
|
pram = simple_strtoul(v, NULL, 10);
|
||||||
|
@ -359,21 +359,42 @@ int do_painit(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
param = memsize - (pram << 10);
|
base = gd->bd->bi_memsize;
|
||||||
|
#if defined(CONFIG_LOGBUFFER)
|
||||||
|
base -= LOGBUFF_LEN + LOGBUFF_OVERHEAD;
|
||||||
|
#endif
|
||||||
|
/*
|
||||||
|
* gd->bd->bi_memsize == physical ram size - CFG_MEM_TOP_HIDE
|
||||||
|
*/
|
||||||
|
param = base - (pram << 10);
|
||||||
printf("PARAM: @%08x\n", param);
|
printf("PARAM: @%08x\n", param);
|
||||||
|
debug("memsize=0x%08x, base=0x%08x\n", gd->bd->bi_memsize, base);
|
||||||
|
|
||||||
|
/* clear entire PA ram */
|
||||||
memset((void*)param, 0, (pram << 10));
|
memset((void*)param, 0, (pram << 10));
|
||||||
env_base = memsize - 4096 - ((CONFIG_ENV_SIZE + 4096) & ~(4096-1));
|
|
||||||
memcpy((void*)env_base, env_ptr, CONFIG_ENV_SIZE);
|
|
||||||
|
|
||||||
lptr = (ulong*)memsize;
|
/* reserve 4k for pointer field */
|
||||||
*(--lptr) = CONFIG_ENV_SIZE;
|
nextbase = base - 4096;
|
||||||
*(--lptr) = memsize - env_base;
|
lptr = (ulong*)(base);
|
||||||
*(--lptr) = crc32(0, (void*)(memsize - 0x08), 0x08);
|
|
||||||
*(--lptr) = 0;
|
|
||||||
|
|
||||||
/* make sure data can be accessed through PCI */
|
/*
|
||||||
flush_dcache_range(param, param + (pram << 10) - 1);
|
* *(--lptr) = item_size;
|
||||||
|
* *(--lptr) = base - item_base = distance from field top;
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* env is first (4k aligned) */
|
||||||
|
nextbase -= ((CONFIG_ENV_SIZE + 4096 - 1) & ~(4096 - 1));
|
||||||
|
memcpy((void*)nextbase, env_ptr, CONFIG_ENV_SIZE);
|
||||||
|
*(--lptr) = CONFIG_ENV_SIZE; /* size */
|
||||||
|
*(--lptr) = base - nextbase; /* offset | type=0 */
|
||||||
|
|
||||||
|
/* free section */
|
||||||
|
*(--lptr) = nextbase - param; /* size */
|
||||||
|
*(--lptr) = (base - param) | 126; /* offset | type=126 */
|
||||||
|
|
||||||
|
/* terminate pointer field */
|
||||||
|
*(--lptr) = crc32(0, (void*)(base - 0x10), 0x10);
|
||||||
|
*(--lptr) = 0; /* offset=0 -> terminator */
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
U_BOOT_CMD(
|
U_BOOT_CMD(
|
||||||
|
@ -385,28 +406,11 @@ U_BOOT_CMD(
|
||||||
|
|
||||||
int do_selfreset(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
int do_selfreset(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||||
{
|
{
|
||||||
if (argc > 1) {
|
in_be32((void*)CONFIG_SYS_RESET_BASE);
|
||||||
if (argv[1][0] == '0') {
|
|
||||||
/* assert */
|
|
||||||
printf("self-reset# asserted\n");
|
|
||||||
out_be32((void*)GPIO0_TCR,
|
|
||||||
in_be32((void*)GPIO0_TCR) | GPIO0_SELF_RST);
|
|
||||||
} else {
|
|
||||||
/* deassert */
|
|
||||||
printf("self-reset# deasserted\n");
|
|
||||||
out_be32((void*)GPIO0_TCR,
|
|
||||||
in_be32((void*)GPIO0_TCR) & ~GPIO0_SELF_RST);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
printf("self-reset# is %s\n",
|
|
||||||
in_be32((void*)GPIO0_TCR) & GPIO0_SELF_RST ?
|
|
||||||
"active" : "inactive");
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
U_BOOT_CMD(
|
U_BOOT_CMD(
|
||||||
selfreset, 2, 1, do_selfreset,
|
selfreset, 1, 1, do_selfreset,
|
||||||
"selfreset- assert self-reset# signal\n",
|
"selfreset- assert self-reset# signal\n",
|
||||||
NULL
|
NULL
|
||||||
);
|
);
|
||||||
|
|
Loading…
Reference in a new issue