include/configs: drop default definitions of CONFIG_SYS_PBSIZE
[oweals/u-boot.git] / include / configs / uniphier.h
index b1c8ccb7b92b7e0f379b2ef0417e5d0aa9093e9a..88223d9bf2ff5f08fef7b996992dff33b12236c3 100644 (file)
@@ -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,25 +11,7 @@
 #ifndef __CONFIG_UNIPHIER_COMMON_H__
 #define __CONFIG_UNIPHIER_COMMON_H__
 
-#define CONFIG_I2C_EEPROM
-#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS  10
-
-#ifdef CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_COM1                CONFIG_SUPPORT_CARD_UART_BASE
-#define CONFIG_SYS_NS16550_CLK         12288000
-#define CONFIG_SYS_NS16550_REG_SIZE    -2
-#endif
-
-/* TODO: move to Kconfig and device tree */
-#if 0
-#define CONFIG_SYS_NS16550_SERIAL
-#endif
-
-#define CONFIG_SMC911X
-
-/* dummy: referenced by examples/standalone/smc911x_eeprom.c */
-#define CONFIG_SMC911X_BASE    0
-#define CONFIG_SMC911X_32_BIT
+#define CONFIG_ARMV7_PSCI_1_0
 
 /*-----------------------------------------------------------------------
  * MMU and Cache Setting
 /* #define CONFIG_SYS_ICACHE_OFF */
 /* #define CONFIG_SYS_DCACHE_OFF */
 
-#define CONFIG_SYS_CACHELINE_SIZE      32
-
-/* Comment out the following to enable L2 cache */
-#define CONFIG_UNIPHIER_L2CACHE_ON
-
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
-#define CONFIG_MISC_INIT_F
-#define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_BOARD_EARLY_INIT_R
-#define CONFIG_BOARD_LATE_INIT
-
 #define CONFIG_SYS_MALLOC_LEN          (4 * 1024 * 1024)
 
 #define CONFIG_TIMESTAMP
 /* FLASH related */
 #define CONFIG_MTD_DEVICE
 
-/*
- * uncomment the following to disable FLASH related code.
- */
-/* #define CONFIG_SYS_NO_FLASH */
+#define CONFIG_SMC911X_32_BIT
+/* dummy: referenced by examples/standalone/smc911x_eeprom.c */
+#define CONFIG_SMC911X_BASE    0
+
+#ifdef CONFIG_MICRO_SUPPORT_CARD
+#define CONFIG_SMC911X
+#endif
 
 #define CONFIG_FLASH_CFI_DRIVER
 #define CONFIG_SYS_FLASH_CFI
 
 #define CONFIG_SYS_MAX_FLASH_SECT      256
 #define CONFIG_SYS_MONITOR_BASE                0
+#define CONFIG_SYS_MONITOR_LEN         0x00080000      /* 512KB */
 #define CONFIG_SYS_FLASH_BASE          0
 
 /*
- * flash_toggle does not work for out supoort card.
+ * flash_toggle does not work for our support card.
  * We need to use flash_status_poll.
  */
 #define CONFIG_SYS_CFI_FLASH_STATUS_POLL
 #define CONFIG_SYS_MAX_FLASH_BANKS_DETECT 1
 
 /* serial console configuration */
-#define CONFIG_BAUDRATE                        115200
-
-
-#if !defined(CONFIG_SPL_BUILD)
-#define CONFIG_USE_ARCH_MEMSET
-#define CONFIG_USE_ARCH_MEMCPY
-#endif
 
 #define CONFIG_SYS_LONGHELP            /* undef to save memory */
 
 #define CONFIG_CMDLINE_EDITING         /* add command line history     */
 #define CONFIG_SYS_CBSIZE              1024    /* Console I/O Buffer Size */
-/* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_SYS_MAXARGS             16      /* max number of command */
 /* Boot Argument Buffer Size */
 #define CONFIG_SYS_BARGSIZE            (CONFIG_SYS_CBSIZE)
 
 #define CONFIG_CONS_INDEX              1
 
