Skip to content

Commit

Permalink
common: remove unaligned access error in bootmenu_getoption()
Browse files Browse the repository at this point in the history
Some ARM compilers may emit code that makes unaligned accesses when
faced with constructs such as:

    char name[12] = "bootmenu_";

same fix as commit: 064d55f

=========================================================
data abort

    MAYBE you should read doc/README.arm-unaligned-accesses

pc : [<3ff4b60c>]          lr : [<3ff4b7b0>]
sp : 3f346a58  ip : 3ff9c8e6     fp : 02000060
r10: 00000000  r9 : 3df47fc0     r8 : 3f347f40
r7 : 00000000  r6 : 00000000     r5 : 00000003  r4 : 3f759140
r3 : 000003f0  r2 : 00000000     r1 : 000003f1  r0 : 00000000
Flags: nzCv  IRQs on  FIQs off  Mode SVC_32
Resetting CPU ...
======================================================

Signed-off-by: Lan Yixun (dlan) <[email protected]>
  • Loading branch information
dlanx authored and trini committed Jul 15, 2013
1 parent 457dd02 commit 0eb33ad
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions common/cmd_bootmenu.c
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,12 @@ enum bootmenu_key {

static char *bootmenu_getoption(unsigned short int n)
{
char name[MAX_ENV_SIZE] = "bootmenu_";
char name[MAX_ENV_SIZE];

if (n > MAX_COUNT)
return NULL;

sprintf(name + 9, "%d", n);
sprintf(name, "bootmenu_%d", n);
return getenv(name);
}

Expand Down

0 comments on commit 0eb33ad

Please sign in to comment.