leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removes artifacts (.rej-files) from the last merge.

Browse Source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJcWVjRAAoJECaAFcEOcohNbX4H/RSyqTQODrOUTMURmLQgr86V
 DpecuEIB5zVxP1SFFY/N6RHso0tiAgXR4ZytdgVfvVyCgMZLr/wfdgEI3ZPcfCbv
 6Jne/onbkyvLbCPyFy3QceYhCApAz10Z7bZAwKkFoyNZQvE78O6E8abRlUJCFChc
 JMD5SyRTc4skWHNPBv6QuefhkvGgruWQxsmHYg5D94WWi2bMdH+jPi21dUNvaJxv
 TO1LhYBpHS1jwVIJr6VN3JFsVt4lp/vjhOKGNKoDQxzS/mQnWHimLUJCNohQK2Cy
 a1dDnN9CVRosyMmw3iwY+iR1bfCV5mIITw0rd/UybJUVh1BkcVNpdwPld4M1PJw=
 =vWkX
 -----END PGP SIGNATURE-----

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

Removes artifacts (.rej-files) from the last merge.
This commit is contained in:
Tom Rini 2019-02-05 08:32:52 -05:00
commit c0bf3968d7
2 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configs/kylin-rk3036_defconfig.rej
View File

@ -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

10
configs/puma-rk3399_defconfig.rej
View File

@ -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