diff options
| author | Heiko Stuebner <heiko@sntech.de> | 2019-08-12 17:00:05 +0200 |
|---|---|---|
| committer | Heiko Stuebner <heiko@sntech.de> | 2019-08-12 17:00:05 +0200 |
| commit | c3b13bb33f929c7b1301a9734c6e1eb0bf14d99e (patch) | |
| tree | df76e0e84dbe811365a83f4357ba20cc8a0d49ea | |
| parent | aeeadbb4d72475822daecf09ddf2245bf1e7453e (diff) | |
fixup px30-evb boardcode to use common boards
| -rw-r--r-- | board/rockchip/evb_px30/evb_px30.c | 22 | ||||
| -rw-r--r-- | configs/evb-px30_defconfig | 7 |
2 files changed, 6 insertions, 23 deletions
diff --git a/board/rockchip/evb_px30/evb_px30.c b/board/rockchip/evb_px30/evb_px30.c index d58e4c8213..21155ff035 100644 --- a/board/rockchip/evb_px30/evb_px30.c +++ b/board/rockchip/evb_px30/evb_px30.c @@ -1,25 +1,5 @@ /* - * (C) Copyright 2017 Rockchip Electronics Co., Ltd + * (C) Copyright 2019 Rockchip Electronics Co., Ltd * * SPDX-License-Identifier: GPL-2.0+ */ - -#include <common.h> -#include <dm.h> -#include <asm/io.h> -#include <power/regulator.h> - -int board_init(void) -{ - int ret; - - /* - * We need to call into regulators_enable_boot_on() again, as the call - * during SPL may have not included all regulators. - */ - ret = regulators_enable_boot_on(false); - if (ret) - debug("%s: Cannot enable boot on regulator\n", __func__); - - return 0; -} diff --git a/configs/evb-px30_defconfig b/configs/evb-px30_defconfig index 3c81245d12..f0168db95a 100644 --- a/configs/evb-px30_defconfig +++ b/configs/evb-px30_defconfig @@ -24,7 +24,7 @@ CONFIG_DEFAULT_FDT_FILE="rockchip/px30-evb.dtb" CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_BOUNCE_BUFFER_STATIC=y CONFIG_SPL_TEXT_BASE=0x00000000 -CONFIG_SPL_BOARD_INIT=y +# CONFIG_SPL_BOARD_INIT is not set CONFIG_SPL_BOOTROM_SUPPORT=y # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set # CONFIG_SPL_LEGACY_IMAGE_SUPPORT is not set @@ -55,7 +55,9 @@ CONFIG_EFI_PARTITION_ENTRIES_NUMBERS=64 CONFIG_SPL_OF_CONTROL=y CONFIG_OF_LIVE=y CONFIG_DEFAULT_DEVICE_TREE="px30-evb" -CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names interrupt-parents assigned-clocks assigned-clock-rates assigned-clock-parents" +CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" +CONFIG_ENV_IS_IN_MMC=y +CONFIG_NET_RANDOM_ETHADDR=y CONFIG_REGMAP=y CONFIG_SPL_REGMAP=y CONFIG_SYSCON=y @@ -73,6 +75,7 @@ CONFIG_MMC_DW_ROCKCHIP=y CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y +CONFIG_PHY_REALTEK=y CONFIG_PINCTRL=y CONFIG_DM_PMIC=y CONFIG_PMIC_RK8XX=y |