Change code to keep CW silent

diff --git a/arch/ppc/mpc55xx/kernel/arch_krn.sx b/arch/ppc/mpc55xx/kernel/arch_krn.sx
index 3d1d856f109bfd40485a6cd3b2afc29658fa12ad..c12e77bc2e6fee533f6a545a2f20547034371630 100644 (file)
--- a/arch/ppc/mpc55xx/kernel/arch_krn.sx
+++ b/arch/ppc/mpc55xx/kernel/arch_krn.sx
@@ -63,6 +63,7 @@
 #define        UNLOCK()                wrteei  1\r
 \r
 #define EXC_TABLE_CODE(_exc_nr)        \\r
+       .balign 16;                     \\r
        stwu    sp,-EXC_FRM_SIZE(sp);   \\r
        stw             r3,EXC_FRM_R3(sp);              \\r
        li          r3,_exc_nr;                         \\r
@@ -561,15 +562,19 @@ exception_tbl:
        EXC_TABLE_CODE(1)\r
        EXC_TABLE_CODE(2)\r
        EXC_TABLE_CODE(3)\r
+    .balign 16\r
     b      exception_IVOR4\r
-    .skip   +0xc\r
        EXC_TABLE_CODE(5)\r
        EXC_TABLE_CODE(6)\r
        EXC_TABLE_CODE(7)\r
        EXC_TABLE_CODE(8)\r
        EXC_TABLE_CODE(9)\r
+#if defined(CFG_MPC5606S)\r
+       EXC_TABLE_CODE(10)\r
+#else                  \r
+    .balign 16\r
     b     exception_IVOR10\r
-    .skip   +0xc\r
+#endif    \r
        EXC_TABLE_CODE(11)\r
        EXC_TABLE_CODE(12)\r
        EXC_TABLE_CODE(13)\r

diff --git a/system/kernel/init.c b/system/kernel/init.c
index 870197b400851609fc57772700bf2638dcb39dca..53d37beafecd7e06e0fb94d24dada9b1f3363c16 100644 (file)
--- a/system/kernel/init.c
+++ b/system/kernel/init.c
@@ -251,14 +251,19 @@ static void os_start( void ) {
 #define TEST_SDATA2    0x3344\r
 volatile int test_data = TEST_DATA;\r
 volatile int test_bss = 0;\r
+/* Define if compiler is set to use small data section */\r
+/* #define CC_USE_SMALL_DATA */\r
+\r
 #if defined(CFG_PPC) && defined(__CWCC__)\r
 /* Note! It does not matter if the data is initialized to 0,\r
  * it still sbss2.
  */\r
+#if defined(CC_USE_SMALL_DATA)\r
 volatile const int test_sbss2;\r
-\r
+#endif\r
 /* Initialized small data */\r
 volatile const int test_sdata2 = TEST_SDATA2;\r
+\r
 #endif\r
 \r
 \r
@@ -283,7 +288,7 @@ int main( void )
        }\r
 #endif\r
 \r
-#if defined(CFG_PPC) && defined(__CWCC__)\r
+#if defined(CC_USE_SMALL_DATA) && defined(CFG_PPC) && defined(__CWCC__)\r
        /* check sdata2 */\r
        if (test_sbss2 != 0) {\r
                BAD_LINK_FILE();\r