From 9589ff33327fc038be7c302e71377582738d8fde Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Thu, 13 Jun 2013 17:13:11 -0600 Subject: lcd: remove unaligned access in lcd_dt_simplefb_configure_node() Some ARM compilers may emit code that makes unaligned accesses when faced with constructs such as: const char format[] = "r5g6b5"; Make this data static since it doesn't chagne; the compiler will simply place it into the .rodata section directly, and avoid any unaligned run- time initialization. Signed-off-by: Stephen Warren (cherry picked from commit 5af7d0f090b9fe2464d7980841b940846a547716) Signed-off-by: Jason Liu --- common/lcd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'common/lcd.c') diff --git a/common/lcd.c b/common/lcd.c index 3a60484..c9a589e 100644 --- a/common/lcd.c +++ b/common/lcd.c @@ -1193,7 +1193,7 @@ static int lcd_dt_simplefb_configure_node(void *blob, int off) u32 stride; fdt32_t cells[2]; int ret; - const char format[] = + static const char format[] = #if LCD_BPP == LCD_COLOR16 "r5g6b5"; #else @@ -1239,8 +1239,8 @@ static int lcd_dt_simplefb_configure_node(void *blob, int off) int lcd_dt_simplefb_add_node(void *blob) { - const char compat[] = "simple-framebuffer"; - const char disabled[] = "disabled"; + static const char compat[] = "simple-framebuffer"; + static const char disabled[] = "disabled"; int off, ret; off = fdt_add_subnode(blob, 0, "framebuffer"); -- cgit v1.1