[U-Boot] [PATCH 1/2] configs: Remove version control leftovers

Philipp Tomsich philipp.tomsich at theobroma-systems.com
Wed Feb 6 14:23:05 UTC 2019


Alexander,

there’s a PR for this open already:
	https://patchwork.ozlabs.org/patch/1036561/

Sorry for the inconvenience.
Philipp.

> On 06.02.2019, at 15:19, Alexander Dahl <ada at thorsis.com> wrote:
> 
> I assume those should not have been committed in the first place?
> 
> Fixes: 2ec3d25f8faab51c2334174a582a96ad28d96344
> Signed-off-by: Alexander Dahl <ada at thorsis.com>
> ---
> configs/kylin-rk3036_defconfig.rej | 10 ----------
> configs/puma-rk3399_defconfig.rej  | 10 ----------
> 2 files changed, 20 deletions(-)
> delete mode 100644 configs/kylin-rk3036_defconfig.rej
> delete mode 100644 configs/puma-rk3399_defconfig.rej
> 
> 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
> -- 
> 2.11.0
> 
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> https://lists.denx.de/listinfo/u-boot



More information about the U-Boot mailing list