Sun Dec 1 02:52:53 2013 UTC ()
Inform compiler that the volatile assignment will terminate the function.


(joerg)
diff -r1.3 -r1.4 src/sys/arch/evbarm/stand/boot2440/main.c
cvs diff -r1.3 -r1.4 src/sys/arch/evbarm/stand/boot2440/main.c (expand / switch to unified diff)

--- src/sys/arch/evbarm/stand/boot2440/main.c 2013/11/04 21:54:59 1.3
+++ src/sys/arch/evbarm/stand/boot2440/main.c 2013/12/01 02:52:53 1.4
@@ -488,26 +488,27 @@ _rtt() @@ -488,26 +488,27 @@ _rtt()
488 488
489 /* Disable MMU */ 489 /* Disable MMU */
490 __asm volatile("mrc p15, 0, %0, c1, c0, 0;" 490 __asm volatile("mrc p15, 0, %0, c1, c0, 0;"
491 "bic %0, %0, %1;" 491 "bic %0, %0, %1;"
492 "mcr p15, 0, %0, c1, c0, 0;" 492 "mcr p15, 0, %0, c1, c0, 0;"
493 : "=r" (tmp) 493 : "=r" (tmp)
494 : "I" (CPU_CONTROL_MMU_ENABLE) 494 : "I" (CPU_CONTROL_MMU_ENABLE)
495 ); 495 );
496 496
497 /* Configure watchdog to fire now */ 497 /* Configure watchdog to fire now */
498 *(volatile uint32_t *)(S3C2440_WDT_BASE + WDT_WTCON) = 498 *(volatile uint32_t *)(S3C2440_WDT_BASE + WDT_WTCON) =
499 (0 << WTCON_PRESCALE_SHIFT) | WTCON_ENABLE | 499 (0 << WTCON_PRESCALE_SHIFT) | WTCON_ENABLE |
500 WTCON_CLKSEL_16 | WTCON_ENRST; 500 WTCON_CLKSEL_16 | WTCON_ENRST;
 501 __builtin_unreachable();
501} 502}
502 503
503void 504void
504bi_init(void *addr) 505bi_init(void *addr)
505{ 506{
506 struct btinfo_magic bi_magic; 507 struct btinfo_magic bi_magic;
507 508
508 memset(addr, 0, BOOTINFO_MAXSIZE); 509 memset(addr, 0, BOOTINFO_MAXSIZE);
509 bi_next = (char*) addr; 510 bi_next = (char*) addr;
510 bi_size = 0; 511 bi_size = 0;
511 512
512 bi_magic.magic = BOOTINFO_MAGIC; 513 bi_magic.magic = BOOTINFO_MAGIC;
513 bi_add(&bi_magic, BTINFO_MAGIC, sizeof(bi_magic)); 514 bi_add(&bi_magic, BTINFO_MAGIC, sizeof(bi_magic));