提交 30477f05 编写于 作者: M Michal Simek 提交者: Philipp Tomsich

rockchip: Remove rejected files with .rej suffix

Probably output of incorrect applying introduced by

"rockchip: defconfig: Clean the unused pinctrl config"
(sha1: 2ec3d25f)
Signed-off-by: NMichal Simek <michal.simek@xilinx.com>
Reviewed-by: NPhilipp Tomsich <philipp.tomsich@theobroma-systems.com>
上级 e5fd39c8
--- configs/kylin-rk3036_defconfig
+++ configs/kylin-rk3036_defconfig
@@ -8,6 +8,7 @@ CONFIG_ROCKCHIP_RK3036=y
CONFIG_TARGET_KYLIN_RK3036=y
CONFIG_SPL_STACK_R_ADDR=0x80000
CONFIG_DEFAULT_DEVICE_TREE="rk3036-sdk"
+CONFIG_DEBUG_UART=y
CONFIG_SPL_SYS_MALLOC_F_LEN=0x0
# CONFIG_ANDROID_BOOT_IMAGE is not set
# CONFIG_DISPLAY_CPUINFO is not set
--- configs/puma-rk3399_defconfig
+++ configs/puma-rk3399_defconfig
@@ -74,7 +74,6 @@ CONFIG_ETH_DESIGNWARE=y
CONFIG_GMAC_ROCKCHIP=y
CONFIG_PINCTRL=y
CONFIG_SPL_PINCTRL=y
-CONFIG_PINCTRL_ROCKCHIP_RK3399=y
CONFIG_DM_PMIC=y
CONFIG_DM_PMIC_FAN53555=y
CONFIG_PMIC_RK8XX=y
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册