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 <michal.simek@xilinx.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>

diff --git a/configs/kylin-rk3036_defconfig.rej b/configs/kylin-rk3036_defconfig.rej
deleted file mode 100644 (file)
index 5478e65..0000000
--- 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 (file)
index 78a1819..0000000
--- 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