-/* #define CONFIG_ENV_IS_NOWHERE */
-/* #define CONFIG_ENV_IS_IN_NAND */
-#define CONFIG_ENV_IS_IN_MMC
-#define CONFIG_ENV_OFFSET                      0x80000
+#define CONFIG_ENV_OFFSET                      0x100000
 #define CONFIG_ENV_SIZE                                0x2000
 /* #define CONFIG_ENV_OFFSET_REDUND    (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) */
 
 #define CONFIG_SYS_MMC_ENV_DEV         0
 #define CONFIG_SYS_MMC_ENV_PART                1
 
+#if !defined(CONFIG_ARM64)
 /* Time clock 1MHz */
 #define CONFIG_SYS_TIMER_RATE                  1000000
-
-/*
- * By default, ARP timeout is 5 sec.
- * The first ARP request does not seem to work.
- * So we need to retry ARP request anyway.
- * We want to shrink the interval until the second ARP request.
- */
-#define CONFIG_ARP_TIMEOUT     500UL  /* 0.5 msec */
+#endif
 
 #define CONFIG_SYS_MAX_NAND_DEVICE                     1
-#define CONFIG_SYS_NAND_MAX_CHIPS                      2
 #define CONFIG_SYS_NAND_ONFI_DETECTION
 
 #define CONFIG_NAND_DENALI_ECC_SIZE                    1024
 
-#ifdef CONFIG_ARCH_UNIPHIER_PH1_SLD3
-#define CONFIG_SYS_NAND_REGS_BASE                      0xf8100000
-#define CONFIG_SYS_NAND_DATA_BASE                      0xf8000000
-#else
 #define CONFIG_SYS_NAND_REGS_BASE                      0x68100000
 #define CONFIG_SYS_NAND_DATA_BASE                      0x68000000
-#endif
-
-#define CONFIG_SYS_NAND_BASE           (CONFIG_SYS_NAND_DATA_BASE + 0x10)
 
 #define CONFIG_SYS_NAND_USE_FLASH_BBT
 #define CONFIG_SYS_NAND_BAD_BLOCK_POS                  0
 
-/* USB */
-#define CONFIG_USB_MAX_CONTROLLER_COUNT                2
-#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS     4
-#define CONFIG_CMD_FAT
-#define CONFIG_FAT_WRITE
-#define CONFIG_DOS_PARTITION
-
 /* SD/MMC */
-#define CONFIG_CMD_MMC
 #define CONFIG_SUPPORT_EMMC_BOOT
-#define CONFIG_GENERIC_MMC
 
 /* memtest works on */
 #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
  */
 
 #define CONFIG_CMDLINE_EDITING         /* add command line history     */
 
+#if defined(CONFIG_ARM64)
+/* ARM Trusted Firmware */
+#define BOOT_IMAGES \
+       "second_image=unph_bl.bin\0" \
+       "third_image=fip.bin\0"
+#else
+#define BOOT_IMAGES \
+       "second_image=u-boot-spl.bin\0" \
+       "third_image=u-boot.bin\0"
+#endif
+
 #define CONFIG_BOOTCOMMAND             "run $bootmode"
 
 #define CONFIG_ROOTPATH                        "/nfs/root/path"
                "bootm $fit_addr_r\0" \
        "__nfsboot=run tftpboot\0"
 #else
-#define CONFIG_CMD_BOOTZ
+#ifdef CONFIG_ARM64
+#define CONFIG_BOOTFILE                        "Image.gz"
+#define LINUXBOOT_CMD                  "booti"
+#define KERNEL_ADDR_LOAD               "kernel_addr_load=0x84200000\0"
+#define KERNEL_ADDR_R                  "kernel_addr_r=0x82080000\0"
+#else
 #define CONFIG_BOOTFILE                        "zImage"
+#define LINUXBOOT_CMD                  "bootz"
+#define KERNEL_ADDR_LOAD               "kernel_addr_load=0x80208000\0"
+#define KERNEL_ADDR_R                  "kernel_addr_r=0x80208000\0"
+#endif
 #define LINUXBOOT_ENV_SETTINGS \
        "fdt_addr=0x00100000\0" \
        "fdt_addr_r=0x84100000\0" \
        "fdt_size=0x00008000\0" \
        "kernel_addr=0x00200000\0" \
