Changeset 03362fbd in mainline for kernel/arch/arm32/include/cpu.h

Timestamp:

2013-02-09T23:14:45Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

22dfd38

Parents:

b5d2e57 (diff), 005b765 (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:

Merge mainline changes.

Conflict resulting from bool.h → stdbool.h move and ddf structs turning opaque.
Fails to boot to shell console.

File:

• kernel/arch/arm32/include/cpu.h (modified) (2 diffs)

kernel/arch/arm32/include/cpu.h

@@ -40 +40 @@
 #include <arch/asm.h>
 
+enum {
+        ARM_MAX_CACHE_LEVELS = 7,
+};
 
-/** Struct representing ARM CPU identifiaction. */
+/** Struct representing ARM CPU identification. */
 typedef struct {
-        /** Implementator (vendor) number. */
+        /** Implementor (vendor) number. */
         uint32_t imp_num;
 
@@ -57 +60 @@
         /** Revision number. */
         uint32_t rev_num;
+
+        struct {
+                unsigned ways;
+                unsigned sets;
+                unsigned line_size;
+                unsigned way_shift;
+                unsigned set_shift;
+        } dcache[ARM_MAX_CACHE_LEVELS];
+        unsigned dcache_levels;
 } cpu_arch_t;