mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-09-24 16:32:20 +00:00
e6ca148104
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>
154 lines
4.2 KiB
C
154 lines
4.2 KiB
C
/* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */
|
|
/*
|
|
* Copyright (C) 2018, STMicroelectronics - All Rights Reserved
|
|
*
|
|
* Configuration settings for the STM32MP15x CPU
|
|
*/
|
|
|
|
#ifndef __CONFIG_STM32MP15_COMMMON_H
|
|
#define __CONFIG_STM32MP15_COMMMON_H
|
|
#include <linux/sizes.h>
|
|
#include <asm/arch/stm32.h>
|
|
|
|
/*
|
|
* Configuration of the external SRAM memory used by U-Boot
|
|
*/
|
|
#define CONFIG_SYS_SDRAM_BASE STM32_DDR_BASE
|
|
|
|
/*
|
|
* For booting Linux, use the first 256 MB of memory, since this is
|
|
* the maximum mapped by the Linux kernel during initialization.
|
|
*/
|
|
#define CONFIG_SYS_BOOTMAPSZ SZ_256M
|
|
|
|
/* Extend size of kernel image for uncompression */
|
|
|
|
/*MMC SD*/
|
|
#define CONFIG_SYS_MMC_MAX_DEVICE 3
|
|
|
|
/* NAND support */
|
|
#define CONFIG_SYS_MAX_NAND_DEVICE 1
|
|
|
|
/* Ethernet need */
|
|
#ifdef CONFIG_DWC_ETH_QOS
|
|
#define CONFIG_SERVERIP 192.168.1.1
|
|
#endif
|
|
|
|
/*****************************************************************************/
|
|
#ifdef CONFIG_DISTRO_DEFAULTS
|
|
/*****************************************************************************/
|
|
|
|
#if !defined(CONFIG_SPL_BUILD)
|
|
|
|
#ifdef CONFIG_CMD_MMC
|
|
#define BOOT_TARGET_MMC0(func) func(MMC, mmc, 0)
|
|
#define BOOT_TARGET_MMC1(func) func(MMC, mmc, 1)
|
|
#define BOOT_TARGET_MMC2(func) func(MMC, mmc, 2)
|
|
#else
|
|
#define BOOT_TARGET_MMC0(func)
|
|
#define BOOT_TARGET_MMC1(func)
|
|
#define BOOT_TARGET_MMC2(func)
|
|
#endif
|
|
|
|
#ifdef CONFIG_NET
|
|
#define BOOT_TARGET_PXE(func) func(PXE, pxe, na)
|
|
#else
|
|
#define BOOT_TARGET_PXE(func)
|
|
#endif
|
|
|
|
#ifdef CONFIG_CMD_UBIFS
|
|
#define BOOT_TARGET_UBIFS(func) func(UBIFS, ubifs, 0, UBI, boot)
|
|
#else
|
|
#define BOOT_TARGET_UBIFS(func)
|
|
#endif
|
|
|
|
#ifdef CONFIG_CMD_USB
|
|
#define BOOT_TARGET_USB(func) func(USB, usb, 0)
|
|
#else
|
|
#define BOOT_TARGET_USB(func)
|
|
#endif
|
|
|
|
#define BOOT_TARGET_DEVICES(func) \
|
|
BOOT_TARGET_MMC1(func) \
|
|
BOOT_TARGET_UBIFS(func) \
|
|
BOOT_TARGET_MMC0(func) \
|
|
BOOT_TARGET_MMC2(func) \
|
|
BOOT_TARGET_USB(func) \
|
|
BOOT_TARGET_PXE(func)
|
|
|
|
/*
|
|
* default bootcmd for stm32mp15:
|
|
* for serial/usb: execute the stm32prog command
|
|
* for mmc boot (eMMC, SD card), distro boot on the same mmc device
|
|
* for nand or spi-nand boot, distro boot with ubifs on UBI partition
|
|
* for nor boot, use the default distro order in ${boot_targets}
|
|
*/
|
|
#define STM32MP_BOOTCMD "bootcmd_stm32mp=" \
|
|
"echo \"Boot over ${boot_device}${boot_instance}!\";" \
|
|
"if test ${boot_device} = serial || test ${boot_device} = usb;" \
|
|
"then stm32prog ${boot_device} ${boot_instance}; " \
|
|
"else " \
|
|
"run env_check;" \
|
|
"if test ${boot_device} = mmc;" \
|
|
"then env set boot_targets \"mmc${boot_instance}\"; fi;" \
|
|
"if test ${boot_device} = nand ||" \
|
|
" test ${boot_device} = spi-nand ;" \
|
|
"then env set boot_targets ubifs0; fi;" \
|
|
"run distro_bootcmd;" \
|
|
"fi;\0"
|
|
|
|
#ifdef CONFIG_FASTBOOT_CMD_OEM_FORMAT
|
|
/* eMMC default partitions for fastboot command: oem format */
|
|
#define STM32MP_PARTS_DEFAULT \
|
|
"partitions=" \
|
|
"name=ssbl,size=2M;" \
|
|
"name=bootfs,size=64MB,bootable;" \
|
|
"name=vendorfs,size=16M;" \
|
|
"name=rootfs,size=746M;" \
|
|
"name=userfs,size=-\0"
|
|
#else
|
|
#define STM32MP_PARTS_DEFAULT
|
|
#endif
|
|
|
|
#define STM32MP_EXTRA \
|
|
"env_check=if env info -p -d -q; then env save; fi\0" \
|
|
"boot_net_usb_start=true\0"
|
|
|
|
#ifndef STM32MP_BOARD_EXTRA_ENV
|
|
#define STM32MP_BOARD_EXTRA_ENV
|
|
#endif
|
|
|
|
#include <config_distro_bootcmd.h>
|
|
|
|
/*
|
|
* memory layout for 32M uncompressed/compressed kernel,
|
|
* 1M fdt, 1M script, 1M pxe and 1M for overlay
|
|
* and the ramdisk at the end.
|
|
*/
|
|
#define __KERNEL_ADDR_R __stringify(0xc2000000)
|
|
#define __FDT_ADDR_R __stringify(0xc4000000)
|
|
#define __SCRIPT_ADDR_R __stringify(0xc4100000)
|
|
#define __PXEFILE_ADDR_R __stringify(0xc4200000)
|
|
#define __FDTOVERLAY_ADDR_R __stringify(0xc4300000)
|
|
#define __RAMDISK_ADDR_R __stringify(0xc4400000)
|
|
|
|
#define STM32MP_MEM_LAYOUT \
|
|
"kernel_addr_r=" __KERNEL_ADDR_R "\0" \
|
|
"fdt_addr_r=" __FDT_ADDR_R "\0" \
|
|
"scriptaddr=" __SCRIPT_ADDR_R "\0" \
|
|
"pxefile_addr_r=" __PXEFILE_ADDR_R "\0" \
|
|
"fdtoverlay_addr_r=" __FDTOVERLAY_ADDR_R "\0" \
|
|
"ramdisk_addr_r=" __RAMDISK_ADDR_R "\0"
|
|
|
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
|
STM32MP_MEM_LAYOUT \
|
|
STM32MP_BOOTCMD \
|
|
STM32MP_PARTS_DEFAULT \
|
|
BOOTENV \
|
|
STM32MP_EXTRA \
|
|
STM32MP_BOARD_EXTRA_ENV
|
|
|
|
#endif /* ifndef CONFIG_SPL_BUILD */
|
|
#endif /* ifdef CONFIG_DISTRO_DEFAULTS*/
|
|
|
|
#endif /* __CONFIG_STM32MP15_COMMMON_H */
|