ARM: armv7: move ARMV7_PSCI_NR_CPUS to Kconfig

[u-boot] / include / configs / uniphier.h

diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index 058ccd8d8e03585f796c73f9fe119156b38846ec..b3ca46be67231112de65f1cb91b15fafb5bbc866 100644 (file)
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
+ * Copyright (C) 2012-2015 Panasonic Corporation
+ * Copyright (C) 2015-2016 Socionext Inc.
+ *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:    GPL-2.0+
  */
@@ -9,7 +11,8 @@
 #ifndef __CONFIG_UNIPHIER_COMMON_H__
 #define __CONFIG_UNIPHIER_COMMON_H__
 
-#define CONFIG_I2C_EEPROM
+#define CONFIG_ARMV7_PSCI_1_0
+
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS  10
 
 #define CONFIG_SMC911X
@@ -26,11 +29,6 @@
 /* #define CONFIG_SYS_ICACHE_OFF */
 /* #define CONFIG_SYS_DCACHE_OFF */
 
-#define CONFIG_SYS_CACHELINE_SIZE      32
-
-/* Comment out the following to disable L2 cache */
-#define CONFIG_UNIPHIER_L2CACHE_ON
-
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO
 #define CONFIG_MISC_INIT_F
@@ -99,8 +97,7 @@
 #define CONFIG_SYS_MMC_ENV_PART                1
 
 #ifdef CONFIG_ARM64
-#define CONFIG_ARMV8_MULTIENTRY
-#define CPU_RELEASE_ADDR                       0x80000100
+#define CPU_RELEASE_ADDR                       0x80000000
 #define COUNTER_FREQUENCY                      50000000
 #define CONFIG_GICV3
 #define GICD_BASE                              0x5fe00000
@@ -148,9 +145,6 @@
 #define CONFIG_SYS_MEMTEST_START       CONFIG_SYS_SDRAM_BASE
 #define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_SDRAM_BASE + 0x01000000)
 
-#define CONFIG_BOOTDELAY                       3
-#define CONFIG_ZERO_BOOTDELAY_CHECK    /* check for keypress on bootdelay==0 */
-
 /*
  * Network Configuration
  */
@@ -188,7 +182,6 @@
        "__nfsboot=run tftpboot\0"
 #else
 #ifdef CONFIG_ARM64
-#define CONFIG_CMD_BOOTI
 #define CONFIG_BOOTFILE                        "Image"
 #define LINUXBOOT_CMD                  "booti"
 #define KERNEL_ADDR_R                  "kernel_addr_r=0x80080000\0"
@@ -229,7 +222,6 @@
                "tftpboot $fdt_addr_r $fdt_file &&" \
                "run boot_common\0" \
        "__nfsboot=tftpboot $kernel_addr_r $bootfile &&" \
-               "tftpboot $fdt_addr_r $fdt_file &&" \
                "tftpboot $fdt_addr_r $fdt_file &&" \
                "setenv ramdisk_addr_r - &&" \
                "run boot_common\0"
@@ -245,7 +237,6 @@
                "tftpboot $tmp_addr u-boot.bin\0"               \
        "emmcupdate=mmcsetn &&"                                 \
                "mmc partconf $mmc_first_dev 0 1 1 &&"          \
-               "mmc erase 0 800 &&"                            \
                "tftpboot u-boot-spl.bin &&"                    \
                "mmc write $loadaddr 0 80 &&"                   \
                "tftpboot u-boot.bin &&"                        \