193 lines
6.0 KiB
Diff
193 lines
6.0 KiB
Diff
From d0c3abbbecfe69a73b157451857ca061870ec49b Mon Sep 17 00:00:00 2001
|
|
From: Jonas Karlman <jonas@kwiboo.se>
|
|
Date: Sat, 18 Aug 2018 17:27:32 +0200
|
|
Subject: [PATCH] rockchip: disable android boot and config
|
|
|
|
---
|
|
arch/arm/mach-rockchip/boot_mode.c | 2 +-
|
|
configs/evb-rk3328_defconfig | 5 ++---
|
|
configs/evb-rk3399_defconfig | 17 +----------------
|
|
configs/miqi-rk3288_defconfig | 12 +-----------
|
|
configs/tinker-rk3288_defconfig | 3 ---
|
|
include/configs/rockchip-common.h | 2 --
|
|
6 files changed, 5 insertions(+), 36 deletions(-)
|
|
|
|
diff --git a/arch/arm/mach-rockchip/boot_mode.c b/arch/arm/mach-rockchip/boot_mode.c
|
|
index 8a20a3a31e..9441c49477 100644
|
|
--- a/arch/arm/mach-rockchip/boot_mode.c
|
|
+++ b/arch/arm/mach-rockchip/boot_mode.c
|
|
@@ -123,9 +123,9 @@ int setup_boot_mode(void)
|
|
int boot_mode = BOOT_MODE_NORMAL;
|
|
char env_preboot[256] = {0};
|
|
|
|
+#ifdef CONFIG_RKIMG_BOOTLOADER
|
|
devtype_num_envset();
|
|
rockchip_dnl_mode_check();
|
|
-#ifdef CONFIG_RKIMG_BOOTLOADER
|
|
boot_mode = rockchip_get_boot_mode();
|
|
#endif
|
|
switch (boot_mode) {
|
|
diff --git a/configs/evb-rk3328_defconfig b/configs/evb-rk3328_defconfig
|
|
index 0897a28e1d..85ee85741e 100644
|
|
--- a/configs/evb-rk3328_defconfig
|
|
+++ b/configs/evb-rk3328_defconfig
|
|
@@ -39,8 +39,8 @@ CONFIG_TPL_OF_CONTROL=y
|
|
CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
|
|
CONFIG_TPL_OF_PLATDATA=y
|
|
CONFIG_ENV_IS_IN_MMC=y
|
|
-CONFIG_TPL_DM=y
|
|
CONFIG_NET_RANDOM_ETHADDR=y
|
|
+CONFIG_TPL_DM=y
|
|
CONFIG_REGMAP=y
|
|
CONFIG_SPL_REGMAP=y
|
|
CONFIG_TPL_REGMAP=y
|
|
@@ -56,12 +56,11 @@ CONFIG_MISC=y
|
|
CONFIG_ROCKCHIP_EFUSE=y
|
|
CONFIG_MMC_DW=y
|
|
CONFIG_MMC_DW_ROCKCHIP=y
|
|
-CONFIG_PHY=y
|
|
-CONFIG_PHY_ROCKCHIP_INNO_USB2=y
|
|
CONFIG_DM_ETH=y
|
|
CONFIG_ETH_DESIGNWARE=y
|
|
CONFIG_GMAC_ROCKCHIP=y
|
|
CONFIG_PHY=y
|
|
+CONFIG_PHY_ROCKCHIP_INNO_USB2=y
|
|
CONFIG_PINCTRL=y
|
|
CONFIG_DM_PMIC=y
|
|
CONFIG_PMIC_RK8XX=y
|
|
diff --git a/configs/evb-rk3399_defconfig b/configs/evb-rk3399_defconfig
|
|
index 305f0a405d..96aa34b2c0 100644
|
|
--- a/configs/evb-rk3399_defconfig
|
|
+++ b/configs/evb-rk3399_defconfig
|
|
@@ -5,16 +5,14 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
|
|
CONFIG_SYS_MALLOC_F_LEN=0x4000
|
|
CONFIG_ROCKCHIP_RK3399=y
|
|
CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x4000
|
|
-CONFIG_RKIMG_BOOTLOADER=y
|
|
-# CONFIG_USING_KERNEL_DTB is not set
|
|
CONFIG_SPL_STACK_R_ADDR=0x80000
|
|
CONFIG_DEFAULT_DEVICE_TREE="rk3399-evb"
|
|
CONFIG_DEBUG_UART=y
|
|
+# CONFIG_ANDROID_BOOT_IMAGE is not set
|
|
CONFIG_FIT=y
|
|
CONFIG_SPL_LOAD_FIT=y
|
|
CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/make_fit_atf.py"
|
|
# CONFIG_DISPLAY_CPUINFO is not set
|
|
-CONFIG_ANDROID_BOOTLOADER=y
|
|
CONFIG_SPL_STACK_R=y
|
|
CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x4000
|
|
CONFIG_SPL_ATF=y
|
|
@@ -26,18 +24,13 @@ CONFIG_FASTBOOT_FLASH_MMC_DEV=0
|
|
CONFIG_CMD_BOOTZ=y
|
|
# CONFIG_CMD_IMLS is not set
|
|
CONFIG_CMD_GPT=y
|
|
-CONFIG_CMD_LOAD_ANDROID=y
|
|
-CONFIG_CMD_BOOT_ANDROID=y
|
|
-CONFIG_CMD_BOOT_ROCKCHIP=y
|
|
CONFIG_CMD_MMC=y
|
|
CONFIG_CMD_SF=y
|
|
CONFIG_CMD_USB=y
|
|
CONFIG_CMD_USB_MASS_STORAGE=y
|
|
# CONFIG_CMD_SETEXPR is not set
|
|
CONFIG_CMD_TIME=y
|
|
-CONFIG_RKPARM_PARTITION=y
|
|
CONFIG_SPL_OF_CONTROL=y
|
|
-CONFIG_OF_LIVE=y
|
|
CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
|
|
CONFIG_NET_RANDOM_ETHADDR=y
|
|
CONFIG_REGMAP=y
|
|
@@ -94,13 +87,5 @@ CONFIG_USB_ETHER_ASIX88179=y
|
|
CONFIG_USB_ETHER_MCS7830=y
|
|
CONFIG_USB_ETHER_RTL8152=y
|
|
CONFIG_USB_ETHER_SMSC95XX=y
|
|
-CONFIG_DM_VIDEO=y
|
|
-CONFIG_DISPLAY=y
|
|
-CONFIG_DRM_ROCKCHIP=y
|
|
-CONFIG_DRM_ROCKCHIP_DW_MIPI_DSI=y
|
|
-CONFIG_DRM_ROCKCHIP_ANALOGIX_DP=y
|
|
-CONFIG_DRM_ROCKCHIP_LVDS=y
|
|
-CONFIG_DRM_ROCKCHIP_RGB=y
|
|
-CONFIG_LCD=y
|
|
CONFIG_USE_TINY_PRINTF=y
|
|
CONFIG_ERRNO_STR=y
|
|
diff --git a/configs/miqi-rk3288_defconfig b/configs/miqi-rk3288_defconfig
|
|
index ffbe701cfd..0aa4c903e4 100644
|
|
--- a/configs/miqi-rk3288_defconfig
|
|
+++ b/configs/miqi-rk3288_defconfig
|
|
@@ -3,12 +3,11 @@ CONFIG_ARCH_ROCKCHIP=y
|
|
CONFIG_SYS_MALLOC_F_LEN=0x2000
|
|
CONFIG_ROCKCHIP_RK3288=y
|
|
CONFIG_SPL_ROCKCHIP_BACK_TO_BROM=y
|
|
-CONFIG_RKIMG_BOOTLOADER=y
|
|
CONFIG_TARGET_MIQI_RK3288=y
|
|
CONFIG_SPL_STACK_R_ADDR=0x80000
|
|
CONFIG_DEFAULT_DEVICE_TREE="rk3288-miqi"
|
|
CONFIG_DEBUG_UART=y
|
|
-# CONFIG_SILENT_CONSOLE is not set
|
|
+# CONFIG_ANDROID_BOOT_IMAGE is not set
|
|
# CONFIG_DISPLAY_CPUINFO is not set
|
|
CONFIG_SPL_STACK_R=y
|
|
CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
|
|
@@ -16,10 +15,6 @@ CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
|
|
CONFIG_CMD_GPIO=y
|
|
CONFIG_CMD_GPT=y
|
|
CONFIG_CMD_I2C=y
|
|
-CONFIG_ANDROID_BOOT_IMAGE=y
|
|
-CONFIG_ANDROID_BOOTLOADER=y
|
|
-CONFIG_CMD_BOOT_ANDROID=y
|
|
-CONFIG_CMD_BOOT_ROCKCHIP=y
|
|
CONFIG_CMD_MMC=y
|
|
CONFIG_CMD_SF=y
|
|
CONFIG_CMD_SPI=y
|
|
@@ -80,11 +75,6 @@ CONFIG_G_DNL_PRODUCT_NUM=0x320a
|
|
CONFIG_USB_HOST_ETHER=y
|
|
CONFIG_USB_ETHER_ASIX=y
|
|
CONFIG_USB_ETHER_SMSC95XX=y
|
|
-CONFIG_DM_VIDEO=y
|
|
-CONFIG_DISPLAY=y
|
|
-CONFIG_VIDEO_ROCKCHIP=y
|
|
-CONFIG_DISPLAY_ROCKCHIP_HDMI=y
|
|
-CONFIG_CONSOLE_SCROLL_LINES=10
|
|
CONFIG_USE_TINY_PRINTF=y
|
|
CONFIG_CMD_DHRYSTONE=y
|
|
CONFIG_ERRNO_STR=y
|
|
diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig
|
|
index 0afc0a35e1..a6f8c0cb51 100644
|
|
--- a/configs/tinker-rk3288_defconfig
|
|
+++ b/configs/tinker-rk3288_defconfig
|
|
@@ -3,13 +3,11 @@ CONFIG_ARCH_ROCKCHIP=y
|
|
CONFIG_SYS_MALLOC_F_LEN=0x2000
|
|
CONFIG_ROCKCHIP_RK3288=y
|
|
CONFIG_SPL_ROCKCHIP_BACK_TO_BROM=y
|
|
-CONFIG_RKIMG_BOOTLOADER=y
|
|
CONFIG_TARGET_TINKER_RK3288=y
|
|
CONFIG_SPL_STACK_R_ADDR=0x80000
|
|
CONFIG_DEFAULT_DEVICE_TREE="rk3288-tinker"
|
|
CONFIG_DEBUG_UART=y
|
|
# CONFIG_ANDROID_BOOT_IMAGE is not set
|
|
-# CONFIG_SILENT_CONSOLE is not set
|
|
CONFIG_CONSOLE_MUX=y
|
|
# CONFIG_DISPLAY_CPUINFO is not set
|
|
CONFIG_SPL_STACK_R=y
|
|
@@ -19,7 +17,6 @@ CONFIG_SPL_I2C_SUPPORT=y
|
|
CONFIG_CMD_GPIO=y
|
|
CONFIG_CMD_GPT=y
|
|
CONFIG_CMD_I2C=y
|
|
-CONFIG_CMD_BOOT_ROCKCHIP=y
|
|
CONFIG_CMD_MMC=y
|
|
CONFIG_CMD_SF=y
|
|
CONFIG_CMD_SPI=y
|
|
diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h
|
|
index f159cbddf3..75a0963953 100644
|
|
--- a/include/configs/rockchip-common.h
|
|
+++ b/include/configs/rockchip-common.h
|
|
@@ -105,8 +105,6 @@
|
|
"fi; \0"
|
|
|
|
#define RKIMG_BOOTCOMMAND \
|
|
- "boot_android ${devtype} ${devnum};" \
|
|
- "bootrkp;" \
|
|
"run distro_bootcmd;"
|
|
|
|
#endif
|