mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-12-01 17:10:11 +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>
62 lines
1.5 KiB
C
62 lines
1.5 KiB
C
/* SPDX-License-Identifier: GPL-2.0+ */
|
|
/*
|
|
* Copyright (C) 2018 Kontron Electronics GmbH
|
|
*
|
|
* Configuration settings for the Kontron i.MX6UL boards/SoMs.
|
|
*/
|
|
#ifndef __KONTRON_MX6UL_CONFIG_H
|
|
#define __KONTRON_MX6UL_CONFIG_H
|
|
|
|
#include <asm/arch/imx-regs.h>
|
|
#include <linux/sizes.h>
|
|
|
|
#include "mx6_common.h"
|
|
#ifdef CONFIG_SPL_BUILD
|
|
#include "imx6_spl.h"
|
|
#endif
|
|
|
|
/* RAM */
|
|
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
|
|
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM
|
|
|
|
#define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR
|
|
#define CONFIG_SYS_INIT_RAM_SIZE IRAM_SIZE
|
|
|
|
#define CONFIG_SYS_UBOOT_BASE CONFIG_SYS_TEXT_BASE
|
|
|
|
/* Board and environment settings */
|
|
#define CONFIG_MXC_UART_BASE UART4_BASE
|
|
#define CONFIG_HOSTNAME "kontron-mx6ul"
|
|
|
|
#ifdef CONFIG_USB_EHCI_HCD
|
|
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
|
|
#define CONFIG_MXC_USB_FLAGS 0
|
|
#endif
|
|
|
|
/* Boot order for distro boot */
|
|
#define BOOT_TARGET_DEVICES(func) \
|
|
func(MMC, mmc, 1) \
|
|
func(MMC, mmc, 0) \
|
|
func(UBIFS, ubifs, 0, UBI, boot) \
|
|
func(USB, usb, 0) \
|
|
func(PXE, pxe, na) \
|
|
func(DHCP, dhcp, na)
|
|
#include <config_distro_bootcmd.h>
|
|
|
|
/* MMC Configs */
|
|
#ifdef CONFIG_FSL_USDHC
|
|
#define CONFIG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR
|
|
#define CONFIG_SYS_FSL_USDHC_NUM 2
|
|
#endif
|
|
|
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
|
"kernel_addr_r=0x82000000\0" \
|
|
"ramdisk_addr_r=0x88080000\0" \
|
|
"pxefile_addr_r=0x80100000\0" \
|
|
"scriptaddr=0x80100000\0" \
|
|
"bootdelay=3\0" \
|
|
"ethact=" CONFIG_ETHPRIME "\0" \
|
|
"hostname=" CONFIG_HOSTNAME "\0" \
|
|
BOOTENV
|
|
|
|
#endif /* __KONTRON_MX6UL_CONFIG_H */
|