mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-15 01:17:39 +00:00
rockchip: ringneck-px30/puma-rk3399: factor out storage medium selection
Ringneck PX30 and Puma RK3399 both have the same expectation with regard to bootstd device order and U-Boot environment storage device, except that Puma RK3399 also supports SPI Flash. Let's move all of this into a common file where common logic can be put. Cc: Quentin Schulz <foss+uboot@0leil.net> Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
This commit is contained in:
Quentin Schulz
Kever Yang
parent
6fdcf00605
commit
56bb09f502
8 changed files with 176 additions and 307 deletions
147
board/theobroma-systems/common/common.c
Normal file
147
board/theobroma-systems/common/common.c
Normal file
|
|
@ -0,0 +1,147 @@
|
|||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
/*
|
||||
* (C) Copyright 2017 Theobroma Systems Design und Consulting GmbH
|
||||
*/
|
||||
|
||||
#include <dm.h>
|
||||
#include <env.h>
|
||||
#include <env_internal.h>
|
||||
#include <dm/uclass-internal.h>
|
||||
|
||||
/*
|
||||
* Swap mmc0 and mmc1 in boot_targets if booted from SD-Card.
|
||||
*
|
||||
* If bootsource is uSD-card we can assume that we want to use the
|
||||
* SD-Card instead of the eMMC as first boot_target for distroboot.
|
||||
* We only want to swap the defaults and not any custom environment a
|
||||
* user has set. We exit early if a changed boot_targets environment
|
||||
* is detected.
|
||||
*/
|
||||
int setup_boottargets(void)
|
||||
{
|
||||
const char *boot_device =
|
||||
ofnode_read_chosen_string("u-boot,spl-boot-device");
|
||||
char *env_default, *env;
|
||||
|
||||
if (!boot_device) {
|
||||
debug("%s: /chosen/u-boot,spl-boot-device not set\n",
|
||||
__func__);
|
||||
return -1;
|
||||
}
|
||||
debug("%s: booted from %s\n", __func__, boot_device);
|
||||
|
||||
env_default = env_get_default("boot_targets");
|
||||
env = env_get("boot_targets");
|
||||
if (!env) {
|
||||
debug("%s: boot_targets does not exist\n", __func__);
|
||||
return -1;
|
||||
}
|
||||
debug("%s: boot_targets current: %s - default: %s\n",
|
||||
__func__, env, env_default);
|
||||
|
||||
if (strcmp(env_default, env) != 0) {
|
||||
debug("%s: boot_targets not default, don't change it\n",
|
||||
__func__);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Make the default boot medium between SD Card and eMMC, the one that
|
||||
* was used to load U-Boot proper. If SPI-NOR flash was used, keep
|
||||
* original default order.
|
||||
*/
|
||||
struct udevice *devp;
|
||||
|
||||
if (uclass_find_device_by_ofnode(UCLASS_MMC, ofnode_path(boot_device), &devp)) {
|
||||
debug("%s: not reordering boot_targets, bootdev %s != MMC\n",
|
||||
__func__, boot_device);
|
||||
return 0;
|
||||
}
|
||||
|
||||
char *mmc0, *mmc1;
|
||||
|
||||
mmc0 = strstr(env, "mmc0");
|
||||
mmc1 = strstr(env, "mmc1");
|
||||
|
||||
if (!mmc0 || !mmc1) {
|
||||
debug("%s: only one mmc boot_target found\n", __func__);
|
||||
return -1;
|
||||
}
|
||||
|
||||
/*
|
||||
* If mmc0 comes first in the boot order and U-Boot proper was
|
||||
* loaded from mmc1, swap mmc0 and mmc1 in the list.
|
||||
* If mmc1 comes first in the boot order and U-Boot proper was
|
||||
* loaded from mmc0, swap mmc0 and mmc1 in the list.
|
||||
*/
|
||||
if ((mmc0 < mmc1 && devp->seq_ == 1) ||
|
||||
(mmc0 > mmc1 && devp->seq_ == 0)) {
|
||||
mmc0[3] = '1';
|
||||
mmc1[3] = '0';
|
||||
debug("%s: set boot_targets to: %s\n", __func__, env);
|
||||
env_set("boot_targets", env);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int mmc_get_env_dev(void)
|
||||
{
|
||||
const char *boot_device =
|
||||
ofnode_read_chosen_string("u-boot,spl-boot-device");
|
||||
struct udevice *devp;
|
||||
|
||||
if (!boot_device) {
|
||||
debug("%s: /chosen/u-boot,spl-boot-device not set\n",
|
||||
__func__);
|
||||
#ifdef CONFIG_SYS_MMC_ENV_DEV
|
||||
return CONFIG_SYS_MMC_ENV_DEV;
|
||||
#else
|
||||
return 0;
|
||||
#endif
|
||||
}
|
||||
|
||||
debug("%s: booted from %s\n", __func__, boot_device);
|
||||
|
||||
if (uclass_find_device_by_ofnode(UCLASS_MMC, ofnode_path(boot_device), &devp))
|
||||
#ifdef CONFIG_SYS_MMC_ENV_DEV
|
||||
return CONFIG_SYS_MMC_ENV_DEV;
|
||||
#else
|
||||
return 0;
|
||||
#endif
|
||||
|
||||
debug("%s: get MMC ENV from mmc%d\n", __func__, devp->seq_);
|
||||
|
||||
return devp->seq_;
|
||||
}
|
||||
|
||||
enum env_location arch_env_get_location(enum env_operation op, int prio)
|
||||
{
|
||||
const char *boot_device =
|
||||
ofnode_read_chosen_string("u-boot,spl-boot-device");
|
||||
struct udevice *devp;
|
||||
|
||||
if (prio > 0)
|
||||
return ENVL_UNKNOWN;
|
||||
|
||||
if (!boot_device) {
|
||||
debug("%s: /chosen/u-boot,spl-boot-device not set\n",
|
||||
__func__);
|
||||
return ENVL_NOWHERE;
|
||||
}
|
||||
|
||||
debug("%s: booted from %s\n", __func__, boot_device);
|
||||
|
||||
if (IS_ENABLED(CONFIG_ENV_IS_IN_SPI_FLASH) &&
|
||||
!uclass_find_device_by_ofnode(UCLASS_SPI_FLASH, ofnode_path(boot_device), &devp))
|
||||
return ENVL_SPI_FLASH;
|
||||
|
||||
if (IS_ENABLED(CONFIG_ENV_IS_IN_MMC) &&
|
||||
!uclass_find_device_by_ofnode(UCLASS_MMC, ofnode_path(boot_device), &devp))
|
||||
return ENVL_MMC;
|
||||
|
||||
printf("%s: No environment available: booted from %s but U-Boot config does not allow loading environment from it.",
|
||||
__func__, boot_device);
|
||||
|
||||
return ENVL_NOWHERE;
|
||||
}
|
||||
19
board/theobroma-systems/common/common.h
Normal file
19
board/theobroma-systems/common/common.h
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
||||
/*
|
||||
* (C) Copyright 2023 Theobroma Systems Design und Consulting GmbH
|
||||
*/
|
||||
|
||||
/*
|
||||
* setup_boottargets() - Swap mmc0 and mmc1 in boot_targets depending on U-Boot
|
||||
* proper load medium.
|
||||
*
|
||||
* If bootsource is uSD-card we can assume that we want to use the
|
||||
* SD-Card instead of the eMMC as first boot_target for distroboot.
|
||||
* We only want to swap the defaults and not any custom environment a
|
||||
* user has set. We exit early if a changed boot_targets environment
|
||||
* is detected.
|
||||
*
|
||||
* Return:
|
||||
* 0 if OK, -1 otherwise
|
||||
*/
|
||||
int setup_boottargets(void);
|
||||
|
|
@ -3,6 +3,7 @@ M: Quentin Schulz <quentin.schulz@theobroma-systems.com>
|
|||
M: Klaus Goger <klaus.goger@theobroma-systems.com>
|
||||
S: Maintained
|
||||
F: board/theobroma-systems/puma_rk3399
|
||||
F: board/theobroma-systems/common
|
||||
F: include/configs/puma_rk3399.h
|
||||
F: arch/arm/dts/rk3399-puma.dts
|
||||
F: configs/puma-rk3399_defconfig
|
||||
|
|
|
|||
|
|
@ -5,3 +5,6 @@
|
|||
#
|
||||
|
||||
obj-y += puma-rk3399.o
|
||||
ifneq ($(CONFIG_SPL_BUILD),y)
|
||||
obj-y += ../common/common.o
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -3,28 +3,15 @@
|
|||
* (C) Copyright 2017 Theobroma Systems Design und Consulting GmbH
|
||||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <dm.h>
|
||||
#include <env.h>
|
||||
#include <env_internal.h>
|
||||
#include <init.h>
|
||||
#include <log.h>
|
||||
#include <misc.h>
|
||||
#include <spl.h>
|
||||
#include <syscon.h>
|
||||
#include <u-boot/crc.h>
|
||||
#include <usb.h>
|
||||
#include <dm/pinctrl.h>
|
||||
#include <dm/uclass-internal.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/setup.h>
|
||||
#include <asm/arch-rockchip/clock.h>
|
||||
#include <asm/arch-rockchip/hardware.h>
|
||||
#include <asm/arch-rockchip/grf_rk3399.h>
|
||||
#include <asm/arch-rockchip/periph.h>
|
||||
#include <asm/arch-rockchip/misc.h>
|
||||
#include <power/regulator.h>
|
||||
#include <u-boot/sha256.h>
|
||||
#include "../common/common.h"
|
||||
|
||||
static void setup_iodomain(void)
|
||||
{
|
||||
|
|
@ -40,145 +27,6 @@ static void setup_iodomain(void)
|
|||
rk_setreg(&grf->io_vsel, 1 << GRF_IO_VSEL_GPIO4CD_SHIFT);
|
||||
}
|
||||
|
||||
/*
|
||||
* Swap mmc0 and mmc1 in boot_targets if booted from SD-Card.
|
||||
*
|
||||
* If bootsource is uSD-card we can assume that we want to use the
|
||||
* SD-Card instead of the eMMC as first boot_target for distroboot.
|
||||
* We only want to swap the defaults and not any custom environment a
|
||||
* user has set. We exit early if a changed boot_targets environment
|
||||
* is detected.
|
||||
*/
|
||||
static int setup_boottargets(void)
|
||||
{
|
||||
const char *boot_device =
|
||||
ofnode_read_chosen_string("u-boot,spl-boot-device");
|
||||
char *env_default, *env;
|
||||
|
||||
if (!boot_device) {
|
||||
debug("%s: /chosen/u-boot,spl-boot-device not set\n",
|
||||
__func__);
|
||||
return -1;
|
||||
}
|
||||
debug("%s: booted from %s\n", __func__, boot_device);
|
||||
|
||||
env_default = env_get_default("boot_targets");
|
||||
env = env_get("boot_targets");
|
||||
if (!env) {
|
||||
debug("%s: boot_targets does not exist\n", __func__);
|
||||
return -1;
|
||||
}
|
||||
debug("%s: boot_targets current: %s - default: %s\n",
|
||||
__func__, env, env_default);
|
||||
|
||||
if (strcmp(env_default, env) != 0) {
|
||||
debug("%s: boot_targets not default, don't change it\n",
|
||||
__func__);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Make the default boot medium between SD Card and eMMC, the one that
|
||||
* was used to load U-Boot proper. If SPI-NOR flash was used, keep
|
||||
* original default order.
|
||||
*/
|
||||
struct udevice *devp;
|
||||
|
||||
if (uclass_find_device_by_ofnode(UCLASS_MMC, ofnode_path(boot_device), &devp)) {
|
||||
debug("%s: not reordering boot_targets, bootdev %s != MMC\n",
|
||||
__func__, boot_device);
|
||||
return 0;
|
||||
}
|
||||
|
||||
char *mmc0, *mmc1;
|
||||
|
||||
mmc0 = strstr(env, "mmc0");
|
||||
mmc1 = strstr(env, "mmc1");
|
||||
|
||||
if (!mmc0 || !mmc1) {
|
||||
debug("%s: only one mmc boot_target found\n", __func__);
|
||||
return -1;
|
||||
}
|
||||
|
||||
/*
|
||||
* If mmc0 comes first in the boot order and U-Boot proper was
|
||||
* loaded from mmc1, swap mmc0 and mmc1 in the list.
|
||||
* If mmc1 comes first in the boot order and U-Boot proper was
|
||||
* loaded from mmc0, swap mmc0 and mmc1 in the list.
|
||||
*/
|
||||
if ((mmc0 < mmc1 && devp->seq_ == 1) ||
|
||||
(mmc0 > mmc1 && devp->seq_ == 0)) {
|
||||
mmc0[3] = '1';
|
||||
mmc1[3] = '0';
|
||||
debug("%s: set boot_targets to: %s\n", __func__, env);
|
||||
env_set("boot_targets", env);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int mmc_get_env_dev(void)
|
||||
{
|
||||
const char *boot_device =
|
||||
ofnode_read_chosen_string("u-boot,spl-boot-device");
|
||||
struct udevice *devp;
|
||||
|
||||
if (!boot_device) {
|
||||
debug("%s: /chosen/u-boot,spl-boot-device not set\n",
|
||||
__func__);
|
||||
#ifdef CONFIG_SYS_MMC_ENV_DEV
|
||||
return CONFIG_SYS_MMC_ENV_DEV;
|
||||
#else
|
||||
return 0;
|
||||
#endif
|
||||
}
|
||||
|
||||
debug("%s: booted from %s\n", __func__, boot_device);
|
||||
|
||||
if (uclass_find_device_by_ofnode(UCLASS_MMC, ofnode_path(boot_device), &devp))
|
||||
#ifdef CONFIG_SYS_MMC_ENV_DEV
|
||||
return CONFIG_SYS_MMC_ENV_DEV;
|
||||
#else
|
||||
return 0;
|
||||
#endif
|
||||
|
||||
debug("%s: get MMC ENV from mmc%d\n", __func__, devp->seq_);
|
||||
|
||||
return devp->seq_;
|
||||
}
|
||||
|
||||
enum env_location arch_env_get_location(enum env_operation op, int prio)
|
||||
{
|
||||
const char *boot_device =
|
||||
ofnode_read_chosen_string("u-boot,spl-boot-device");
|
||||
struct udevice *devp;
|
||||
|
||||
if (prio > 0)
|
||||
return ENVL_UNKNOWN;
|
||||
|
||||
if (!boot_device) {
|
||||
debug("%s: /chosen/u-boot,spl-boot-device not set\n",
|
||||
__func__);
|
||||
return ENVL_NOWHERE;
|
||||
}
|
||||
|
||||
debug("%s: booted from %s\n", __func__, boot_device);
|
||||
|
||||
if (IS_ENABLED(CONFIG_ENV_IS_IN_SPI_FLASH) &&
|
||||
!uclass_find_device_by_ofnode(UCLASS_SPI_FLASH, ofnode_path(boot_device), &devp))
|
||||
return ENVL_SPI_FLASH;
|
||||
|
||||
if (IS_ENABLED(CONFIG_ENV_IS_IN_MMC) &&
|
||||
!uclass_find_device_by_ofnode(UCLASS_MMC, ofnode_path(boot_device), &devp))
|
||||
return ENVL_MMC;
|
||||
|
||||
printf("%s: No environment available: booted from %s but U-Boot "
|
||||
"config does not allow loading environment from it.",
|
||||
__func__, boot_device);
|
||||
|
||||
return ENVL_NOWHERE;
|
||||
}
|
||||
|
||||
int misc_init_r(void)
|
||||
{
|
||||
const u32 cpuid_offset = 0x7;
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ M: Quentin Schulz <quentin.schulz@theobroma-systems.com>
|
|||
M: Klaus Goger <klaus.goger@theobroma-systems.com>
|
||||
S: Maintained
|
||||
F: board/theobroma-systems/ringneck_px30
|
||||
F: board/theobroma-systems/common
|
||||
F: include/configs/ringneck_px30.h
|
||||
F: arch/arm/dts/px30-ringneck*
|
||||
F: configs/ringneck-px30_defconfig
|
||||
|
|
|
|||
|
|
@ -5,3 +5,6 @@
|
|||
#
|
||||
|
||||
obj-y += ringneck-px30.o
|
||||
ifneq ($(CONFIG_SPL_BUILD),y)
|
||||
obj-y += ../common/common.o
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -3,163 +3,10 @@
|
|||
* (C) Copyright 2022 Theobroma Systems Design und Consulting GmbH
|
||||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <dm.h>
|
||||
#include <env.h>
|
||||
#include <env_internal.h>
|
||||
#include <init.h>
|
||||
#include <log.h>
|
||||
#include <misc.h>
|
||||
#include <spl.h>
|
||||
#include <syscon.h>
|
||||
#include <u-boot/crc.h>
|
||||
#include <usb.h>
|
||||
#include <dm/pinctrl.h>
|
||||
#include <dm/uclass-internal.h>
|
||||
#include <asm/gpio.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/setup.h>
|
||||
#include <asm/arch-rockchip/clock.h>
|
||||
#include <asm/arch-rockchip/hardware.h>
|
||||
#include <asm/arch-rockchip/periph.h>
|
||||
#include <asm/arch-rockchip/misc.h>
|
||||
#include <linux/delay.h>
|
||||
#include <power/regulator.h>
|
||||
#include <u-boot/sha256.h>
|
||||
|
||||
/*
|
||||
* Swap mmc0 and mmc1 in boot_targets if booted from SD-Card.
|
||||
*
|
||||
* If bootsource is uSD-card we can assume that we want to use the
|
||||
* SD-Card instead of the eMMC as first boot_target for distroboot.
|
||||
* We only want to swap the defaults and not any custom environment a
|
||||
* user has set. We exit early if a changed boot_targets environment
|
||||
* is detected.
|
||||
*/
|
||||
static int setup_boottargets(void)
|
||||
{
|
||||
const char *boot_device =
|
||||
ofnode_read_chosen_string("u-boot,spl-boot-device");
|
||||
char *env_default, *env;
|
||||
|
||||
if (!boot_device) {
|
||||
debug("%s: /chosen/u-boot,spl-boot-device not set\n",
|
||||
__func__);
|
||||
return -1;
|
||||
}
|
||||
debug("%s: booted from %s\n", __func__, boot_device);
|
||||
|
||||
env_default = env_get_default("boot_targets");
|
||||
env = env_get("boot_targets");
|
||||
if (!env) {
|
||||
debug("%s: boot_targets does not exist\n", __func__);
|
||||
return -1;
|
||||
}
|
||||
debug("%s: boot_targets current: %s - default: %s\n",
|
||||
__func__, env, env_default);
|
||||
|
||||
if (strcmp(env_default, env) != 0) {
|
||||
debug("%s: boot_targets not default, don't change it\n",
|
||||
__func__);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Make the default boot medium between SD Card and eMMC, the one that
|
||||
* was used to load U-Boot proper.
|
||||
*/
|
||||
struct udevice *devp;
|
||||
|
||||
if (uclass_find_device_by_ofnode(UCLASS_MMC, ofnode_path(boot_device), &devp)) {
|
||||
debug("%s: not reordering boot_targets, bootdev %s != MMC\n",
|
||||
__func__, boot_device);
|
||||
return 0;
|
||||
}
|
||||
|
||||
char *mmc0, *mmc1;
|
||||
|
||||
mmc0 = strstr(env, "mmc0");
|
||||
mmc1 = strstr(env, "mmc1");
|
||||
|
||||
if (!mmc0 || !mmc1) {
|
||||
debug("%s: only one mmc boot_target found\n", __func__);
|
||||
return -1;
|
||||
}
|
||||
|
||||
/*
|
||||
* If mmc0 comes first in the boot order and U-Boot proper was
|
||||
* loaded from mmc1, swap mmc0 and mmc1 in the list.
|
||||
* If mmc1 comes first in the boot order and U-Boot proper was
|
||||
* loaded from mmc0, swap mmc0 and mmc1 in the list.
|
||||
*/
|
||||
if ((mmc0 < mmc1 && devp->seq_ == 1) ||
|
||||
(mmc0 > mmc1 && devp->seq_ == 0)) {
|
||||
mmc0[3] = '1';
|
||||
mmc1[3] = '0';
|
||||
debug("%s: set boot_targets to: %s\n", __func__, env);
|
||||
env_set("boot_targets", env);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int mmc_get_env_dev(void)
|
||||
{
|
||||
const char *boot_device =
|
||||
ofnode_read_chosen_string("u-boot,spl-boot-device");
|
||||
struct udevice *devp;
|
||||
|
||||
if (!boot_device) {
|
||||
debug("%s: /chosen/u-boot,spl-boot-device not set\n",
|
||||
__func__);
|
||||
#ifdef CONFIG_SYS_MMC_ENV_DEV
|
||||
return CONFIG_SYS_MMC_ENV_DEV;
|
||||
#else
|
||||
return 0;
|
||||
#endif
|
||||
}
|
||||
|
||||
debug("%s: booted from %s\n", __func__, boot_device);
|
||||
|
||||
if (uclass_find_device_by_ofnode(UCLASS_MMC, ofnode_path(boot_device), &devp))
|
||||
#ifdef CONFIG_SYS_MMC_ENV_DEV
|
||||
return CONFIG_SYS_MMC_ENV_DEV;
|
||||
#else
|
||||
return 0;
|
||||
#endif
|
||||
|
||||
debug("%s: get MMC ENV from mmc%d\n", __func__, devp->seq_);
|
||||
|
||||
return devp->seq_;
|
||||
}
|
||||
|
||||
enum env_location arch_env_get_location(enum env_operation op, int prio)
|
||||
{
|
||||
const char *boot_device =
|
||||
ofnode_read_chosen_string("u-boot,spl-boot-device");
|
||||
struct udevice *devp;
|
||||
|
||||
if (prio > 0)
|
||||
return ENVL_UNKNOWN;
|
||||
|
||||
if (!boot_device) {
|
||||
debug("%s: /chosen/u-boot,spl-boot-device not set\n",
|
||||
__func__);
|
||||
return ENVL_NOWHERE;
|
||||
}
|
||||
|
||||
debug("%s: booted from %s\n", __func__, boot_device);
|
||||
|
||||
if (IS_ENABLED(CONFIG_ENV_IS_IN_MMC) &&
|
||||
!uclass_find_device_by_ofnode(UCLASS_MMC, ofnode_path(boot_device), &devp))
|
||||
return ENVL_MMC;
|
||||
|
||||
printf("%s: No environment available: booted from %s but U-Boot "
|
||||
"config does not allow loading environment from it.",
|
||||
__func__, boot_device);
|
||||
|
||||
return ENVL_NOWHERE;
|
||||
}
|
||||
#include "../common/common.h"
|
||||
|
||||
int misc_init_r(void)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in a new issue