-       "kernel_addr_r=0x80208000\0" \
+       KERNEL_ADDR_LOAD \
+       KERNEL_ADDR_R \
        "kernel_size=0x00800000\0" \
        "ramdisk_addr=0x00a00000\0" \
        "ramdisk_addr_r=0x84a00000\0" \
        "ramdisk_size=0x00600000\0" \
        "ramdisk_file=rootfs.cpio.uboot\0" \
-       "boot_common=setexpr bootm_low $kernel_addr_r '&' fe000000 &&" \
-               "bootz $kernel_addr_r $ramdisk_addr_r $fdt_addr_r\0" \
-       "norboot=setexpr kernel_addr $nor_base + $kernel_addr &&" \
-               "cp.b $kernel_addr $kernel_addr_r $kernel_size &&" \
-               "setexpr ramdisk_addr_r $nor_base + $ramdisk_addr &&" \
-               "setexpr fdt_addr_r $nor_base + $fdt_addr &&" \
+       "boot_common=setexpr bootm_low $kernel_addr_r '&' fe000000 && " \
+               "if test $kernel_addr_load = $kernel_addr_r; then " \
+                       "true; " \
+               "else " \
+                       "unzip $kernel_addr_load $kernel_addr_r; " \
+               "fi && " \
+               LINUXBOOT_CMD " $kernel_addr_r $ramdisk_addr_r $fdt_addr_r\0" \
+       "norboot=setexpr kernel_addr_nor $nor_base + $kernel_addr && " \
+               "setexpr kernel_size_div4 $kernel_size / 4 && " \
+               "cp $kernel_addr_nor $kernel_addr_load $kernel_size_div4 && " \
+               "setexpr ramdisk_addr_nor $nor_base + $ramdisk_addr && " \
+               "setexpr ramdisk_size_div4 $ramdisk_size / 4 && " \
+               "cp $ramdisk_addr_nor $ramdisk_addr_r $ramdisk_size_div4 && " \
+               "setexpr fdt_addr_nor $nor_base + $fdt_addr && " \
+               "setexpr fdt_size_div4 $fdt_size / 4 && " \
+               "cp $fdt_addr_nor $fdt_addr_r $fdt_size_div4 && " \
                "run boot_common\0" \
-       "nandboot=nand read $kernel_addr_r $kernel_addr $kernel_size &&" \
+       "nandboot=nand read $kernel_addr_load $kernel_addr $kernel_size && " \
                "nand read $ramdisk_addr_r $ramdisk_addr $ramdisk_size &&" \
                "nand read $fdt_addr_r $fdt_addr $fdt_size &&" \
                "run boot_common\0" \
-       "tftpboot=tftpboot $kernel_addr_r $bootfile &&" \
+       "tftpboot=tftpboot $kernel_addr_load $bootfile && " \
                "tftpboot $ramdisk_addr_r $ramdisk_file &&" \
                "tftpboot $fdt_addr_r $fdt_file &&" \
                "run boot_common\0" \
-       "__nfsboot=tftpboot $kernel_addr_r $bootfile &&" \
-               "tftpboot $fdt_addr_r $fdt_file &&" \
+       "__nfsboot=tftpboot $kernel_addr_load $bootfile && " \
                "tftpboot $fdt_addr_r $fdt_file &&" \
                "setenv ramdisk_addr_r - &&" \
                "run boot_common\0"
 #define        CONFIG_EXTRA_ENV_SETTINGS                               \
        "netdev=eth0\0"                                         \
        "verify=n\0"                                            \
+       "initrd_high=0xffffffffffffffff\0"                      \
        "nor_base=0x42000000\0"                                 \
