mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-12 07:57:21 +00:00
54841ab50c
The hush shell dynamically allocates (and re-allocates) memory for the
argument strings in the "char *argv[]" argument vector passed to
commands. Any code that modifies these pointers will cause serious
corruption of the malloc data structures and crash U-Boot, so make
sure the compiler can check that no such modifications are being done
by changing the code into "char * const argv[]".
This modification is the result of debugging a strange crash caused
after adding a new command, which used the following argument
processing code which has been working perfectly fine in all Unix
systems since version 6 - but not so in U-Boot:
int main (int argc, char **argv)
{
while (--argc > 0 && **++argv == '-') {
/* ====> */ while (*++*argv) {
switch (**argv) {
case 'd':
debug++;
break;
...
default:
usage ();
}
}
}
...
}
The line marked "====>" will corrupt the malloc data structures and
usually cause U-Boot to crash when the next command gets executed by
the shell. With the modification, the compiler will prevent this with
an
error: increment of read-only location '*argv'
N.B.: The code above can be trivially rewritten like this:
while (--argc > 0 && **++argv == '-') {
char *arg = *argv;
while (*++arg) {
switch (*arg) {
...
Signed-off-by: Wolfgang Denk <wd@denx.de>
Acked-by: Mike Frysinger <vapier@gentoo.org>
89 lines
2.5 KiB
C
89 lines
2.5 KiB
C
/*
|
|
* Copyright (C) 2005-2006 Atmel Corporation
|
|
*
|
|
* See file CREDITS for list of people who contributed to this
|
|
* project.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation; either version 2 of
|
|
* the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
|
|
* MA 02111-1307 USA
|
|
*/
|
|
#include <common.h>
|
|
#include <command.h>
|
|
|
|
#include <asm/io.h>
|
|
#include <asm/sections.h>
|
|
#include <asm/sysreg.h>
|
|
|
|
#include <asm/arch/clk.h>
|
|
#include <asm/arch/memory-map.h>
|
|
|
|
#include "hsmc3.h"
|
|
|
|
/* Sanity checks */
|
|
#if (CONFIG_SYS_CLKDIV_CPU > CONFIG_SYS_CLKDIV_HSB) \
|
|
|| (CONFIG_SYS_CLKDIV_HSB > CONFIG_SYS_CLKDIV_PBA) \
|
|
|| (CONFIG_SYS_CLKDIV_HSB > CONFIG_SYS_CLKDIV_PBB)
|
|
# error Constraint fCPU >= fHSB >= fPB{A,B} violated
|
|
#endif
|
|
#if defined(CONFIG_PLL) && ((CONFIG_SYS_PLL0_MUL < 1) || (CONFIG_SYS_PLL0_DIV < 1))
|
|
# error Invalid PLL multiplier and/or divider
|
|
#endif
|
|
|
|
DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
int cpu_init(void)
|
|
{
|
|
extern void _evba(void);
|
|
|
|
gd->cpu_hz = CONFIG_SYS_OSC0_HZ;
|
|
|
|
/* TODO: Move somewhere else, but needs to be run before we
|
|
* increase the clock frequency. */
|
|
hsmc3_writel(MODE0, 0x00031103);
|
|
hsmc3_writel(CYCLE0, 0x000c000d);
|
|
hsmc3_writel(PULSE0, 0x0b0a0906);
|
|
hsmc3_writel(SETUP0, 0x00010002);
|
|
|
|
clk_init();
|
|
|
|
/* Update the CPU speed according to the PLL configuration */
|
|
gd->cpu_hz = get_cpu_clk_rate();
|
|
|
|
/* Set up the exception handler table and enable exceptions */
|
|
sysreg_write(EVBA, (unsigned long)&_evba);
|
|
asm volatile("csrf %0" : : "i"(SYSREG_EM_OFFSET));
|
|
|
|
return 0;
|
|
}
|
|
|
|
void prepare_to_boot(void)
|
|
{
|
|
/* Flush both caches and the write buffer */
|
|
asm volatile("cache %0[4], 010\n\t"
|
|
"cache %0[0], 000\n\t"
|
|
"sync 0" : : "r"(0) : "memory");
|
|
}
|
|
|
|
int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
|
{
|
|
/* This will reset the CPU core, caches, MMU and all internal busses */
|
|
__builtin_mtdr(8, 1 << 13); /* set DC:DBE */
|
|
__builtin_mtdr(8, 1 << 30); /* set DC:RES */
|
|
|
|
/* Flush the pipeline before we declare it a failure */
|
|
asm volatile("sub pc, pc, -4");
|
|
|
|
return -1;
|
|
}
|