Merge branch 'master' of git://git.denx.de/u-boot-sh
[oweals/u-boot.git] / include / configs / uniphier.h
index c39f13bf6bf966806be08ee009ade08a1ff23495..68568f412245f102f9649cc24a2f9b9f6dab1557 100644 (file)
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * 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+
  */
 
 /* U-Boot - Common settings for UniPhier Family */
 #ifndef __CONFIG_UNIPHIER_COMMON_H__
 #define __CONFIG_UNIPHIER_COMMON_H__
 
+#ifndef CONFIG_SPL_BUILD
+#include <config_distro_bootcmd.h>
+
+#ifdef CONFIG_CMD_MMC
+#define BOOT_TARGET_DEVICE_MMC(func)   func(MMC, mmc, 0) func(MMC, mmc, 1)
+#else
+#define BOOT_TARGET_DEVICE_MMC(func)
+#endif
+
+#ifdef CONFIG_CMD_UBIFS
+#define BOOT_TARGET_DEVICE_UBIFS(func) func(UBIFS, ubifs, 0)
+#else
+#define BOOT_TARGET_DEVICE_UBIFS(func)
+#endif
+
+#ifdef CONFIG_CMD_USB
+#define BOOT_TARGET_DEVICE_USB(func)   func(USB, usb, 0)
+#else
+#define BOOT_TARGET_DEVICE_USB(func)
+#endif
+
+#define BOOT_TARGET_DEVICES(func)      \
+       BOOT_TARGET_DEVICE_MMC(func)    \
+       BOOT_TARGET_DEVICE_UBIFS(func)  \
+       BOOT_TARGET_DEVICE_USB(func)
+#else
+#define BOOTENV
+#endif
+
 #define CONFIG_ARMV7_PSCI_1_0
 
 /*-----------------------------------------------------------------------
  * MMU and Cache Setting
  *----------------------------------------------------------------------*/
 
-/* Comment out the following to enable L1 cache */
-/* #define CONFIG_SYS_ICACHE_OFF */
-/* #define CONFIG_SYS_DCACHE_OFF */
-
 #define CONFIG_SYS_MALLOC_LEN          (4 * 1024 * 1024)
 
 #define CONFIG_TIMESTAMP
 
 /* FLASH related */
-#define CONFIG_MTD_DEVICE
-
-#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         0x00090000      /* 576KB */
+#define CONFIG_SYS_MONITOR_LEN         0x000d0000      /* 832KB */
 #define CONFIG_SYS_FLASH_BASE          0
 
 /*
 #define CONFIG_SYS_NAND_DATA_BASE                      0x68000000
 #define CONFIG_SYS_NAND_BAD_BLOCK_POS                  0
 
-/* SD/MMC */
-#define CONFIG_SUPPORT_EMMC_BOOT
-
-/* memtest works on */
-#define CONFIG_SYS_MEMTEST_START       CONFIG_SYS_SDRAM_BASE
-#define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_SDRAM_BASE + 0x01000000)
-
 /*
  * Network Configuration
  */
@@ -85,8 +98,7 @@
 #define CONFIG_GATEWAYIP               192.168.11.1
 #define CONFIG_NETMASK                 255.255.255.0
 
-#define CONFIG_LOADADDR                        0x85000000
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
+#define CONFIG_SYS_LOAD_ADDR           0x85000000
 #define CONFIG_SYS_BOOTM_LEN           (32 << 20)
 
 #if defined(CONFIG_ARM64)
        "third_image=u-boot.bin\0"
 #endif
 
-#define CONFIG_BOOTCOMMAND             "run $bootmode"
-
 #define CONFIG_ROOTPATH                        "/nfs/root/path"
 #define CONFIG_NFSBOOTCOMMAND                                          \
        "setenv bootargs $bootargs root=/dev/nfs rw "                   \
 
 #ifdef CONFIG_FIT
 #define CONFIG_BOOTFILE                        "fitImage"
+#define KERNEL_ADDR_R_OFFSET           "0x05100000"
 #define LINUXBOOT_ENV_SETTINGS \
-       "fit_addr=0x00100000\0" \
-       "fit_addr_r=0x85100000\0" \
-       "fit_size=0x00f00000\0" \
-       "norboot=setexpr fit_addr $nor_base + $fit_addr &&" \
-               "bootm $fit_addr\0" \
-       "nandboot=nand read $fit_addr_r $fit_addr $fit_size &&" \
-               "bootm $fit_addr_r\0" \
-       "tftpboot=tftpboot $fit_addr_r $bootfile &&" \
-               "bootm $fit_addr_r\0" \
+       "tftpboot=tftpboot $kernel_addr_r $bootfile &&" \
+               "bootm $kernel_addr_r\0" \
        "__nfsboot=run tftpboot\0"
 #else
 #ifdef CONFIG_ARM64
-#define CONFIG_BOOTFILE                        "Image.gz"
+#define CONFIG_BOOTFILE                        "Image"
 #define LINUXBOOT_CMD                  "booti"
