mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-07 21:54:45 +00:00
b212ad24a6
Basically all, i.e. rk3036.dtsi, rk3128.dtsi, rk3xxx.dtsi, rk322x.dtsi, rk3288.dtsi, rk3308-u-boot.dtsi, rk3328-u-boot.dtsi, rk3399-u-boot.dtsi and px30-u-boot.dtsi Rockchip SoC devicetrees which have mmc indexes are defining eMMC as mmc0 and sdmmc as mmc1. This means that the rule to try to boot from the SD card first is ignored, which as per comment is what we want and is important for distros, which rely on that. Fix this by setting the correct mmc index, i.e. first from mmc1 (SD card), second from mmc0 (eMMC). Signed-off-by: Alex Bee <knaerzche@gmail.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
87 lines
2 KiB
C
87 lines
2 KiB
C
/* SPDX-License-Identifier: GPL-2.0+ */
|
|
/*
|
|
* (C) Copyright 2016 Rockchip Electronics Co., Ltd
|
|
*/
|
|
|
|
#ifndef _ROCKCHIP_COMMON_H_
|
|
#define _ROCKCHIP_COMMON_H_
|
|
#include <linux/sizes.h>
|
|
|
|
#define CONFIG_SYS_NS16550_MEM32
|
|
|
|
/* ((CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR - 64) * 512) */
|
|
#define CONFIG_SPL_PAD_TO 8355840
|
|
|
|
#ifndef CONFIG_SPL_BUILD
|
|
|
|
/* First try to boot from SD (index 1), then eMMC (index 0) */
|
|
#if CONFIG_IS_ENABLED(CMD_MMC)
|
|
#define BOOT_TARGET_MMC(func) \
|
|
func(MMC, mmc, 1) \
|
|
func(MMC, mmc, 0)
|
|
#else
|
|
#define BOOT_TARGET_MMC(func)
|
|
#endif
|
|
|
|
#if CONFIG_IS_ENABLED(CMD_NVME)
|
|
#define BOOT_TARGET_NVME(func) func(NVME, nvme, 0)
|
|
#else
|
|
#define BOOT_TARGET_NVME(func)
|
|
#endif
|
|
|
|
#if CONFIG_IS_ENABLED(CMD_USB)
|
|
#define BOOT_TARGET_USB(func) func(USB, usb, 0)
|
|
#else
|
|
#define BOOT_TARGET_USB(func)
|
|
#endif
|
|
|
|
#if CONFIG_IS_ENABLED(CMD_PXE)
|
|
#define BOOT_TARGET_PXE(func) func(PXE, pxe, na)
|
|
#else
|
|
#define BOOT_TARGET_PXE(func)
|
|
#endif
|
|
|
|
#if CONFIG_IS_ENABLED(CMD_DHCP)
|
|
#define BOOT_TARGET_DHCP(func) func(DHCP, dhcp, na)
|
|
#else
|
|
#define BOOT_TARGET_DHCP(func)
|
|
#endif
|
|
|
|
#if CONFIG_IS_ENABLED(CMD_SF)
|
|
#define BOOT_TARGET_SF(func) func(SF, sf, 0)
|
|
#else
|
|
#define BOOT_TARGET_SF(func)
|
|
#endif
|
|
|
|
#ifdef CONFIG_ROCKCHIP_RK3399
|
|
#define BOOT_TARGET_DEVICES(func) \
|
|
BOOT_TARGET_MMC(func) \
|
|
BOOT_TARGET_NVME(func) \
|
|
BOOT_TARGET_USB(func) \
|
|
BOOT_TARGET_PXE(func) \
|
|
BOOT_TARGET_DHCP(func) \
|
|
BOOT_TARGET_SF(func)
|
|
#else
|
|
#define BOOT_TARGET_DEVICES(func) \
|
|
BOOT_TARGET_MMC(func) \
|
|
BOOT_TARGET_USB(func) \
|
|
BOOT_TARGET_PXE(func) \
|
|
BOOT_TARGET_DHCP(func)
|
|
#endif
|
|
|
|
#ifdef CONFIG_ARM64
|
|
#define ROOT_UUID "B921B045-1DF0-41C3-AF44-4C6F280D3FAE;\0"
|
|
#else
|
|
#define ROOT_UUID "69DAD710-2CE4-4E3C-B16C-21A1D49ABED3;\0"
|
|
#endif
|
|
#define PARTS_DEFAULT \
|
|
"uuid_disk=${uuid_gpt_disk};" \
|
|
"name=loader1,start=32K,size=4000K,uuid=${uuid_gpt_loader1};" \
|
|
"name=loader2,start=8MB,size=4MB,uuid=${uuid_gpt_loader2};" \
|
|
"name=trust,size=4M,uuid=${uuid_gpt_atf};" \
|
|
"name=boot,size=112M,bootable,uuid=${uuid_gpt_boot};" \
|
|
"name=rootfs,size=-,uuid="ROOT_UUID
|
|
|
|
#endif
|
|
|
|
#endif /* _ROCKCHIP_COMMON_H_ */
|