Changeset f3386d7 in mainline for kernel

Timestamp:

2013-07-15T20:44:54Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f8d3df3

Parents:

273c976 (diff), a940f1d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

mainline changes

Location:

kernel

Files:

• Makefile (modified) (1 diff)
• arch/arm32/src/mach/beaglebone/beaglebone.c (modified) (2 diffs)
• genarch/src/drivers/am335x/timer.c (modified) (1 diff)
• generic/include/cc.h (added)
• generic/include/lib/memfnc.h (modified) (1 diff)
• test/print/print4.c (modified) (2 diffs)

kernel/Makefile

@@ -105 +105 @@
 CLANG_CFLAGS = $(INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
         -ffreestanding -fno-builtin -nostdlib -nostdinc \
-        -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes \
+        -Wall -Werror -Wextra -Wno-unused-parameter -Wmissing-prototypes \
         -Werror-implicit-function-declaration -Wwrite-strings \
         -integrated-as \

kernel/arch/arm32/src/mach/beaglebone/beaglebone.c

@@ -177 +177 @@
 {
         const unsigned inum = am335x_irc_inum_get(bbone.irc_addr);
-        am335x_irc_irq_ack(bbone.irc_addr);
 
         irq_t *irq = irq_dispatch_and_lock(inum);
@@ -187 +186 @@
                 printf("Spurious interrupt\n");
         }
+
+        am335x_irc_irq_ack(bbone.irc_addr);
 }
 

kernel/genarch/src/drivers/am335x/timer.c

@@ -119 +119 @@
         /* Disable compare mode */
         tclr &= ~AM335x_TIMER_TCLR_CE_FLAG;
-        /* Enable the prescaler, divisor = 2 */
-        tclr |= AM335x_TIMER_TCLR_PRE_FLAG;
-        tclr &= ~(AM335x_TIMER_TCLR_PTV_MASK << AM335x_TIMER_TCLR_PTV_SHIFT);
+
         /* Enable auto-reload mode */
         tclr |= AM335x_TIMER_TCLR_AR_FLAG;

kernel/generic/include/lib/memfnc.h

@@ -37 +37 @@
 
 #include <typedefs.h>
+#include <cc.h>
 
 extern void *memset(void *, int, size_t)
-    __attribute__ ((optimize("-fno-tree-loop-distribute-patterns")));
+    ATTRIBUTE_OPTIMIZE("-fno-tree-loop-distribute-patterns");
 extern void *memcpy(void *, const void *, size_t)
-    __attribute__ ((optimize("-fno-tree-loop-distribute-patterns")));
+    ATTRIBUTE_OPTIMIZE("-fno-tree-loop-distribute-patterns");
 
 #endif

kernel/test/print/print4.c

@@ -36 +36 @@
         uint8_t group;
         for (group = 1; group < 4; group++) {
-                TPRINTF("%#" PRIx8 ": ", group << 5);
+                TPRINTF("%#x: ", group << 5);
                 
                 uint8_t index;
@@ -52 +52 @@
         
         for (group = 4; group < 8; group++) {
-                TPRINTF("%#" PRIx8 ": ", group << 5);
+                TPRINTF("%#x: ", group << 5);
                 
                 uint8_t index;