diff options
| author | Tom Rini <trini@konsulko.com> | 2016-02-08 09:48:04 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-02-08 09:48:04 -0500 |
| commit | 57dc53a72460e8e301fa1cc7951b41db8e731485 (patch) | |
| tree | 856a679e994fdc529a97763e851ed2e546ba3742 /configs | |
| parent | 7b6dc11c1aa69e5cc22d1659f50594edcfab5a9e (diff) | |
| parent | 2300184f702656b72394e458bf15f7aaba8af892 (diff) | |
| download | blackbird-obmc-uboot-57dc53a72460e8e301fa1cc7951b41db8e731485.tar.gz blackbird-obmc-uboot-57dc53a72460e8e301fa1cc7951b41db8e731485.zip | |
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/chromebook_jerry_defconfig | 1 | ||||
| -rw-r--r-- | configs/firefly-rk3288_defconfig | 1 | ||||
| -rw-r--r-- | configs/rock2_defconfig | 1 | ||||
| -rw-r--r-- | configs/xilinx-ppc405-generic_defconfig | 2 |
4 files changed, 1 insertions, 4 deletions
diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig index bd8b9649ce..390b2ec9f6 100644 --- a/configs/chromebook_jerry_defconfig +++ b/configs/chromebook_jerry_defconfig @@ -57,7 +57,6 @@ CONFIG_ROCKCHIP_SPI=y CONFIG_DM_VIDEO=y CONFIG_I2C_EDID=y CONFIG_DISPLAY=y -CONFIG_VIDEO_ROTATION=y CONFIG_VIDEO_ROCKCHIP=y CONFIG_USE_PRIVATE_LIBGCC=y CONFIG_USE_TINY_PRINTF=y diff --git a/configs/firefly-rk3288_defconfig b/configs/firefly-rk3288_defconfig index 3b29158f4a..5aa4166757 100644 --- a/configs/firefly-rk3288_defconfig +++ b/configs/firefly-rk3288_defconfig @@ -49,7 +49,6 @@ CONFIG_SYS_NS16550=y CONFIG_DM_VIDEO=y CONFIG_I2C_EDID=y CONFIG_DISPLAY=y -CONFIG_VIDEO_ROTATION=y CONFIG_VIDEO_ROCKCHIP=y CONFIG_USE_PRIVATE_LIBGCC=y CONFIG_USE_TINY_PRINTF=y diff --git a/configs/rock2_defconfig b/configs/rock2_defconfig index 68e3b367a3..f33daf1b0b 100644 --- a/configs/rock2_defconfig +++ b/configs/rock2_defconfig @@ -47,7 +47,6 @@ CONFIG_SYS_NS16550=y CONFIG_DM_VIDEO=y CONFIG_I2C_EDID=y CONFIG_DISPLAY=y -CONFIG_VIDEO_ROTATION=y CONFIG_VIDEO_ROCKCHIP=y CONFIG_USE_PRIVATE_LIBGCC=y CONFIG_USE_TINY_PRINTF=y diff --git a/configs/xilinx-ppc405-generic_defconfig b/configs/xilinx-ppc405-generic_defconfig index e7132cd611..85bc3b97ff 100644 --- a/configs/xilinx-ppc405-generic_defconfig +++ b/configs/xilinx-ppc405-generic_defconfig @@ -14,4 +14,4 @@ CONFIG_OF_EMBED=y CONFIG_OF_CONTROL=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y -CONFIG_DEFAULT_DEVICE_TREE="xilinx-ppc440-generic" +CONFIG_DEFAULT_DEVICE_TREE="xilinx-ppc405-generic" |
