efi_loader: abort on unsupported relocation type

[platform/kernel/u-boot.git] / board / amcc / canyonlands / chip_config.c

diff --git a/board/amcc/canyonlands/chip_config.c b/board/amcc/canyonlands/chip_config.c
index e46f4d8..e485570 100644 (file)
--- a/board/amcc/canyonlands/chip_config.c
+++ b/board/amcc/canyonlands/chip_config.c
@@ -2,24 +2,7 @@
  * (C) Copyright 2008-2009
  * Stefan Roese, DENX Software Engineering, sr@denx.de.
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- *
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -34,45 +17,46 @@ struct ppc4xx_config ppc4xx_config_val[] = {
                }
        },
        {
-               "600-nand", "NAND CPU: 600 PLB: 200 OPB: 100 EBC: 100",
+               "800-nor", "NOR  CPU: 800 PLB: 200 OPB: 100 EBC: 100",
                {
-                       0x86, 0x80, 0xce, 0x1f, 0x79, 0x90, 0x01, 0xa0,
-                       0xa0, 0xe8, 0x23, 0x58, 0x0d, 0x05, 0x00, 0x00
+                       0x86, 0x80, 0xba, 0x14, 0x99, 0x80, 0x00, 0xa0,
+                       0x40, 0x08, 0x23, 0x50, 0x0d, 0x05, 0x00, 0x00
                }
        },
        {
-               "800-nor", "NOR  CPU: 800 PLB: 200 OPB: 100 EBC: 100",
+               "1000-nor", "NOR  CPU:1000 PLB: 200 OPB: 100 EBC: 100",
                {
-                       0x86, 0x80, 0xba, 0x14, 0x99, 0x80, 0x00, 0xa0,
+                       0x86, 0x82, 0x96, 0x19, 0xb9, 0x80, 0x00, 0xa0,
                        0x40, 0x08, 0x23, 0x50, 0x0d, 0x05, 0x00, 0x00
                }
        },
        {
-               "800-nand", "NAND CPU: 800 PLB: 200 OPB: 100 EBC: 100",
+               "1066-nor", "NOR  CPU:1066 PLB: 266 OPB:  88 EBC:  88",
                {
-                       0x86, 0x80, 0xba, 0x14, 0x99, 0x90, 0x01, 0xa0,
-                       0xa0, 0xe8, 0x23, 0x58, 0x0d, 0x05, 0x00, 0x00
+                       0x86, 0x80, 0xb3, 0x01, 0x9d, 0x80, 0x00, 0xa0,
+                       0x40, 0x08, 0x23, 0x50, 0x0d, 0x05, 0x00, 0x00
                }
        },
+#if !defined(CONFIG_ARCHES)
        {
-               "1000-nor", "NOR  CPU:1000 PLB: 200 OPB: 100 EBC: 100",
+               "600-nand", "NAND CPU: 600 PLB: 200 OPB: 100 EBC: 100",
                {
-                       0x86, 0x82, 0x96, 0x19, 0xb9, 0x80, 0x00, 0xa0,
-                       0x40, 0x08, 0x23, 0x50, 0x0d, 0x05, 0x00, 0x00
+                       0x86, 0x80, 0xce, 0x1f, 0x79, 0x90, 0x01, 0xa0,
+                       0xa0, 0xe8, 0x23, 0x58, 0x0d, 0x05, 0x00, 0x00
                }
        },
        {
-               "1000-nand", "NAND CPU:1000 PLB: 200 OPB: 100 EBC: 100",
+               "800-nand", "NAND CPU: 800 PLB: 200 OPB: 100 EBC: 100",
                {
-                       0x86, 0x82, 0x96, 0x19, 0xb9, 0x90, 0x01, 0xa0,
+                       0x86, 0x80, 0xba, 0x14, 0x99, 0x90, 0x01, 0xa0,
                        0xa0, 0xe8, 0x23, 0x58, 0x0d, 0x05, 0x00, 0x00
                }
        },
        {
-               "1066-nor", "NOR  CPU:1066 PLB: 266 OPB:  88 EBC:  88",
+               "1000-nand", "NAND CPU:1000 PLB: 200 OPB: 100 EBC: 100",
                {
-                       0x86, 0x80, 0xb3, 0x01, 0x9d, 0x80, 0x00, 0xa0,
-                       0x40, 0x08, 0x23, 0x50, 0x0d, 0x05, 0x00, 0x00
+                       0x86, 0x82, 0x96, 0x19, 0xb9, 0x90, 0x01, 0xa0,
+                       0xa0, 0xe8, 0x23, 0x58, 0x0d, 0x05, 0x00, 0x00
                }
        },
        {
@@ -82,6 +66,7 @@ struct ppc4xx_config ppc4xx_config_val[] = {
                        0xa0, 0xe8, 0x23, 0x58, 0x0d, 0x05, 0x00, 0x00
                }
        },
+#endif
 };
 
 int ppc4xx_config_count = ARRAY_SIZE(ppc4xx_config_val);