Merge tag 'for-master-20190205' of git://git.denx.de/u-boot-rockchip

Removes artifacts (.rej-files) from the last merge.
2019-02-05 08:32:52 -05:00
parent e5fd39c886 30477f0500
commit c0bf3968d7
2 changed files with 0 additions and 20 deletions
--- a/configs/kylin-rk3036_defconfig.rej
+++ b/configs/kylin-rk3036_defconfig.rej
@@ -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
--- a/configs/puma-rk3399_defconfig.rej
+++ b/configs/puma-rk3399_defconfig.rej
@@ -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