leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
master
u-boot/include/configs/uniphier.h

166 lines
4.8 KiB
C
Raw Permalink Normal View History

SPDX: Convert all of our single license tags to Linux Kernel style When U-Boot started using SPDX tags we were among the early adopters and there weren't a lot of other examples to borrow from. So we picked the area of the file that usually had a full license text and replaced it with an appropriate SPDX-License-Identifier: entry. Since then, the Linux Kernel has adopted SPDX tags and they place it as the very first line in a file (except where shebangs are used, then it's second line) and with slightly different comment styles than us. In part due to community overlap, in part due to better tag visibility and in part for other minor reasons, switch over to that style. This commit changes all instances where we have a single declared license in the tag as both the before and after are identical in tag contents. There's also a few places where I found we did not have a tag and have introduced one. Signed-off-by: Tom Rini <trini@konsulko.com>
2018-05-06 21:58:06 +00:00
/* SPDX-License-Identifier: GPL-2.0+ */
ARM: UniPhier: add UniPhier SoC support code These are used by Panasonic UniPhier SoC family. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
2014-10-03 10:21:06 +00:00
/*
ARM: uniphier: add PSCI support for UniPhier ARMv7 SoCs Currently, only the CPU_ON function is supported. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2016-08-10 07:08:49 +00:00
* Copyright (C) 2012-2015 Panasonic Corporation
* Copyright (C) 2015-2016 Socionext Inc.
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
ARM: UniPhier: add UniPhier SoC support code These are used by Panasonic UniPhier SoC family. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
2014-10-03 10:21:06 +00:00
*/
Use correct spelling of "U-Boot" Correct spelling of "U-Boot" shall be used in all written text (documentation, comments in source files etc.). Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Heiko Schocher <hs@denx.de> Reviewed-by: Simon Glass <sjg@chromium.org> Reviewed-by: Minkyu Kang <mk7.kang@samsung.com>
2016-02-06 03:30:11 +00:00
/* U-Boot - Common settings for UniPhier Family */
ARM: UniPhier: add UniPhier SoC support code These are used by Panasonic UniPhier SoC family. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
2014-10-03 10:21:06 +00:00
ARM: uniphier: rename include guard of include/configs/uniphier.h Make the include guard match to the file name. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2020-07-30 09:28:04 +00:00
#ifndef __CONFIG_UNIPHIER_H__
#define __CONFIG_UNIPHIER_H__
ARM: UniPhier: add UniPhier SoC support code These are used by Panasonic UniPhier SoC family. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
2014-10-03 10:21:06 +00:00
ARM: uniphier: enable distro boot Switch to the distro boot for UniPhier platform. - Remove the environment vairalbes used to load images from raw block devices. - Keep the command to download images via tftp. This will be useful to boot the kernel when no valid kernel image is ready yet in the file system. - Use root.cpio.gz instead of root.cpio.uboot because we always know the file size of the init ramdisk; it is loaded via either a file system or network. - Rename fit_addr_r to kernel_addr_r, which the distro command checks to get the load address of FIT image. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2018-07-20 12:47:18 +00:00
#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
distroboot: Fix ubifs Fix multiple issues in ubifs distroboot code: U-Boot supports attaching only one MTD device as UBI at the time. So always call 'ubifsmount ubi0:${bootubivol}' for mounting UBI volume ${bootubivol}. Usage of 'ubi${devnum}' is incorrect as 'ubi part' command attach MTD device always as UBI device ubi0. Set distroboot ${bootfstype} variable to ubifs in ubifs_boot command. Distroboot scripts require ${bootfstype} variable to be properly set and it is already set for all other boot types. Set distroboot ${distro_bootpart} variable to ${bootubivol} value. UBI device does not have partitions, but has volumes. Distroboot scripts require something to be set in ${distro_bootpart} variable, so set it to the UBI volume which is currently mounted by ubifs. Set distroboot ${devnum} variable to fixed string "ubi0". ubifs code differs from the other partition code that it requires "ubi" prefix before number. Explicitly unmount ubifs volume after loading all data from it. This allows to detach UBI device from MTD device. Move definition of MTD device with UBI and UBI volume with ubifs filesystem from global env variables ${bootubipart} and ${bootubivol} into the distroboot "func" macro, defined in board include config files. UBIFS distroboot macros then set ${bootubipart} and ${bootubivol} local variables for compatibility with existing distroboot scripts. This last change allows to define more UBIFS target devices and make it clear what is boot MTD/UBI device. All board include config files are adjusted to use this new scheme of specifying boot MTD/UBI device. Signed-off-by: Pali Rohár <pali@kernel.org> Acked-by: Frieder Schrempf <frieder.schrempf@kontron.de>
2022-05-31 08:32:36 +00:00
#define BOOT_TARGET_DEVICE_UBIFS(func) func(UBIFS, ubifs, 0, UBI, boot)
ARM: uniphier: enable distro boot Switch to the distro boot for UniPhier platform. - Remove the environment vairalbes used to load images from raw block devices. - Keep the command to download images via tftp. This will be useful to boot the kernel when no valid kernel image is ready yet in the file system. - Use root.cpio.gz instead of root.cpio.uboot because we always know the file size of the init ramdisk; it is loaded via either a file system or network. - Rename fit_addr_r to kernel_addr_r, which the distro command checks to get the load address of FIT image. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2018-07-20 12:47:18 +00:00
#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)
ARM: uniphier: remove SPL support for ARMv8 SoCs It has been a while since ARM Trusted Firmware supported UniPhier SoC family. U-Boot SPL was intended as a temporary loader that runs in secure world. It is a maintenance headache to support two different boot mechanisms. Secure firmware is realm of ARM Trusted Firmware and now U-Boot only serves as a non-secure boot loader for UniPhier ARMv8 SoCs. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2017-07-13 11:32:15 +00:00
#if !defined(CONFIG_ARM64)
arm: uniphier: use DM_TIMER of arm a9 global timer All uniphier v7 SoCs have cortex-a9 and use cortex-a9 global timer in a simple implementation. Now DM_TIMER of it is available on 35751c7f3f ("timer: sti: convert sti-timer to arm a9 global timer"), so let's switch to it. The old driver reads the lower 32bits of counter field and sets the prescaler as 50 with PERIPHCLK(=50MHz), so the global timer works as a 32-bit 1MHz timer. The DM_TIMER uses the whole 64bits with no prescaler, so the global timer works as a 64-bit PERIPHCLK timer. CONFIG_SYS_HZ_CLOCK is set as the default PERIPHCLK frequency, if there is no 'clocks' property in devicetree. Signed-off-by: Dai Okamura <okamura.dai@socionext.com>
2022-12-09 11:33:48 +00:00
#define CFG_SYS_HZ_CLOCK 50000000
ARM: uniphier: add PH1-LD20 SoC support This is the first ARMv8 SoC from Socionext Inc. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2016-04-21 05:43:18 +00:00
#endif
global: Move remaining CONFIG_SYS_NAND_* to CFG_SYS_NAND_* The rest of the unmigrated CONFIG symbols in the CONFIG_SYS_NAND namespace do not easily transition to Kconfig. In many cases they likely should come from the device tree instead. Move these out of CONFIG namespace and in to CFG namespace. Signed-off-by: Tom Rini <trini@konsulko.com> Reviewed-by: Simon Glass <sjg@chromium.org>
2022-11-12 22:36:51 +00:00
#define CFG_SYS_NAND_REGS_BASE 0x68100000
#define CFG_SYS_NAND_DATA_BASE 0x68000000
ARM: UniPhier: add UniPhier SoC support code These are used by Panasonic UniPhier SoC family. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
2014-10-03 10:21:06 +00:00
/*
* Network Configuration
*/
ARM: uniphier: remove SPL support for ARMv8 SoCs It has been a while since ARM Trusted Firmware supported UniPhier SoC family. U-Boot SPL was intended as a temporary loader that runs in secure world. It is a maintenance headache to support two different boot mechanisms. Secure firmware is realm of ARM Trusted Firmware and now U-Boot only serves as a non-secure boot loader for UniPhier ARMv8 SoCs. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2017-07-13 11:32:15 +00:00
#if defined(CONFIG_ARM64)
ARM: uniphier: make update commands more flexible for ATF Currently, SPL (u-boot-spl.bin) and U-Boot (u-boot.bin) are stored in non-volatile devices, and some environments are defined to update the images easily. When ARM Trusted Firmware is fully used, SPL is not used. U-Boot proper is contained as BL33 into FIP (Firmware Image Package), which is standard container used by ATF. Allow to use it. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2017-01-27 21:53:54 +00:00
/* ARM Trusted Firmware */
#define BOOT_IMAGES \
ARM: uniphier: rename second stage loader name For the memory footprint reason, the Boot ROM can not load the ARM Trusted Firmware BL1 directly when Trusted Board Boot is enabled. The second stage loader is Socionext's own firmware, so rename it for clarification. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2017-02-12 09:21:16 +00:00
"second_image=unph_bl.bin\0" \
ARM: uniphier: make update commands more flexible for ATF Currently, SPL (u-boot-spl.bin) and U-Boot (u-boot.bin) are stored in non-volatile devices, and some environments are defined to update the images easily. When ARM Trusted Firmware is fully used, SPL is not used. U-Boot proper is contained as BL33 into FIP (Firmware Image Package), which is standard container used by ATF. Allow to use it. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2017-01-27 21:53:54 +00:00
"third_image=fip.bin\0"
#else
#define BOOT_IMAGES \
"second_image=u-boot-spl.bin\0" \
"third_image=u-boot.bin\0"
#endif
ARM: UniPhier: add environment sets for non-FIT Linux boot Currently, the environment variables "norboot" and "nandboot" only work with CONFIG_FIT, but we do not want to depend on CONFIG_FIT to boot the kernel. This commit adds environments useful for booting Linux with separate uImage + ramdisk + DTB. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2015-07-21 05:04:18 +00:00
#ifdef CONFIG_FIT
ARM: uniphier: set {kernel, ramdisk, fdt}_addr_r at boot-time The base of DRAM will be changed for the next generation SoC. The addresses needed for booting the kernel should be shifted according to the DRAM base. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2019-07-10 11:07:50 +00:00
#define KERNEL_ADDR_R_OFFSET "0x05100000"
ARM: UniPhier: add environment sets for non-FIT Linux boot Currently, the environment variables "norboot" and "nandboot" only work with CONFIG_FIT, but we do not want to depend on CONFIG_FIT to boot the kernel. This commit adds environments useful for booting Linux with separate uImage + ramdisk + DTB. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2015-07-21 05:04:18 +00:00
#define LINUXBOOT_ENV_SETTINGS \
ARM: uniphier: enable distro boot Switch to the distro boot for UniPhier platform. - Remove the environment vairalbes used to load images from raw block devices. - Keep the command to download images via tftp. This will be useful to boot the kernel when no valid kernel image is ready yet in the file system. - Use root.cpio.gz instead of root.cpio.uboot because we always know the file size of the init ramdisk; it is loaded via either a file system or network. - Rename fit_addr_r to kernel_addr_r, which the distro command checks to get the load address of FIT image. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2018-07-20 12:47:18 +00:00
"tftpboot=tftpboot $kernel_addr_r $bootfile &&" \
"bootm $kernel_addr_r\0" \
ARM: uniphier: fix nfsboot command This is no longer working, so needs reworking. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2016-01-21 05:56:09 +00:00
"__nfsboot=run tftpboot\0"
ARM: UniPhier: add environment sets for non-FIT Linux boot Currently, the environment variables "norboot" and "nandboot" only work with CONFIG_FIT, but we do not want to depend on CONFIG_FIT to boot the kernel. This commit adds environments useful for booting Linux with separate uImage + ramdisk + DTB. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2015-07-21 05:04:18 +00:00
#else
ARM: uniphier: add PH1-LD20 SoC support This is the first ARMv8 SoC from Socionext Inc. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2016-04-21 05:43:18 +00:00
#ifdef CONFIG_ARM64
#define LINUXBOOT_CMD "booti"
ARM: uniphier: set {kernel, ramdisk, fdt}_addr_r at boot-time The base of DRAM will be changed for the next generation SoC. The addresses needed for booting the kernel should be shifted according to the DRAM base. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2019-07-10 11:07:50 +00:00
#define KERNEL_ADDR_R_OFFSET "0x02080000"
ARM: uniphier: add PH1-LD20 SoC support This is the first ARMv8 SoC from Socionext Inc. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2016-04-21 05:43:18 +00:00
#else
#define LINUXBOOT_CMD "bootz"
ARM: uniphier: set {kernel, ramdisk, fdt}_addr_r at boot-time The base of DRAM will be changed for the next generation SoC. The addresses needed for booting the kernel should be shifted according to the DRAM base. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2019-07-10 11:07:50 +00:00
#define KERNEL_ADDR_R_OFFSET "0x00208000"
ARM: uniphier: add PH1-LD20 SoC support This is the first ARMv8 SoC from Socionext Inc. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2016-04-21 05:43:18 +00:00
#endif
ARM: UniPhier: add environment sets for non-FIT Linux boot Currently, the environment variables "norboot" and "nandboot" only work with CONFIG_FIT, but we do not want to depend on CONFIG_FIT to boot the kernel. This commit adds environments useful for booting Linux with separate uImage + ramdisk + DTB. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2015-07-21 05:04:18 +00:00
#define LINUXBOOT_ENV_SETTINGS \
ARM: uniphier: use Image.gz instead Image for booting ARM64 Linux The ARM64 Linux raw image now amounts to 15MB and it is getting bigger and bigger. Using Image.gz saves about 8MB. The cost of unzip is smaller than what we get by saving the kernel loading from non-volatile devices. The ARM32 Linux still uses zImage, a self-decompressor image, so it should not be affected. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2017-01-27 21:53:50 +00:00
"boot_common=setexpr bootm_low $kernel_addr_r '&' fe000000 && " \
ARM: uniphier: add PH1-LD20 SoC support This is the first ARMv8 SoC from Socionext Inc. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2016-04-21 05:43:18 +00:00
LINUXBOOT_CMD " $kernel_addr_r $ramdisk_addr_r $fdt_addr_r\0" \
ARM: uniphier: enable distro boot Switch to the distro boot for UniPhier platform. - Remove the environment vairalbes used to load images from raw block devices. - Keep the command to download images via tftp. This will be useful to boot the kernel when no valid kernel image is ready yet in the file system. - Use root.cpio.gz instead of root.cpio.uboot because we always know the file size of the init ramdisk; it is loaded via either a file system or network. - Rename fit_addr_r to kernel_addr_r, which the distro command checks to get the load address of FIT image. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2018-07-20 12:47:18 +00:00
"tftpboot=tftpboot $kernel_addr_r $bootfile && " \
ARM: uniphier: rename environment variable fdt_file to fdtfile For booting Linux in the generic distro mechanism, cmd/pxe.c retrieves the FDT file name from "fdtfile" environment variable. Rename "fdt_file" to "fdtfile" for easier migration to distro boot. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2018-05-17 10:55:20 +00:00
"tftpboot $fdt_addr_r $fdtfile &&" \
ARM: uniphier: enable distro boot Switch to the distro boot for UniPhier platform. - Remove the environment vairalbes used to load images from raw block devices. - Keep the command to download images via tftp. This will be useful to boot the kernel when no valid kernel image is ready yet in the file system. - Use root.cpio.gz instead of root.cpio.uboot because we always know the file size of the init ramdisk; it is loaded via either a file system or network. - Rename fit_addr_r to kernel_addr_r, which the distro command checks to get the load address of FIT image. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2018-07-20 12:47:18 +00:00
"tftpboot $ramdisk_addr_r $ramdisk_file &&" \
"setenv ramdisk_addr_r $ramdisk_addr_r:$filesize &&" \
ARM: uniphier: fix nfsboot command This is no longer working, so needs reworking. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2016-01-21 05:56:09 +00:00
"run boot_common\0" \
ARM: uniphier: use Image.gz instead Image for booting ARM64 Linux The ARM64 Linux raw image now amounts to 15MB and it is getting bigger and bigger. Using Image.gz saves about 8MB. The cost of unzip is smaller than what we get by saving the kernel loading from non-volatile devices. The ARM32 Linux still uses zImage, a self-decompressor image, so it should not be affected. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2017-01-27 21:53:50 +00:00
"__nfsboot=tftpboot $kernel_addr_load $bootfile && " \
ARM: uniphier: rename environment variable fdt_file to fdtfile For booting Linux in the generic distro mechanism, cmd/pxe.c retrieves the FDT file name from "fdtfile" environment variable. Rename "fdt_file" to "fdtfile" for easier migration to distro boot. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2018-05-17 10:55:20 +00:00
"tftpboot $fdt_addr_r $fdtfile &&" \
ARM: uniphier: fix nfsboot command This is no longer working, so needs reworking. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2016-01-21 05:56:09 +00:00
"setenv ramdisk_addr_r - &&" \
ARM: uniphier: factor out common part of boot commands The environment "bootm_low" is updated before the "bootz" command. This is common for all the boot modes (NOR, NAND, TFTP, etc.), so can be factored out. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2016-01-21 05:56:08 +00:00
"run boot_common\0"
ARM: UniPhier: add environment sets for non-FIT Linux boot Currently, the environment variables "norboot" and "nandboot" only work with CONFIG_FIT, but we do not want to depend on CONFIG_FIT to boot the kernel. This commit adds environments useful for booting Linux with separate uImage + ramdisk + DTB. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2015-07-21 05:04:18 +00:00
#endif
global: Migrate CONFIG_EXTRA_ENV_SETTINGS to CFG Perform a simple rename of CONFIG_EXTRA_ENV_SETTINGS to CFG_EXTRA_ENV_SETTINGS Signed-off-by: Tom Rini <trini@konsulko.com>
2022-12-04 15:03:50 +00:00
#define CFG_EXTRA_ENV_SETTINGS \
ARM: uniphier: set {kernel, ramdisk, fdt}_addr_r at boot-time The base of DRAM will be changed for the next generation SoC. The addresses needed for booting the kernel should be shifted according to the DRAM base. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2019-07-10 11:07:50 +00:00
"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" \
ARM: UniPhier: add environment sets for non-FIT Linux boot Currently, the environment variables "norboot" and "nandboot" only work with CONFIG_FIT, but we do not want to depend on CONFIG_FIT to boot the kernel. This commit adds environments useful for booting Linux with separate uImage + ramdisk + DTB. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2015-07-21 05:04:18 +00:00
"netdev=eth0\0" \
ARM: uniphier: set initrd_high environment to skip initrd relocation The boot_ramdisk_high() checks the environment "initrd_high" and, if it is set to (ulong)-1, skip the initrd relocation. This is useful for faster booting when we know the initrd is already located within the reach of the kernel. Change "norboot" to copy images in order to make it work without depending on the automatic relocation. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2017-01-27 21:53:51 +00:00
"initrd_high=0xffffffffffffffff\0" \
ARM: uniphier: set loadaddr at boot-time The base of DRAM will be changed for the next generation SoC. To support it along with existing SoCs in the single defconfig, set 'loadaddr' at boot-time by adding the offset to the DRAM base. CONFIG_SYS_LOAD_ADDR is still hard-coded for compilation, but the value from environment variable 'loadaddr' should be used. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2019-07-10 11:07:48 +00:00
"loadaddr_offset=0x05000000\0" \
ARM: uniphier: allow to source boot script before distro-boot Some users might need additional setups before booting the kernel. If there is found a file 'boot.scr', run it before invoking the distro boot command. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2018-12-19 11:03:14 +00:00
"script=boot.scr\0" \
ARM: uniphier: enable distro boot Switch to the distro boot for UniPhier platform. - Remove the environment vairalbes used to load images from raw block devices. - Keep the command to download images via tftp. This will be useful to boot the kernel when no valid kernel image is ready yet in the file system. - Use root.cpio.gz instead of root.cpio.uboot because we always know the file size of the init ramdisk; it is loaded via either a file system or network. - Rename fit_addr_r to kernel_addr_r, which the distro command checks to get the load address of FIT image. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2018-07-20 12:47:18 +00:00
"scriptaddr=0x85000000\0" \
ARM: uniphier: fix NOR boot command Commit 89835b3557fe ("ARM: uniphier: allow to run zImage rather than uImage") changed the kernel boot commands. Unlike "bootm", "bootz" does not relocate the kernel image. When the boot device is a NOR flash, the zImage should be copied from the NOR onto the DRAM before it is passed to the "bootz" command. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2016-01-21 05:56:06 +00:00
"nor_base=0x42000000\0" \
ARM: uniphier: do not modify bootcmd environment variable at run-time Some users might want to modify 'bootcmd' at compile-time by editing include/configs/uniphier.h, but overwriting it at run-time makes it impossible. Instead, set 'bootdev' at run-time, which contains the boot device the system is booting from, then indirectly reference it from 'bootcmd'. It is up to users whether to override 'bootcmd'. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2018-12-19 11:03:13 +00:00
"emmcboot=mmcsetn && run bootcmd_mmc${mmc_first_dev}\0" \
"nandboot=run bootcmd_ubifs0\0" \
"norboot=run tftpboot\0" \
ARM: uniphier: add sdscript, sdboot, sdupdate environment variables Add handy macros: - sdscript: source boot.scr in the file system of the SD media - sdboot : boot the kernel using the images in the file system of the SD media - sdscript: update the boot firmware in the SD media (in raw block sectors) Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2020-02-13 03:27:37 +00:00
"sdboot=sdsetn && run bootcmd_mmc${sd_first_dev}\0" \
ARM: uniphier: do not modify bootcmd environment variable at run-time Some users might want to modify 'bootcmd' at compile-time by editing include/configs/uniphier.h, but overwriting it at run-time makes it impossible. Instead, set 'bootdev' at run-time, which contains the boot device the system is booting from, then indirectly reference it from 'bootcmd'. It is up to users whether to override 'bootcmd'. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2018-12-19 11:03:13 +00:00
"usbboot=run bootcmd_usb0\0" \
ARM: uniphier: allow to source boot script before distro-boot Some users might need additional setups before booting the kernel. If there is found a file 'boot.scr', run it before invoking the distro boot command. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2018-12-19 11:03:14 +00:00
"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} && " \
ARM: uniphier: use $loadaddr for source command If the "source" command is not given the address, it uses CONFIG_SYS_LOAD_ADDR, which is compile-time determined. Using the "loadaddr" environment variable is handier because it is relocated according to the memory base when CONFIG_POSITION_INDEPENDENT is enabled. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2020-01-30 13:20:38 +00:00
"source $loadaddr\0" \
ARM: uniphier: add sdscript, sdboot, sdupdate environment variables Add handy macros: - sdscript: source boot.scr in the file system of the SD media - sdboot : boot the kernel using the images in the file system of the SD media - sdscript: update the boot firmware in the SD media (in raw block sectors) Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2020-02-13 03:27:37 +00:00
"sdscript=setenv devtype mmc && " \
"sdsetn && " \
"setenv devnum ${sd_first_dev} && " \
"run loadscript_fat\0" \
ARM: uniphier: allow to source boot script before distro-boot Some users might need additional setups before booting the kernel. If there is found a file 'boot.scr', run it before invoking the distro boot command. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2018-12-19 11:03:14 +00:00
"norscript=echo Running ${script} from tftp ... && " \
"tftpboot ${script} &&" \
ARM: uniphier: use $loadaddr for source command If the "source" command is not given the address, it uses CONFIG_SYS_LOAD_ADDR, which is compile-time determined. Using the "loadaddr" environment variable is handier because it is relocated according to the memory base when CONFIG_POSITION_INDEPENDENT is enabled. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2020-01-30 13:20:38 +00:00
"source $loadaddr\0" \
ARM: uniphier: allow to source boot script before distro-boot Some users might need additional setups before booting the kernel. If there is found a file 'boot.scr', run it before invoking the distro boot command. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2018-12-19 11:03:14 +00:00
"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} && " \
ARM: uniphier: use $loadaddr for source command If the "source" command is not given the address, it uses CONFIG_SYS_LOAD_ADDR, which is compile-time determined. Using the "loadaddr" environment variable is handier because it is relocated according to the memory base when CONFIG_POSITION_INDEPENDENT is enabled. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2020-01-30 13:20:38 +00:00
"source $loadaddr\0" \
ARM: uniphier: add sramupdate command This command would be useful to update U-Boot images in SRAM. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2016-03-24 13:23:36 +00:00
"sramupdate=setexpr tmp_addr $nor_base + 0x50000 &&" \
ARM: uniphier: make update commands more flexible for ATF Currently, SPL (u-boot-spl.bin) and U-Boot (u-boot.bin) are stored in non-volatile devices, and some environments are defined to update the images easily. When ARM Trusted Firmware is fully used, SPL is not used. U-Boot proper is contained as BL33 into FIP (Firmware Image Package), which is standard container used by ATF. Allow to use it. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2017-01-27 21:53:54 +00:00
"tftpboot $tmp_addr $second_image && " \
ARM: uniphier: change CONFIG_SPL_PAD_TO to 128KB The Boot ROM supports authentication feature to prevent malformed software from being run on products. The signature is added at the tail of the second stage loader (= SPL in U-boot terminology). The size of the second stage loader was 64KB, and it was consistent across SoCs. The situation changed when LD20 SoC appeared; it loads 80KB second stage loader, and it is the only exception. Currently, CONFIG_SPL_PAD_TO is set to 64KB and U-Boot proper is loaded from the 64KB offset of non-volatile devices. This means the signature of LD20 SoC (located at 80KB offset) corrupts the U-Boot proper image. Let's move the U-Boot proper image to 128KB offset. It uses 48KB for nothing but padding, and we could actually locate the U-Boot proper at 80KB offset. However, the power of 2 generally seems a better choice for the offset address. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2017-01-27 21:53:53 +00:00
"setexpr tmp_addr $nor_base + 0x70000 && " \
ARM: uniphier: make update commands more flexible for ATF Currently, SPL (u-boot-spl.bin) and U-Boot (u-boot.bin) are stored in non-volatile devices, and some environments are defined to update the images easily. When ARM Trusted Firmware is fully used, SPL is not used. U-Boot proper is contained as BL33 into FIP (Firmware Image Package), which is standard container used by ATF. Allow to use it. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2017-01-27 21:53:54 +00:00
"tftpboot $tmp_addr $third_image\0" \
ARM: uniphier: add emmcupdate command The Boot ROM expects the boot image (SPL) in the Boot Partition 1. So, updating images involves the hardware partition switch. It might be a bit advanced for some users. To be user-friendly, this commit adds a useful command to update the images; just put SPL and U-Boot proper into the public directory of the TFTP server and execute "run emmcupdate" from the command line. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2016-02-16 08:08:41 +00:00
"emmcupdate=mmcsetn &&" \
ARM: uniphier: select a correct mmc device before flashing images Some boards support an SD card and an eMMC device at the same time. Since both belong to 'mmc', they are identified by a device number. When the device number of the eMMC is 1 instead 0, "mmc dev" command must be performed to switch the target device before flashing images. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2018-04-20 09:38:27 +00:00
"mmc dev $mmc_first_dev &&" \
ARM: uniphier: add emmcupdate command The Boot ROM expects the boot image (SPL) in the Boot Partition 1. So, updating images involves the hardware partition switch. It might be a bit advanced for some users. To be user-friendly, this commit adds a useful command to update the images; just put SPL and U-Boot proper into the public directory of the TFTP server and execute "run emmcupdate" from the command line. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2016-02-16 08:08:41 +00:00
"mmc partconf $mmc_first_dev 0 1 1 &&" \
ARM: uniphier: make update commands more flexible for ATF Currently, SPL (u-boot-spl.bin) and U-Boot (u-boot.bin) are stored in non-volatile devices, and some environments are defined to update the images easily. When ARM Trusted Firmware is fully used, SPL is not used. U-Boot proper is contained as BL33 into FIP (Firmware Image Package), which is standard container used by ATF. Allow to use it. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2017-01-27 21:53:54 +00:00
"tftpboot $second_image && " \
ARM: uniphier: change CONFIG_SPL_PAD_TO to 128KB The Boot ROM supports authentication feature to prevent malformed software from being run on products. The signature is added at the tail of the second stage loader (= SPL in U-boot terminology). The size of the second stage loader was 64KB, and it was consistent across SoCs. The situation changed when LD20 SoC appeared; it loads 80KB second stage loader, and it is the only exception. Currently, CONFIG_SPL_PAD_TO is set to 64KB and U-Boot proper is loaded from the 64KB offset of non-volatile devices. This means the signature of LD20 SoC (located at 80KB offset) corrupts the U-Boot proper image. Let's move the U-Boot proper image to 128KB offset. It uses 48KB for nothing but padding, and we could actually locate the U-Boot proper at 80KB offset. However, the power of 2 generally seems a better choice for the offset address. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2017-01-27 21:53:53 +00:00
"mmc write $loadaddr 0 100 && " \
ARM: uniphier: make update commands more flexible for ATF Currently, SPL (u-boot-spl.bin) and U-Boot (u-boot.bin) are stored in non-volatile devices, and some environments are defined to update the images easily. When ARM Trusted Firmware is fully used, SPL is not used. U-Boot proper is contained as BL33 into FIP (Firmware Image Package), which is standard container used by ATF. Allow to use it. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2017-01-27 21:53:54 +00:00
"tftpboot $third_image && " \
ARM: uniphier: increase the firmware size in update command environment If a bigger EL32 is used, fip.bin can be larger than the currently assumed boot firmware size. Adjust the update commands. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2018-02-02 05:16:36 +00:00
"mmc write $loadaddr 100 f00\0" \
ARM: UniPhier: add environment sets for non-FIT Linux boot Currently, the environment variables "norboot" and "nandboot" only work with CONFIG_FIT, but we do not want to depend on CONFIG_FIT to boot the kernel. This commit adds environments useful for booting Linux with separate uImage + ramdisk + DTB. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2015-07-21 05:04:18 +00:00
"nandupdate=nand erase 0 0x00100000 &&" \
ARM: uniphier: make update commands more flexible for ATF Currently, SPL (u-boot-spl.bin) and U-Boot (u-boot.bin) are stored in non-volatile devices, and some environments are defined to update the images easily. When ARM Trusted Firmware is fully used, SPL is not used. U-Boot proper is contained as BL33 into FIP (Firmware Image Package), which is standard container used by ATF. Allow to use it. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2017-01-27 21:53:54 +00:00
"tftpboot $second_image && " \
ARM: uniphier: change CONFIG_SPL_PAD_TO to 128KB The Boot ROM supports authentication feature to prevent malformed software from being run on products. The signature is added at the tail of the second stage loader (= SPL in U-boot terminology). The size of the second stage loader was 64KB, and it was consistent across SoCs. The situation changed when LD20 SoC appeared; it loads 80KB second stage loader, and it is the only exception. Currently, CONFIG_SPL_PAD_TO is set to 64KB and U-Boot proper is loaded from the 64KB offset of non-volatile devices. This means the signature of LD20 SoC (located at 80KB offset) corrupts the U-Boot proper image. Let's move the U-Boot proper image to 128KB offset. It uses 48KB for nothing but padding, and we could actually locate the U-Boot proper at 80KB offset. However, the power of 2 generally seems a better choice for the offset address. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2017-01-27 21:53:53 +00:00
"nand write $loadaddr 0 0x00020000 && " \
ARM: uniphier: make update commands more flexible for ATF Currently, SPL (u-boot-spl.bin) and U-Boot (u-boot.bin) are stored in non-volatile devices, and some environments are defined to update the images easily. When ARM Trusted Firmware is fully used, SPL is not used. U-Boot proper is contained as BL33 into FIP (Firmware Image Package), which is standard container used by ATF. Allow to use it. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2017-01-27 21:53:54 +00:00
"tftpboot $third_image && " \
ARM: uniphier: increase the firmware size in update command environment If a bigger EL32 is used, fip.bin can be larger than the currently assumed boot firmware size. Adjust the update commands. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2018-02-02 05:16:36 +00:00
"nand write $loadaddr 0x00020000 0x001e0000\0" \
ARM: uniphier: add sdscript, sdboot, sdupdate environment variables Add handy macros: - sdscript: source boot.scr in the file system of the SD media - sdboot : boot the kernel using the images in the file system of the SD media - sdscript: update the boot firmware in the SD media (in raw block sectors) Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2020-02-13 03:27:37 +00:00
"sdupdate=sdsetn &&" \
"mmc dev $sd_first_dev &&" \
"tftpboot $second_image && " \
"mmc write $loadaddr 0 100 && " \
"tftpboot $third_image && " \
"mmc write $loadaddr 100 f00\0" \
ARM: uniphier: add usbupdate command This script command will be useful to update boot images in the USB storage. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2017-05-10 11:57:39 +00:00
"usbupdate=usb start &&" \
"tftpboot $second_image && " \
"usb write $loadaddr 0 100 && " \
"tftpboot $third_image && " \
ARM: uniphier: increase the firmware size in update command environment If a bigger EL32 is used, fip.bin can be larger than the currently assumed boot firmware size. Adjust the update commands. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2018-02-02 05:16:36 +00:00
"usb write $loadaddr 100 f00\0" \
ARM: uniphier: make update commands more flexible for ATF Currently, SPL (u-boot-spl.bin) and U-Boot (u-boot.bin) are stored in non-volatile devices, and some environments are defined to update the images easily. When ARM Trusted Firmware is fully used, SPL is not used. U-Boot proper is contained as BL33 into FIP (Firmware Image Package), which is standard container used by ATF. Allow to use it. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2017-01-27 21:53:54 +00:00
BOOT_IMAGES \
ARM: uniphier: enable distro boot Switch to the distro boot for UniPhier platform. - Remove the environment vairalbes used to load images from raw block devices. - Keep the command to download images via tftp. This will be useful to boot the kernel when no valid kernel image is ready yet in the file system. - Use root.cpio.gz instead of root.cpio.uboot because we always know the file size of the init ramdisk; it is loaded via either a file system or network. - Rename fit_addr_r to kernel_addr_r, which the distro command checks to get the load address of FIT image. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2018-07-20 12:47:18 +00:00
LINUXBOOT_ENV_SETTINGS \
BOOTENV
ARM: UniPhier: add UniPhier SoC support code These are used by Panasonic UniPhier SoC family. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
2014-10-03 10:21:06 +00:00
global: Move remaining CONFIG_SYS_* to CFG_SYS_* The rest of the unmigrated CONFIG symbols in the CONFIG_SYS namespace do not easily transition to Kconfig. In many cases they likely should come from the device tree instead. Move these out of CONFIG namespace and in to CFG namespace. Signed-off-by: Tom Rini <trini@konsulko.com> Reviewed-by: Simon Glass <sjg@chromium.org>
2022-11-16 18:10:41 +00:00
#define CFG_SYS_BOOTMAPSZ 0x20000000
ARM: uniphier: define CONFIG_SYS_BOOTMAPSZ U-Boot relocates the device tree and the initramdisk to the tail of the memory region before booting the kernel. Some UniPhier boards are equipped with a large amount of memory. For those boards, the device tree and the initramdisk are placed out of the the kernel causing a kernel panic. Add CONFIG_SYS_BOOTMAPSZ to prevent them from going too high. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2016-01-08 17:12:26 +00:00
ARM: uniphier: collect SPL CONFIG symbols to the bottom of header For clarification, move CONFIG symbols that affect SPL building into a single place. Drop #ifdef CONFIG_SPL ... #endif since it is harmless to define CONFIG_SPL_... during U-Boot proper building. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2017-01-27 21:53:49 +00:00
/* only for SPL */
ARM: UniPhier: enable CONFIG_PANIC_HANG Do not reset board on panic, which allows us to not link reset_cpu() into SPL. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2015-03-22 15:07:24 +00:00
treewide: Drop image_header_t typedef This is not needed and we should avoid typedefs. Use the struct instead and rename it to indicate that it really is a legacy struct. Signed-off-by: Simon Glass <sjg@chromium.org>
2022-09-07 02:26:52 +00:00
/* subtract sizeof(struct legacy_img_hdr) */
global: Move remaining CONFIG_SYS_* to CFG_SYS_* The rest of the unmigrated CONFIG symbols in the CONFIG_SYS namespace do not easily transition to Kconfig. In many cases they likely should come from the device tree instead. Move these out of CONFIG namespace and in to CFG namespace. Signed-off-by: Tom Rini <trini@konsulko.com> Reviewed-by: Simon Glass <sjg@chromium.org>
2022-11-16 18:10:41 +00:00
#define CFG_SYS_UBOOT_BASE (0x130000 - 0x40)
ARM: UniPhier: add UniPhier SoC support code These are used by Panasonic UniPhier SoC family. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
2014-10-03 10:21:06 +00:00
ARM: uniphier: rename include guard of include/configs/uniphier.h Make the include guard match to the file name. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2020-07-30 09:28:04 +00:00
#endif /* __CONFIG_UNIPHIER_H__ */
Reference in New Issue Copy Permalink