diff options
| author | Tom Rini <trini@konsulko.com> | 2019-02-05 08:32:52 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-02-05 08:32:52 -0500 |
| commit | c0bf3968d7fffa135305ba58644773d32f51090a (patch) | |
| tree | bdd720d850129f2be8502a10750727f75d2fe045 | |
| parent | e5fd39c886485e3dec77f4438a6e364c2987cf5f (diff) | |
| parent | 30477f0500dac67e988498df3b6783372a31c22c (diff) | |
| download | u-boot-c0bf3968d7fffa135305ba58644773d32f51090a.tar.gz | |
Merge tag 'for-master-20190205' of git://git.denx.de/u-boot-rockchip
Removes artifacts (.rej-files) from the last merge.
| -rw-r--r-- | configs/kylin-rk3036_defconfig.rej | 10 | ||||
| -rw-r--r-- | configs/puma-rk3399_defconfig.rej | 10 |
2 files changed, 0 insertions, 20 deletions
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 |