From: Michal Simek Date: Tue, 5 Feb 2019 09:29:12 +0000 (+0100) Subject: rockchip: Remove rejected files with .rej suffix X-Git-Url: http://git.dujemihanovic.xyz/img/sics.gif?a=commitdiff_plain;h=30477f0500dac67e988498df3b6783372a31c22c;p=u-boot.git rockchip: Remove rejected files with .rej suffix Probably output of incorrect applying introduced by "rockchip: defconfig: Clean the unused pinctrl config" (sha1: 2ec3d25f8faab51c2334174a582a96ad28d96344) Signed-off-by: Michal Simek Reviewed-by: Philipp Tomsich --- diff --git a/configs/kylin-rk3036_defconfig.rej b/configs/kylin-rk3036_defconfig.rej deleted file mode 100644 index 5478e65f1a..0000000000 --- a/configs/kylin-rk3036_defconfig.rej +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 diff --git a/configs/puma-rk3399_defconfig.rej b/configs/puma-rk3399_defconfig.rej deleted file mode 100644 index 78a1819b5f..0000000000 --- a/configs/puma-rk3399_defconfig.rej +++ /dev/null @@ -1,10 +0,0 @@ ---- 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