189 lines
5.9 KiB
Diff
189 lines
5.9 KiB
Diff
From b9d513e7d18f16cb06ef93a109fb5755f695cb60 Mon Sep 17 00:00:00 2001
|
|
From: Jonas Karlman <jonas@kwiboo.se>
|
|
Date: Wed, 29 Aug 2018 23:03:07 +0200
|
|
Subject: [PATCH] configs: sync rk3288, rk3328 and rk3399 defconfig
|
|
|
|
---
|
|
configs/evb-rk3328_defconfig | 6 +++++-
|
|
configs/evb-rk3399_defconfig | 5 +++++
|
|
configs/miqi-rk3288_defconfig | 1 -
|
|
configs/tinker-rk3288_defconfig | 2 +-
|
|
4 files changed, 11 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/configs/evb-rk3328_defconfig b/configs/evb-rk3328_defconfig
|
|
index 85ee85741e..4388ba32e0 100644
|
|
--- a/configs/evb-rk3328_defconfig
|
|
+++ b/configs/evb-rk3328_defconfig
|
|
@@ -29,16 +29,20 @@ CONFIG_FASTBOOT_FLASH=y
|
|
CONFIG_FASTBOOT_FLASH_MMC_DEV=1
|
|
CONFIG_CMD_BOOTZ=y
|
|
# CONFIG_CMD_IMLS is not set
|
|
+CONFIG_CMD_GPIO=y
|
|
CONFIG_CMD_GPT=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_CMD_PMIC=y
|
|
+CONFIG_CMD_REGULATOR=y
|
|
CONFIG_SPL_OF_CONTROL=y
|
|
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_NET_RANDOM_ETHADDR=y
|
|
CONFIG_TPL_DM=y
|
|
CONFIG_REGMAP=y
|
|
diff --git a/configs/evb-rk3399_defconfig b/configs/evb-rk3399_defconfig
|
|
index 96aa34b2c0..84b14a0a6a 100644
|
|
--- a/configs/evb-rk3399_defconfig
|
|
+++ b/configs/evb-rk3399_defconfig
|
|
@@ -10,6 +10,7 @@ CONFIG_DEFAULT_DEVICE_TREE="rk3399-evb"
|
|
CONFIG_DEBUG_UART=y
|
|
# CONFIG_ANDROID_BOOT_IMAGE is not set
|
|
CONFIG_FIT=y
|
|
+CONFIG_FIT_VERBOSE=y
|
|
CONFIG_SPL_LOAD_FIT=y
|
|
CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/make_fit_atf.py"
|
|
# CONFIG_DISPLAY_CPUINFO is not set
|
|
@@ -23,6 +24,7 @@ CONFIG_FASTBOOT_FLASH=y
|
|
CONFIG_FASTBOOT_FLASH_MMC_DEV=0
|
|
CONFIG_CMD_BOOTZ=y
|
|
# CONFIG_CMD_IMLS is not set
|
|
+CONFIG_CMD_GPIO=y
|
|
CONFIG_CMD_GPT=y
|
|
CONFIG_CMD_MMC=y
|
|
CONFIG_CMD_SF=y
|
|
@@ -30,6 +32,8 @@ CONFIG_CMD_USB=y
|
|
CONFIG_CMD_USB_MASS_STORAGE=y
|
|
# CONFIG_CMD_SETEXPR is not set
|
|
CONFIG_CMD_TIME=y
|
|
+CONFIG_CMD_PMIC=y
|
|
+CONFIG_CMD_REGULATOR=y
|
|
CONFIG_SPL_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_NET_RANDOM_ETHADDR=y
|
|
@@ -41,6 +45,7 @@ CONFIG_CLK=y
|
|
CONFIG_SPL_CLK=y
|
|
CONFIG_ROCKCHIP_GPIO=y
|
|
CONFIG_SYS_I2C_ROCKCHIP=y
|
|
+CONFIG_DM_KEY=y
|
|
CONFIG_MISC=y
|
|
CONFIG_ROCKCHIP_EFUSE=y
|
|
CONFIG_MMC_DW=y
|
|
diff --git a/configs/miqi-rk3288_defconfig b/configs/miqi-rk3288_defconfig
|
|
index 0aa4c903e4..9559fcbaa2 100644
|
|
--- a/configs/miqi-rk3288_defconfig
|
|
+++ b/configs/miqi-rk3288_defconfig
|
|
@@ -30,7 +30,6 @@ CONFIG_CMD_REGULATOR=y
|
|
CONFIG_SPL_PARTITION_UUIDS=y
|
|
CONFIG_SPL_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_ENV_IS_IN_MMC=y
|
|
CONFIG_NET_RANDOM_ETHADDR=y
|
|
CONFIG_REGMAP=y
|
|
CONFIG_SPL_REGMAP=y
|
|
diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig
|
|
index a6f8c0cb51..9c4a9f47cf 100644
|
|
--- a/configs/tinker-rk3288_defconfig
|
|
+++ b/configs/tinker-rk3288_defconfig
|
|
@@ -32,7 +32,6 @@ CONFIG_CMD_REGULATOR=y
|
|
CONFIG_SPL_PARTITION_UUIDS=y
|
|
CONFIG_SPL_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_ENV_IS_IN_MMC=y
|
|
CONFIG_REGMAP=y
|
|
CONFIG_SPL_REGMAP=y
|
|
CONFIG_SYSCON=y
|
|
@@ -42,6 +41,7 @@ CONFIG_CLK=y
|
|
CONFIG_SPL_CLK=y
|
|
CONFIG_ROCKCHIP_GPIO=y
|
|
CONFIG_SYS_I2C_ROCKCHIP=y
|
|
+CONFIG_DM_KEY=y
|
|
CONFIG_MISC=y
|
|
CONFIG_ROCKCHIP_EFUSE=y
|
|
CONFIG_I2C_EEPROM=y
|
|
diff --git a/configs/firefly-rk3399_defconfig b/configs/firefly-rk3399_defconfig
|
|
index f0931266aa..af0ad7d5aa 100644
|
|
--- a/configs/firefly-rk3399_defconfig
|
|
+++ b/configs/firefly-rk3399_defconfig
|
|
@@ -5,16 +5,15 @@ 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_SPL_STACK_R_ADDR=0x80000
|
|
CONFIG_DEFAULT_DEVICE_TREE="rk3399-firefly"
|
|
CONFIG_DEBUG_UART=y
|
|
-CONFIG_ANDROID_BOOTLOADER=y
|
|
+# CONFIG_ANDROID_BOOT_IMAGE is not set
|
|
CONFIG_FIT=y
|
|
+CONFIG_FIT_VERBOSE=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
|
|
@@ -25,20 +24,19 @@ CONFIG_FASTBOOT_FLASH=y
|
|
CONFIG_FASTBOOT_FLASH_MMC_DEV=0
|
|
CONFIG_CMD_BOOTZ=y
|
|
# CONFIG_CMD_IMLS is not set
|
|
+CONFIG_CMD_GPIO=y
|
|
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_CMD_PMIC=y
|
|
+CONFIG_CMD_REGULATOR=y
|
|
CONFIG_SPL_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_ENV_IS_IN_MMC=y
|
|
+CONFIG_NET_RANDOM_ETHADDR=y
|
|
CONFIG_REGMAP=y
|
|
CONFIG_SPL_REGMAP=y
|
|
CONFIG_SYSCON=y
|
|
@@ -47,6 +45,7 @@ CONFIG_CLK=y
|
|
CONFIG_SPL_CLK=y
|
|
CONFIG_ROCKCHIP_GPIO=y
|
|
CONFIG_SYS_I2C_ROCKCHIP=y
|
|
+CONFIG_DM_KEY=y
|
|
CONFIG_MISC=y
|
|
CONFIG_ROCKCHIP_EFUSE=y
|
|
CONFIG_MMC_DW=y
|
|
@@ -77,14 +76,16 @@ CONFIG_USB_XHCI_HCD=y
|
|
CONFIG_USB_XHCI_DWC3=y
|
|
CONFIG_USB_EHCI_HCD=y
|
|
CONFIG_USB_EHCI_GENERIC=y
|
|
+CONFIG_USB_OHCI_HCD=y
|
|
+CONFIG_USB_OHCI_GENERIC=y
|
|
CONFIG_USB_DWC3=y
|
|
CONFIG_USB_DWC3_GADGET=y
|
|
CONFIG_USB_STORAGE=y
|
|
CONFIG_USB_GADGET=y
|
|
CONFIG_USB_GADGET_DOWNLOAD=y
|
|
CONFIG_G_DNL_MANUFACTURER="Rockchip"
|
|
-CONFIG_G_DNL_VENDOR_NUM=0x18d1
|
|
-CONFIG_G_DNL_PRODUCT_NUM=0xd00d
|
|
+CONFIG_G_DNL_VENDOR_NUM=0x2207
|
|
+CONFIG_G_DNL_PRODUCT_NUM=0x330a
|
|
CONFIG_USB_HOST_ETHER=y
|
|
CONFIG_USB_ETHER_ASIX=y
|
|
CONFIG_USB_ETHER_ASIX88179=y
|
|
@@ -93,3 +94,5 @@ CONFIG_USB_ETHER_RTL8152=y
|
|
CONFIG_USB_ETHER_SMSC95XX=y
|
|
CONFIG_USE_TINY_PRINTF=y
|
|
CONFIG_ERRNO_STR=y
|
|
+CONFIG_BOOTDELAY=1
|
|
+# CONFIG_EFI_LOADER is not set
|