-#define KERNEL_ADDR_LOAD               "kernel_addr_load=0x85200000\0"
-#define KERNEL_ADDR_R                  "kernel_addr_r=0x82080000\0"
+#define KERNEL_ADDR_R_OFFSET           "0x02080000"
 #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"
+#define KERNEL_ADDR_R_OFFSET           "0x00208000"
 #endif
 #define LINUXBOOT_ENV_SETTINGS \
-       "fdt_addr=0x00100000\0" \
-       "fdt_addr_r=0x85100000\0" \
-       "fdt_size=0x00008000\0" \
-       "kernel_addr=0x00200000\0" \
-       KERNEL_ADDR_LOAD \
-       KERNEL_ADDR_R \
-       "kernel_size=0x00e00000\0" \
-       "ramdisk_addr=0x01000000\0" \
-       "ramdisk_addr_r=0x86000000\0" \
-       "ramdisk_size=0x00800000\0" \
-       "ramdisk_file=rootfs.cpio.uboot\0" \
        "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_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_load $bootfile && " \
+       "tftpboot=tftpboot $kernel_addr_r $bootfile && " \
+               "tftpboot $fdt_addr_r $fdtfile &&" \
                "tftpboot $ramdisk_addr_r $ramdisk_file &&" \
-               "tftpboot $fdt_addr_r $fdt_file &&" \
+               "setenv ramdisk_addr_r $ramdisk_addr_r:$filesize &&" \
                "run boot_common\0" \
        "__nfsboot=tftpboot $kernel_addr_load $bootfile && " \
-               "tftpboot $fdt_addr_r $fdt_file &&" \
+               "tftpboot $fdt_addr_r $fdtfile &&" \
                "setenv ramdisk_addr_r - &&" \
                "run boot_common\0"
 #endif
 
 #define        CONFIG_EXTRA_ENV_SETTINGS                               \
+       "fdt_addr_r_offset=0x05100000\0" \
+       "kernel_addr_r_offset=" KERNEL_ADDR_R_OFFSET "\0" \
+       "ramdisk_addr_r_offset=0x06000000\0" \
+       "ramdisk_file=rootfs.cpio.gz\0" \
        "netdev=eth0\0"                                         \
        "initrd_high=0xffffffffffffffff\0"                      \
+       "loadaddr_offset=0x05000000\0" \
+       "script=boot.scr\0" \
+       "scriptaddr=0x85000000\0"                               \
        "nor_base=0x42000000\0"                                 \
+       "emmcboot=mmcsetn && run bootcmd_mmc${mmc_first_dev}\0" \
+       "nandboot=run bootcmd_ubifs0\0" \
+       "norboot=run tftpboot\0" \
+       "usbboot=run bootcmd_usb0\0" \
+       "emmcscript=setenv devtype mmc && " \
+               "mmcsetn && " \
+               "setenv devnum ${mmc_first_dev} && " \
+               "run loadscript_fat\0" \
+       "nandscript=echo Running ${script} from ubi ... && " \
+               "ubi part UBI && " \
+               "ubifsmount ubi0:boot && " \
+               "ubifsload ${loadaddr} ${script} && " \
+               "source\0" \
+       "norscript=echo Running ${script} from tftp ... && " \
+               "tftpboot ${script} &&" \
+               "source\0" \
+       "usbscript=usb start && " \
+               "setenv devtype usb && " \
+               "setenv devnum 0 && " \
+               "run loadscript_fat\0" \
+       "loadscript_fat=echo Running ${script} from ${devtype}${devnum} ... && " \
+               "load ${devtype} ${devnum}:1 ${loadaddr} ${script} && " \
+               "source\0" \
        "sramupdate=setexpr tmp_addr $nor_base + 0x50000 &&"    \
                "tftpboot $tmp_addr $second_image && " \
                "setexpr tmp_addr $nor_base + 0x70000 && " \
                "tftpboot $third_image && " \
                "usb write $loadaddr 100 f00\0" \
        BOOT_IMAGES \
-       LINUXBOOT_ENV_SETTINGS
+       LINUXBOOT_ENV_SETTINGS \
+       BOOTENV
 
 #define CONFIG_SYS_BOOTMAPSZ                   0x20000000
 
-#define CONFIG_SYS_SDRAM_BASE          0x80000000
-#define CONFIG_NR_DRAM_BANKS           3
-
 #define CONFIG_SYS_INIT_SP_ADDR                (CONFIG_SYS_TEXT_BASE)
 
 /* 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               (0x00200000)
 
 #define CONFIG_SYS_NAND_U_BOOT_OFFS            0x20000
 
 /* subtract sizeof(struct image_header) */
-#define CONFIG_SYS_UBOOT_BASE                  (0x70000 - 0x40)
+#define CONFIG_SYS_UBOOT_BASE                  (0x130000 - 0x40)
 
 #define CONFIG_SPL_TARGET                      "u-boot-with-spl.bin"
 #define CONFIG_SPL_MAX_FOOTPRINT               0x10000