+       "sramupdate=setexpr tmp_addr $nor_base + 0x50000 &&"    \
+               "tftpboot $tmp_addr $second_image && " \
+               "setexpr tmp_addr $nor_base + 0x70000 && " \
+               "tftpboot $tmp_addr $third_image\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.img &&"                        \
-               "mmc write $loadaddr 80 780\0"                  \
+               "tftpboot $second_image && " \
+               "mmc write $loadaddr 0 100 && " \
+               "tftpboot $third_image && " \
+               "mmc write $loadaddr 100 700\0" \
        "nandupdate=nand erase 0 0x00100000 &&"                 \
-               "tftpboot u-boot-spl.bin &&"                    \
-               "nand write $loadaddr 0 0x00010000 &&"          \
-               "tftpboot u-boot.img &&"                        \
-               "nand write $loadaddr 0x00010000 0x000f0000\0"  \
+               "tftpboot $second_image && " \
+               "nand write $loadaddr 0 0x00020000 && " \
+               "tftpboot $third_image && " \
+               "nand write $loadaddr 0x00020000 0x000e0000\0" \
+       "usbupdate=usb start &&" \
+               "tftpboot $second_image && " \
+               "usb write $loadaddr 0 100 && " \
+               "tftpboot $third_image && " \
+               "usb write $loadaddr 100 700\0" \
+       BOOT_IMAGES \
        LINUXBOOT_ENV_SETTINGS
 
 #define CONFIG_SYS_BOOTMAPSZ                   0x20000000
 
-/* Open Firmware flat tree */
-#define CONFIG_OF_LIBFDT
-
 #define CONFIG_SYS_SDRAM_BASE          0x80000000
-#define CONFIG_NR_DRAM_BANKS           2
+#define CONFIG_NR_DRAM_BANKS           3
+/* for LD20; the last 64 byte is used for dynamic DDR PHY training */
+#define CONFIG_SYS_MEM_TOP_HIDE                64
+
+#define CONFIG_PANIC_HANG
+
+#define CONFIG_SYS_INIT_SP_ADDR                (CONFIG_SYS_TEXT_BASE)
 
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_SLD3) || \
-       defined(CONFIG_ARCH_UNIPHIER_PH1_LD4) || \
-       defined(CONFIG_ARCH_UNIPHIER_PH1_SLD8)
+/* only for SPL */
+#if defined(CONFIG_ARCH_UNIPHIER_LD4) || \
+       defined(CONFIG_ARCH_UNIPHIER_SLD8)
 #define CONFIG_SPL_TEXT_BASE           0x00040000
 #else
 #define CONFIG_SPL_TEXT_BASE           0x00100000
 #endif
 
 #define CONFIG_SPL_STACK               (0x00100000)
-#define CONFIG_SYS_INIT_SP_ADDR                (CONFIG_SYS_TEXT_BASE)
-
-#define CONFIG_PANIC_HANG
 
 #define CONFIG_SPL_FRAMEWORK
-#define CONFIG_SPL_SERIAL_SUPPORT
-#define CONFIG_SPL_NAND_SUPPORT
-#define CONFIG_SPL_MMC_SUPPORT
-
-#define CONFIG_SPL_LIBCOMMON_SUPPORT   /* for mem_malloc_init */
-#define CONFIG_SPL_LIBGENERIC_SUPPORT
 
-#define CONFIG_SPL_BOARD_INIT
+#define CONFIG_SYS_NAND_U_BOOT_OFFS            0x20000
 
-#define CONFIG_SYS_NAND_U_BOOT_OFFS            0x10000
-#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR        0x80
+/* subtract sizeof(struct image_header) */
+#define CONFIG_SYS_UBOOT_BASE                  (0x70000 - 0x40)
 
+#define CONFIG_SPL_TARGET                      "u-boot-with-spl.bin"
 #define CONFIG_SPL_MAX_FOOTPRINT               0x10000
+#define CONFIG_SPL_MAX_SIZE                    0x10000
+#define CONFIG_SPL_BSS_MAX_SIZE                        0x2000
+
+#define CONFIG_SPL_PAD_TO                      0x20000
 
 #endif /* __CONFIG_UNIPHIER_COMMON_H__ */